docs: update changelog for android pairing fix

Previously, if the gateway was unreachable (wrong IP, offline, etc.),
the Android app would crash with an unhandled socket exception.

Changes:
- Wrap socket.connect() in try/catch to handle connection failures
- Return PairResult with error message instead of crashing
- Display actual error message in status text instead of generic 'pairing required'

This gives users useful feedback like 'Connection refused' or
'Network is unreachable' instead of a crash.

.github/workflows/ci.yml

@@ -5,33 +5,12 @@ on:
   pull_request:
 
 jobs:
-  checks:
+  build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - runtime: node
-            task: lint
-            command: pnpm lint
-          - runtime: node
-            task: test
-            command: pnpm test
-          - runtime: node
-            task: build
-            command: pnpm build
-          - runtime: node
-            task: protocol
-            command: pnpm protocol:check
-          - runtime: bun
-            task: lint
-            command: bunx biome check src
-          - runtime: bun
-            task: test
-            command: bunx vitest run
-          - runtime: bun
-            task: build
-            command: bunx tsc -p tsconfig.json
+        runtime: [node, bun]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -98,42 +77,37 @@ jobs:
           pnpm -v
           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 }}
+      - name: Lint (node)
+        if: matrix.runtime == 'node'
+        run: pnpm lint
+
+      - name: Test (node)
+        if: matrix.runtime == 'node'
+        run: pnpm test
+
+      - name: Build (node)
+        if: matrix.runtime == 'node'
+        run: pnpm build
+
+      - name: Protocol check (node)
+        if: matrix.runtime == 'node'
+        run: pnpm protocol:check
+
+      - name: Lint (bun)
+        if: matrix.runtime == 'bun'
+        run: bunx biome check src
+
+      - name: Test (bun)
+        if: matrix.runtime == 'bun'
+        run: bunx vitest run
+
+      - name: Build (bun)
+        if: matrix.runtime == 'bun'
+        run: bunx tsc -p tsconfig.json
 
   macos-app:
     if: github.event_name == 'pull_request'
     runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - task: lint
-            command: |
-              swiftlint --config .swiftlint.yml
-              swiftformat --lint apps/macos/Sources --config .swiftformat
-          - task: build
-            command: |
-              set -euo pipefail
-              for attempt in 1 2 3; do
-                if swift build --package-path apps/macos --configuration release; then
-                  exit 0
-                fi
-                echo "swift build failed (attempt $attempt/3). Retrying…"
-                sleep $((attempt * 20))
-              done
-              exit 1
-          - task: test
-            command: |
-              set -euo pipefail
-              for attempt in 1 2 3; do
-                if swift test --package-path apps/macos --parallel --enable-code-coverage --show-codecov-path; then
-                  exit 0
-                fi
-                echo "swift test failed (attempt $attempt/3). Retrying…"
-                sleep $((attempt * 20))
-              done
-              exit 1
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -168,8 +142,35 @@ jobs:
           xcodebuild -version
           swift --version
 
-      - name: Run ${{ matrix.task }}
-        run: ${{ matrix.command }}
+      - name: SwiftLint
+        run: swiftlint --config .swiftlint.yml
+
+      - name: SwiftFormat (lint mode)
+        run: swiftformat --lint apps/macos/Sources --config .swiftformat
+
+      - name: Swift build (release)
+        run: |
+          set -euo pipefail
+          for attempt in 1 2 3; do
+            if swift build --package-path apps/macos --configuration release; then
+              exit 0
+            fi
+            echo "swift build failed (attempt $attempt/3). Retrying…"
+            sleep $((attempt * 20))
+          done
+          exit 1
+
+      - name: Swift tests (coverage)
+        run: |
+          set -euo pipefail
+          for attempt in 1 2 3; do
+            if swift test --package-path apps/macos --parallel --enable-code-coverage --show-codecov-path; then
+              exit 0
+            fi
+            echo "swift test failed (attempt $attempt/3). Retrying…"
+            sleep $((attempt * 20))
+          done
+          exit 1
   ios:
     if: false # ignore iOS in CI for now
     runs-on: macos-latest
@@ -345,14 +346,6 @@ jobs:
 
   android:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - task: test
-            command: ./gradlew --no-daemon :app:testDebugUnitTest
-          - task: build
-            command: ./gradlew --no-daemon :app:assembleDebug
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -392,6 +385,6 @@ jobs:
             "platforms;android-36" \
             "build-tools;36.0.0"
 
-      - name: Run Android ${{ matrix.task }}
+      - name: Android unit tests + debug build
         working-directory: apps/android
-        run: ${{ matrix.command }}
+        run: ./gradlew --no-daemon :app:testDebugUnitTest :app:assembleDebug

CHANGELOG.md

@@ -5,76 +5,29 @@
 ### Breaking
 - Identifiers: rename bundle IDs and internal domains to `com.clawdis.*` (macOS: `com.clawdis.mac`, iOS: `com.clawdis.ios`, Android: `com.clawdis.android`) and update the gateway LaunchAgent label to `com.clawdis.gateway`.
 - Agent tools: drop the `clawdis_` prefix (`browser`, `canvas`, `nodes`, `cron`, `gateway`).
-- Bash tool: remove `stdinMode: "pty"`/node-pty support; use the tmux skill for real TTYs.
-- Sessions: primary session key is fixed to `main` (or `global` for global scope); `session.mainKey` is ignored.
 
 ### Features
 - Gateway: support `gateway.port` + `CLAWDIS_GATEWAY_PORT` across CLI, TUI, and macOS app.
-- Gateway: add config hot reload with hybrid restart strategy (`gateway.reload`) and per-section reload handling.
 - UI: centralize tool display metadata and show action/detail summaries across Web Chat, SwiftUI, Android, and the TUI.
-- Control UI: support configurable base paths (`gateway.controlUi.basePath`, default unchanged) for hosting under URL prefixes.
-- Onboarding: shared wizard engine powering CLI + macOS via gateway wizard RPC.
-- Config: expose schema + UI hints for generic config forms (Web UI + future clients).
-- Skills: add blogwatcher skill for RSS/Atom monitoring — thanks @Hyaxia.
-- Discord: emit system events for reaction add/remove with per-guild reaction notifications (off|own|all|allowlist) (#140) — thanks @thewilloftheshadow.
-- Agent: add optional per-session Docker sandbox for tool execution (`agent.sandbox`) with allow/deny policy and auto-pruning.
-- Agent: add sandboxed Chromium browser (CDP + optional noVNC observer) for sandboxed sessions.
-- Nodes: add `location.get` with Always/Precise settings on macOS/iOS/Android plus CLI/tool support.
-- Sessions: add agent‑to‑agent post step with `ANNOUNCE_SKIP` to suppress channel announcements.
 
 ### Fixes
-- Gateway/macOS: keep node presence fresh with periodic beacons + show presence status in Instances (#168) — thanks @mbelinky.
-- CI: fix lint ordering after merge cleanup (#156) — thanks @steipete.
-- CI: consolidate checks to avoid redundant installs (#144) — thanks @thewilloftheshadow.
-- WhatsApp: support `gifPlayback` for MP4 GIF sends via CLI/gateway.
-- Sessions: prevent `sessions_send` timeouts by running nested agent turns on a separate lane.
-- Sessions: use per-send run IDs for gateway agent calls to avoid wait collisions.
-- Auto-reply: drop final payloads when block streaming to avoid duplicate Discord sends.
-- Auto-reply: default elevated to off when not allowed (#183) — thanks @cash-echo-bot.
-- Auto-reply: fix typing TTL to 2 minutes and log TTL with s/m units.
-- Bash tool: default auto-background delay to 10s.
 - Telegram: chunk block-stream replies to avoid “message is too long” errors (#124) — thanks @mukhtharcm.
-- Block streaming: default to text_end and suppress duplicate block sends while in-flight.
-- Block streaming: avoid duplicate block chunks when providers repeat full content on text_end.
-- Block streaming: drop final payloads after soft chunking to keep Discord order intact.
 - Gmail hooks: resolve gcloud Python to a real executable when PATH uses mise shims — thanks @joargp.
-- Control UI: generate UUIDs when `crypto.randomUUID()` is unavailable over HTTP — thanks @ratulsarna.
-- Control UI: stream live tool output cards in Chat (agent events include sessionKey).
-- Chat UI: render assistant `<think>`/`<final>` markup as italic thinking text in history + streaming instead of showing raw tags.
-- Agent: add soft block-stream chunking (800–1200 chars default) with paragraph/newline preference.
-- Agent: route embedded run lifecycle logs through subsystem console formatting and reduce log noise.
 - Agent tools: scope the Discord tool to Discord surface runs.
 - Agent tools: format verbose tool summaries without brackets, with unique emojis and `tool: detail` style.
-- Agent tools: emit verbose tool summaries at tool start (no debounce).
-- Gateway: split server helpers/tests into hooks/session-utils/ws-log/net modules for better isolation; add unit coverage for hooks/session utils/ws log.
-- Gateway: extract WS method handling + HTTP/provider/constant helpers to shrink server wiring and improve testability.
-- Gateway: prevent deleting the main session and abort active runs before deleting other sessions.
-- Onboarding: fix Control UI basePath usage when showing/opening gateway URLs.
-- Onboarding: clarify provider requirements (WhatsApp/Signal phone numbers, iMessage Apple ID guidance) in the provider picker.
 - macOS Connections: move to sidebar + detail layout with structured sections and header actions.
 - macOS onboarding: increase window height so the permissions page fits without scrolling.
 - Thinking: default to low for reasoning-capable models when no /think or config default is set.
 - Logging: decouple file log levels from console verbosity; verbose-only details are captured when `logging.level` is debug/trace.
 - Build: fix regex literal in tool-meta path detection (watch build error).
-- Build: require AVX2 Bun for x86_64 relay packaging (reject baseline builds).
-- Build: drop stale ClawdisCLI product from macOS build-and-run script.
 - Auto-reply: add run-level telemetry + typing TTL guardrails to diagnose stuck replies.
-- WhatsApp: honor per-group mention gating overrides when group ids are stored as session keys.
-- Dependencies: bump pi-mono packages to 0.32.3.
+- Android: show unreachable gateway errors during pairing (#148) — thanks @cash-echo-bot.
 
 ### Docs
 - Skills: add Sheets/Docs examples to gog skill (#128) — thanks @mbelinky.
 - Skills: clarify bear-notes token + callback usage (#120) — thanks @tylerwince.
 - Skills: document Discord `sendMessage` media attachments and `to` format clarification.
-- Skills: expand peekaboo skill examples + common parameters.
-- Skills: add tmux skill + interactive coding guidance in coding-agent.
 - Gateway: document port configuration + multi-instance isolation.
-- Gateway: document config hot reload + reload matrix.
-- Onboarding/Config: add protocol notes for wizard + schema RPC.
-- Queue: clarify steer-backlog behavior with inline commands and update examples for streaming surfaces.
-- Sandbox: document per-session agent sandbox setup, browser image, and Docker build.
-- macOS: clarify menu bar uses sessionKey from agent events.
-- Sessions: document agent-to-agent post step and `ANNOUNCE_SKIP`.
 
 ## 2.0.0-beta5 — 2026-01-03
 
@@ -136,7 +89,6 @@
 - Skills: add tmux-first coding-agent skill + `requires.anyBins` gate for multi-CLI setup (thanks @sreekaransrinath).
 
 ### Fixes
-- macOS codesign: make ad-hoc signing opt-in with loud warnings and document TCC permission fragility — thanks @mcinteerj.
 - Gog calendar: format date ranges as RFC 3339 with timezone to satisfy Google Calendar API (thanks @jayhickey).
 - macOS onboarding: add scrollable page gutter for overflowing content (#105) — thanks @thewilloftheshadow.
 - Chat UI: keep the chat scrolled to the latest message after switching sessions.

CONTRIBUTING.md

@@ -12,7 +12,7 @@ Welcome to the lobster tank! 🦞
 - **Peter Steinberger** - Benevolent Dictator
   - GitHub: [@steipete](https://github.com/steipete) · X: [@steipete](https://x.com/steipete)
 
-- **Shadow** - Discord + Slack subsystem
+- **Shadow** - Discord subsystem
   - GitHub: [@4shadowed](https://github.com/4shadowed) · X: [@4shad0wed](https://x.com/4shad0wed)
 
 - **Jos** - Telegram, API, Nix mode

Dockerfile.sandbox

@@ -1,16 +0,0 @@
-FROM debian:bookworm-slim
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    bash \
-    ca-certificates \
-    curl \
-    git \
-    jq \
-    python3 \
-    ripgrep \
-  && rm -rf /var/lib/apt/lists/*
-
-CMD ["sleep", "infinity"]

Dockerfile.sandbox-browser

@@ -1,27 +0,0 @@
-FROM debian:bookworm-slim
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    bash \
-    ca-certificates \
-    chromium \
-    curl \
-    fonts-liberation \
-    fonts-noto-color-emoji \
-    git \
-    jq \
-    novnc \
-    python3 \
-    websockify \
-    x11vnc \
-    xvfb \
-  && rm -rf /var/lib/apt/lists/*
-
-COPY scripts/sandbox-browser-entrypoint.sh /usr/local/bin/clawdis-sandbox-browser
-RUN chmod +x /usr/local/bin/clawdis-sandbox-browser
-
-EXPOSE 9222 5900 6080
-
-CMD ["clawdis-sandbox-browser"]

README.md

@@ -18,7 +18,7 @@
 **Clawdis** is a *personal AI assistant* you run on your own devices.
 It answers you on the surfaces you already use (WhatsApp, Telegram, Discord, iMessage, WebChat), can speak and listen on macOS/iOS, and can render a live Canvas you control. The Gateway is just the control plane — the product is the assistant.
 
-If you want a personal, single-user assistant that feels local, fast, and always-on, this is it.
+If you want a private, single-user assistant that feels local, fast, and always-on, this is it.
 
 Website: https://clawd.me · Docs: [`docs/index.md`](docs/index.md) · FAQ: [`docs/faq.md`](docs/faq.md) · Wizard: [`docs/wizard.md`](docs/wizard.md) · Docker (optional): [`docs/docker.md`](docs/docker.md) · Discord: https://discord.gg/clawd
 
@@ -109,7 +109,7 @@ Send these in WhatsApp/Telegram/WebChat (group commands are owner-only):
 - **Events + snapshot**: handshake returns a snapshot (presence/health) and declares event types; runtime events include `agent`, `chat`, `presence`, `tick`, `health`, `heartbeat`, `cron`, `node.pair.*`, `voicewake.changed`, `shutdown`.
 - **Idempotency & safety**: `send`/`agent`/`chat.send` require idempotency keys with a TTL cache (5 min, cap 1000) to avoid double‑sends on reconnects; payload sizes are capped per connection.
 - **Bridge for nodes**: optional TCP bridge (`src/infra/bridge/server.ts`) is newline‑delimited JSON frames (`hello`, pairing, RPC, `invoke`); node connect/disconnect is surfaced into presence.
-- **Control UI + Canvas Host**: HTTP serves Control UI assets (default `/`, optional base path) and can host a live‑reload Canvas host for nodes (`src/canvas-host/server.ts`), injecting the A2UI postMessage bridge.
+- **Control UI + Canvas Host**: HTTP serves `/ui` assets (if built) and can host a live‑reload Canvas host for nodes (`src/canvas-host/server.ts`), injecting the A2UI postMessage bridge.
 
 ### iOS app (apps/ios)
 - **Discovery + pairing**: Bonjour discovery via `BridgeDiscoveryModel` (NWBrowser). `BridgeConnectionController` auto‑connects using Keychain token or allows manual host/port.

apps/android/app/src/main/AndroidManifest.xml

@@ -9,18 +9,17 @@
     <uses-permission
         android:name="android.permission.NEARBY_WIFI_DEVICES"
         android:usesPermissionFlags="neverForLocation" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.ACCESS_COARSE_LOCATION"
+        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
-    <uses-feature
-        android:name="android.hardware.telephony"
-        android:required="false" />
 
     <application
         android:name=".NodeApp"

apps/android/app/src/main/java/com/clawdis/android/LocationMode.kt

@@ -1,15 +0,0 @@
-package com.clawdis.android
-
-enum class LocationMode(val rawValue: String) {
-  Off("off"),
-  WhileUsing("whileUsing"),
-  Always("always"),
-  ;
-
-  companion object {
-    fun fromRawValue(raw: String?): LocationMode {
-      val normalized = raw?.trim()?.lowercase()
-      return entries.firstOrNull { it.rawValue.lowercase() == normalized } ?: Off
-    }
-  }
-}

apps/android/app/src/main/java/com/clawdis/android/MainActivity.kt

@@ -39,7 +39,6 @@ class MainActivity : ComponentActivity() {
     screenCaptureRequester = ScreenCaptureRequester(this)
     viewModel.camera.attachLifecycleOwner(this)
     viewModel.camera.attachPermissionRequester(permissionRequester)
-    viewModel.sms.attachPermissionRequester(permissionRequester)
     viewModel.screenRecorder.attachScreenCaptureRequester(screenCaptureRequester)
     viewModel.screenRecorder.attachPermissionRequester(permissionRequester)
 

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

@@ -7,7 +7,6 @@ import com.clawdis.android.chat.OutgoingAttachment
 import com.clawdis.android.node.CameraCaptureManager
 import com.clawdis.android.node.CanvasController
 import com.clawdis.android.node.ScreenRecordManager
-import com.clawdis.android.node.SmsManager
 import kotlinx.coroutines.flow.StateFlow
 
 class MainViewModel(app: Application) : AndroidViewModel(app) {
@@ -16,7 +15,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val canvas: CanvasController = runtime.canvas
   val camera: CameraCaptureManager = runtime.camera
   val screenRecorder: ScreenRecordManager = runtime.screenRecorder
-  val sms: SmsManager = runtime.sms
 
   val bridges: StateFlow<List<BridgeEndpoint>> = runtime.bridges
   val discoveryStatusText: StateFlow<String> = runtime.discoveryStatusText
@@ -35,8 +33,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val instanceId: StateFlow<String> = runtime.instanceId
   val displayName: StateFlow<String> = runtime.displayName
   val cameraEnabled: StateFlow<Boolean> = runtime.cameraEnabled
-  val locationMode: StateFlow<LocationMode> = runtime.locationMode
-  val locationPreciseEnabled: StateFlow<Boolean> = runtime.locationPreciseEnabled
   val preventSleep: StateFlow<Boolean> = runtime.preventSleep
   val wakeWords: StateFlow<List<String>> = runtime.wakeWords
   val voiceWakeMode: StateFlow<VoiceWakeMode> = runtime.voiceWakeMode
@@ -74,14 +70,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     runtime.setCameraEnabled(value)
   }
 
-  fun setLocationMode(mode: LocationMode) {
-    runtime.setLocationMode(mode)
-  }
-
-  fun setLocationPreciseEnabled(value: Boolean) {
-    runtime.setLocationPreciseEnabled(value)
-  }
-
   fun setPreventSleep(value: Boolean) {
     runtime.setPreventSleep(value)
   }
@@ -118,10 +106,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     runtime.setTalkEnabled(enabled)
   }
 
-  fun refreshBridgeHello() {
-    runtime.refreshBridgeHello()
-  }
-
   fun connect(endpoint: BridgeEndpoint) {
     runtime.connect(endpoint)
   }

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

@@ -3,7 +3,6 @@ package com.clawdis.android
 import android.Manifest
 import android.content.Context
 import android.content.pm.PackageManager
-import android.location.LocationManager
 import android.os.Build
 import android.os.SystemClock
 import androidx.core.content.ContextCompat
@@ -17,26 +16,21 @@ import com.clawdis.android.bridge.BridgeEndpoint
 import com.clawdis.android.bridge.BridgePairingClient
 import com.clawdis.android.bridge.BridgeSession
 import com.clawdis.android.node.CameraCaptureManager
-import com.clawdis.android.node.LocationCaptureManager
 import com.clawdis.android.BuildConfig
 import com.clawdis.android.node.CanvasController
 import com.clawdis.android.node.ScreenRecordManager
-import com.clawdis.android.node.SmsManager
 import com.clawdis.android.protocol.ClawdisCapability
 import com.clawdis.android.protocol.ClawdisCameraCommand
 import com.clawdis.android.protocol.ClawdisCanvasA2UIAction
 import com.clawdis.android.protocol.ClawdisCanvasA2UICommand
 import com.clawdis.android.protocol.ClawdisCanvasCommand
 import com.clawdis.android.protocol.ClawdisScreenCommand
-import com.clawdis.android.protocol.ClawdisLocationCommand
-import com.clawdis.android.protocol.ClawdisSmsCommand
 import com.clawdis.android.voice.TalkModeManager
 import com.clawdis.android.voice.VoiceWakeManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -61,9 +55,7 @@ class NodeRuntime(context: Context) {
   val prefs = SecurePrefs(appContext)
   val canvas = CanvasController()
   val camera = CameraCaptureManager(appContext)
-  val location = LocationCaptureManager(appContext)
   val screenRecorder = ScreenRecordManager(appContext)
-  val sms = SmsManager(appContext)
   private val json = Json { ignoreUnknownKeys = true }
 
   private val externalAudioCaptureActive = MutableStateFlow(false)
@@ -194,8 +186,6 @@ class NodeRuntime(context: Context) {
   val instanceId: StateFlow<String> = prefs.instanceId
   val displayName: StateFlow<String> = prefs.displayName
   val cameraEnabled: StateFlow<Boolean> = prefs.cameraEnabled
-  val locationMode: StateFlow<LocationMode> = prefs.locationMode
-  val locationPreciseEnabled: StateFlow<Boolean> = prefs.locationPreciseEnabled
   val preventSleep: StateFlow<Boolean> = prefs.preventSleep
   val wakeWords: StateFlow<List<String>> = prefs.wakeWords
   val voiceWakeMode: StateFlow<VoiceWakeMode> = prefs.voiceWakeMode
@@ -322,14 +312,6 @@ class NodeRuntime(context: Context) {
     prefs.setCameraEnabled(value)
   }
 
-  fun setLocationMode(mode: LocationMode) {
-    prefs.setLocationMode(mode)
-  }
-
-  fun setLocationPreciseEnabled(value: Boolean) {
-    prefs.setLocationPreciseEnabled(value)
-  }
-
   fun setPreventSleep(value: Boolean) {
     prefs.setPreventSleep(value)
   }
@@ -367,112 +349,63 @@ class NodeRuntime(context: Context) {
     prefs.setTalkEnabled(value)
   }
 
-  private fun buildInvokeCommands(): List<String> =
-    buildList {
-      add(ClawdisCanvasCommand.Present.rawValue)
-      add(ClawdisCanvasCommand.Hide.rawValue)
-      add(ClawdisCanvasCommand.Navigate.rawValue)
-      add(ClawdisCanvasCommand.Eval.rawValue)
-      add(ClawdisCanvasCommand.Snapshot.rawValue)
-      add(ClawdisCanvasA2UICommand.Push.rawValue)
-      add(ClawdisCanvasA2UICommand.PushJSONL.rawValue)
-      add(ClawdisCanvasA2UICommand.Reset.rawValue)
-      add(ClawdisScreenCommand.Record.rawValue)
-      if (cameraEnabled.value) {
-        add(ClawdisCameraCommand.Snap.rawValue)
-        add(ClawdisCameraCommand.Clip.rawValue)
-      }
-      if (locationMode.value != LocationMode.Off) {
-        add(ClawdisLocationCommand.Get.rawValue)
-      }
-      if (sms.canSendSms()) {
-        add(ClawdisSmsCommand.Send.rawValue)
-      }
-    }
-
-  private fun buildCapabilities(): List<String> =
-    buildList {
-      add(ClawdisCapability.Canvas.rawValue)
-      add(ClawdisCapability.Screen.rawValue)
-      if (cameraEnabled.value) add(ClawdisCapability.Camera.rawValue)
-      if (sms.canSendSms()) add(ClawdisCapability.Sms.rawValue)
-      if (voiceWakeMode.value != VoiceWakeMode.Off && hasRecordAudioPermission()) {
-        add(ClawdisCapability.VoiceWake.rawValue)
-      }
-      if (locationMode.value != LocationMode.Off) {
-        add(ClawdisCapability.Location.rawValue)
-      }
-    }
-
-  private fun buildPairingHello(token: String?): BridgePairingClient.Hello {
-    val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
-      .joinToString(" ")
-      .trim()
-      .ifEmpty { null }
-    val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
-    val advertisedVersion =
-      if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
-        "$versionName-dev"
-      } else {
-        versionName
-      }
-    return BridgePairingClient.Hello(
-      nodeId = instanceId.value,
-      displayName = displayName.value,
-      token = token,
-      platform = "Android",
-      version = advertisedVersion,
-      deviceFamily = "Android",
-      modelIdentifier = modelIdentifier,
-      caps = buildCapabilities(),
-      commands = buildInvokeCommands(),
-    )
-  }
-
-  private fun buildSessionHello(token: String?): BridgeSession.Hello {
-    val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
-      .joinToString(" ")
-      .trim()
-      .ifEmpty { null }
-    val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
-    val advertisedVersion =
-      if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
-        "$versionName-dev"
-      } else {
-        versionName
-      }
-    return BridgeSession.Hello(
-      nodeId = instanceId.value,
-      displayName = displayName.value,
-      token = token,
-      platform = "Android",
-      version = advertisedVersion,
-      deviceFamily = "Android",
-      modelIdentifier = modelIdentifier,
-      caps = buildCapabilities(),
-      commands = buildInvokeCommands(),
-    )
-  }
-
-  fun refreshBridgeHello() {
-    scope.launch {
-      if (!_isConnected.value) return@launch
-      val token = prefs.loadBridgeToken()
-      if (token.isNullOrBlank()) return@launch
-      session.updateHello(buildSessionHello(token))
-    }
-  }
-
   fun connect(endpoint: BridgeEndpoint) {
     scope.launch {
       _statusText.value = "Connecting…"
       val storedToken = prefs.loadBridgeToken()
+      val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
+        .joinToString(" ")
+        .trim()
+        .ifEmpty { null }
+
+      val invokeCommands =
+        buildList {
+          add(ClawdisCanvasCommand.Present.rawValue)
+          add(ClawdisCanvasCommand.Hide.rawValue)
+          add(ClawdisCanvasCommand.Navigate.rawValue)
+          add(ClawdisCanvasCommand.Eval.rawValue)
+          add(ClawdisCanvasCommand.Snapshot.rawValue)
+          add(ClawdisCanvasA2UICommand.Push.rawValue)
+          add(ClawdisCanvasA2UICommand.PushJSONL.rawValue)
+          add(ClawdisCanvasA2UICommand.Reset.rawValue)
+          add(ClawdisScreenCommand.Record.rawValue)
+          if (cameraEnabled.value) {
+            add(ClawdisCameraCommand.Snap.rawValue)
+            add(ClawdisCameraCommand.Clip.rawValue)
+          }
+        }
       val resolved =
         if (storedToken.isNullOrBlank()) {
           _statusText.value = "Pairing…"
+          val caps = buildList {
+            add(ClawdisCapability.Canvas.rawValue)
+            add(ClawdisCapability.Screen.rawValue)
+            if (cameraEnabled.value) add(ClawdisCapability.Camera.rawValue)
+            if (voiceWakeMode.value != VoiceWakeMode.Off && hasRecordAudioPermission()) {
+              add(ClawdisCapability.VoiceWake.rawValue)
+            }
+          }
+          val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
+          val advertisedVersion =
+            if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
+              "$versionName-dev"
+            } else {
+              versionName
+            }
           BridgePairingClient().pairAndHello(
             endpoint = endpoint,
-            hello = buildPairingHello(token = null),
+            hello =
+              BridgePairingClient.Hello(
+                nodeId = instanceId.value,
+                displayName = displayName.value,
+                token = null,
+                platform = "Android",
+                version = advertisedVersion,
+                deviceFamily = "Android",
+                modelIdentifier = modelIdentifier,
+                caps = caps,
+                commands = invokeCommands,
+              ),
           )
         } else {
           BridgePairingClient.PairResult(ok = true, token = storedToken.trim())
@@ -486,9 +419,35 @@ class NodeRuntime(context: Context) {
 
       val authToken = requireNotNull(resolved.token).trim()
       prefs.saveBridgeToken(authToken)
+      val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
+      val advertisedVersion =
+        if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
+          "$versionName-dev"
+        } else {
+          versionName
+        }
       session.connect(
         endpoint = endpoint,
-        hello = buildSessionHello(token = authToken),
+        hello =
+          BridgeSession.Hello(
+            nodeId = instanceId.value,
+            displayName = displayName.value,
+            token = authToken,
+            platform = "Android",
+            version = advertisedVersion,
+            deviceFamily = "Android",
+            modelIdentifier = modelIdentifier,
+            caps =
+              buildList {
+                add(ClawdisCapability.Canvas.rawValue)
+                add(ClawdisCapability.Screen.rawValue)
+                if (cameraEnabled.value) add(ClawdisCapability.Camera.rawValue)
+                if (voiceWakeMode.value != VoiceWakeMode.Off && hasRecordAudioPermission()) {
+                  add(ClawdisCapability.VoiceWake.rawValue)
+                }
+              },
+            commands = invokeCommands,
+          ),
       )
     }
   }
@@ -500,28 +459,6 @@ class NodeRuntime(context: Context) {
       )
   }
 
-  private fun hasFineLocationPermission(): Boolean {
-    return (
-      ContextCompat.checkSelfPermission(appContext, Manifest.permission.ACCESS_FINE_LOCATION) ==
-        PackageManager.PERMISSION_GRANTED
-      )
-  }
-
-  private fun hasCoarseLocationPermission(): Boolean {
-    return (
-      ContextCompat.checkSelfPermission(appContext, Manifest.permission.ACCESS_COARSE_LOCATION) ==
-        PackageManager.PERMISSION_GRANTED
-      )
-  }
-
-  private fun hasBackgroundLocationPermission(): Boolean {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true
-    return (
-      ContextCompat.checkSelfPermission(appContext, Manifest.permission.ACCESS_BACKGROUND_LOCATION) ==
-        PackageManager.PERMISSION_GRANTED
-      )
-  }
-
   fun connectManual() {
     val host = manualHost.value.trim()
     val port = manualPort.value
@@ -731,14 +668,6 @@ class NodeRuntime(context: Context) {
         message = "CAMERA_DISABLED: enable Camera in Settings",
       )
     }
-    if (command.startsWith(ClawdisLocationCommand.NamespacePrefix) &&
-      locationMode.value == LocationMode.Off
-    ) {
-      return BridgeSession.InvokeResult.error(
-        code = "LOCATION_DISABLED",
-        message = "LOCATION_DISABLED: enable Location in Settings",
-      )
-    }
 
     return when (command) {
       ClawdisCanvasCommand.Present.rawValue -> {
@@ -859,59 +788,6 @@ class NodeRuntime(context: Context) {
           if (includeAudio) externalAudioCaptureActive.value = false
         }
       }
-      ClawdisLocationCommand.Get.rawValue -> {
-        val mode = locationMode.value
-        if (!isForeground.value && mode != LocationMode.Always) {
-          return BridgeSession.InvokeResult.error(
-            code = "LOCATION_BACKGROUND_UNAVAILABLE",
-            message = "LOCATION_BACKGROUND_UNAVAILABLE: background location requires Always",
-          )
-        }
-        if (!hasFineLocationPermission() && !hasCoarseLocationPermission()) {
-          return BridgeSession.InvokeResult.error(
-            code = "LOCATION_PERMISSION_REQUIRED",
-            message = "LOCATION_PERMISSION_REQUIRED: grant Location permission",
-          )
-        }
-        if (!isForeground.value && mode == LocationMode.Always && !hasBackgroundLocationPermission()) {
-          return BridgeSession.InvokeResult.error(
-            code = "LOCATION_PERMISSION_REQUIRED",
-            message = "LOCATION_PERMISSION_REQUIRED: enable Always in system Settings",
-          )
-        }
-        val (maxAgeMs, timeoutMs, desiredAccuracy) = parseLocationParams(paramsJson)
-        val preciseEnabled = locationPreciseEnabled.value
-        val accuracy =
-          when (desiredAccuracy) {
-            "precise" -> if (preciseEnabled && hasFineLocationPermission()) "precise" else "balanced"
-            "coarse" -> "coarse"
-            else -> if (preciseEnabled && hasFineLocationPermission()) "precise" else "balanced"
-          }
-        val providers =
-          when (accuracy) {
-            "precise" -> listOf(LocationManager.GPS_PROVIDER, LocationManager.NETWORK_PROVIDER)
-            "coarse" -> listOf(LocationManager.NETWORK_PROVIDER, LocationManager.GPS_PROVIDER)
-            else -> listOf(LocationManager.NETWORK_PROVIDER, LocationManager.GPS_PROVIDER)
-          }
-        try {
-          val payload =
-            location.getLocation(
-              desiredProviders = providers,
-              maxAgeMs = maxAgeMs,
-              timeoutMs = timeoutMs,
-              isPrecise = accuracy == "precise",
-            )
-          BridgeSession.InvokeResult.ok(payload.payloadJson)
-        } catch (err: TimeoutCancellationException) {
-          BridgeSession.InvokeResult.error(
-            code = "LOCATION_TIMEOUT",
-            message = "LOCATION_TIMEOUT: no fix in time",
-          )
-        } catch (err: Throwable) {
-          val message = err.message ?: "LOCATION_UNAVAILABLE: no fix"
-          BridgeSession.InvokeResult.error(code = "LOCATION_UNAVAILABLE", message = message)
-        }
-      }
       ClawdisScreenCommand.Record.rawValue -> {
         // Status pill mirrors screen recording state so it stays visible without overlay stacking.
         _screenRecordActive.value = true
@@ -928,17 +804,6 @@ class NodeRuntime(context: Context) {
           _screenRecordActive.value = false
         }
       }
-      ClawdisSmsCommand.Send.rawValue -> {
-        val res = sms.send(paramsJson)
-        if (res.ok) {
-          BridgeSession.InvokeResult.ok(res.payloadJson)
-        } else {
-          val error = res.error ?: "SMS_SEND_FAILED"
-          val idx = error.indexOf(':')
-          val code = if (idx > 0) error.substring(0, idx).trim() else "SMS_SEND_FAILED"
-          BridgeSession.InvokeResult.error(code = code, message = error)
-        }
-      }
       else ->
         BridgeSession.InvokeResult.error(
           code = "INVALID_REQUEST",
@@ -976,25 +841,6 @@ class NodeRuntime(context: Context) {
     return code to "$code: $message"
   }
 
-  private fun parseLocationParams(paramsJson: String?): Triple<Long?, Long, String?> {
-    if (paramsJson.isNullOrBlank()) {
-      return Triple(null, 10_000L, null)
-    }
-    val root =
-      try {
-        json.parseToJsonElement(paramsJson).asObjectOrNull()
-      } catch (_: Throwable) {
-        null
-      }
-    val maxAgeMs = (root?.get("maxAgeMs") as? JsonPrimitive)?.content?.toLongOrNull()
-    val timeoutMs =
-      (root?.get("timeoutMs") as? JsonPrimitive)?.content?.toLongOrNull()?.coerceIn(1_000L, 60_000L)
-        ?: 10_000L
-    val desiredAccuracy =
-      (root?.get("desiredAccuracy") as? JsonPrimitive)?.content?.trim()?.lowercase()
-    return Triple(maxAgeMs, timeoutMs, desiredAccuracy)
-  }
-
   private fun resolveA2uiHostUrl(): String? {
     val raw = session.currentCanvasHostUrl()?.trim().orEmpty()
     if (raw.isBlank()) return null

apps/android/app/src/main/java/com/clawdis/android/PermissionRequester.kt

@@ -115,7 +115,7 @@ class PermissionRequester(private val activity: ComponentActivity) {
 
   private fun buildRationaleMessage(permissions: List<String>): String {
     val labels = permissions.map { permissionLabel(it) }
-    return "Clawdis needs ${labels.joinToString(", ")} permissions to continue."
+    return "Clawdis needs ${labels.joinToString(", ")} to capture camera media."
   }
 
   private fun buildSettingsMessage(permissions: List<String>): String {
@@ -127,7 +127,6 @@ class PermissionRequester(private val activity: ComponentActivity) {
     when (permission) {
       Manifest.permission.CAMERA -> "Camera"
       Manifest.permission.RECORD_AUDIO -> "Microphone"
-      Manifest.permission.SEND_SMS -> "SMS"
       else -> permission
     }
 }

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

@@ -47,14 +47,6 @@ class SecurePrefs(context: Context) {
   private val _cameraEnabled = MutableStateFlow(prefs.getBoolean("camera.enabled", true))
   val cameraEnabled: StateFlow<Boolean> = _cameraEnabled
 
-  private val _locationMode =
-    MutableStateFlow(LocationMode.fromRawValue(prefs.getString("location.enabledMode", "off")))
-  val locationMode: StateFlow<LocationMode> = _locationMode
-
-  private val _locationPreciseEnabled =
-    MutableStateFlow(prefs.getBoolean("location.preciseEnabled", true))
-  val locationPreciseEnabled: StateFlow<Boolean> = _locationPreciseEnabled
-
   private val _preventSleep = MutableStateFlow(prefs.getBoolean("screen.preventSleep", true))
   val preventSleep: StateFlow<Boolean> = _preventSleep
 
@@ -101,16 +93,6 @@ class SecurePrefs(context: Context) {
     _cameraEnabled.value = value
   }
 
-  fun setLocationMode(mode: LocationMode) {
-    prefs.edit { putString("location.enabledMode", mode.rawValue) }
-    _locationMode.value = mode
-  }
-
-  fun setLocationPreciseEnabled(value: Boolean) {
-    prefs.edit { putBoolean("location.preciseEnabled", value) }
-    _locationPreciseEnabled.value = value
-  }
-
   fun setPreventSleep(value: Boolean) {
     prefs.edit { putBoolean("screen.preventSleep", value) }
     _preventSleep.value = value

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

@@ -75,13 +75,6 @@ class BridgeSession(
     }
   }
 
-  suspend fun updateHello(hello: Hello) {
-    val target = desired ?: return
-    desired = target.first to hello
-    val conn = currentConnection ?: return
-    conn.sendJson(buildHelloJson(hello))
-  }
-
   fun disconnect() {
     desired = null
     // Unblock connectOnce() read loop. Coroutine cancellation alone won't interrupt BufferedReader.readLine().
@@ -203,7 +196,20 @@ class BridgeSession(
       currentConnection = conn
 
       try {
-        conn.sendJson(buildHelloJson(hello))
+        conn.sendJson(
+          buildJsonObject {
+            put("type", JsonPrimitive("hello"))
+            put("nodeId", JsonPrimitive(hello.nodeId))
+            hello.displayName?.let { put("displayName", JsonPrimitive(it)) }
+            hello.token?.let { put("token", JsonPrimitive(it)) }
+            hello.platform?.let { put("platform", JsonPrimitive(it)) }
+            hello.version?.let { put("version", JsonPrimitive(it)) }
+            hello.deviceFamily?.let { put("deviceFamily", JsonPrimitive(it)) }
+            hello.modelIdentifier?.let { put("modelIdentifier", JsonPrimitive(it)) }
+            hello.caps?.let { put("caps", JsonArray(it.map(::JsonPrimitive))) }
+            hello.commands?.let { put("commands", JsonArray(it.map(::JsonPrimitive))) }
+          },
+        )
 
         val firstLine = reader.readLine() ?: throw IllegalStateException("bridge closed connection")
         val first = json.parseToJsonElement(firstLine).asObjectOrNull()
@@ -301,20 +307,6 @@ class BridgeSession(
       }
     }
 
-  private fun buildHelloJson(hello: Hello): JsonObject =
-    buildJsonObject {
-      put("type", JsonPrimitive("hello"))
-      put("nodeId", JsonPrimitive(hello.nodeId))
-      hello.displayName?.let { put("displayName", JsonPrimitive(it)) }
-      hello.token?.let { put("token", JsonPrimitive(it)) }
-      hello.platform?.let { put("platform", JsonPrimitive(it)) }
-      hello.version?.let { put("version", JsonPrimitive(it)) }
-      hello.deviceFamily?.let { put("deviceFamily", JsonPrimitive(it)) }
-      hello.modelIdentifier?.let { put("modelIdentifier", JsonPrimitive(it)) }
-      hello.caps?.let { put("caps", JsonArray(it.map(::JsonPrimitive))) }
-      hello.commands?.let { put("commands", JsonArray(it.map(::JsonPrimitive))) }
-    }
-
   private fun normalizeCanvasHostUrl(raw: String?, endpoint: BridgeEndpoint): String? {
     val trimmed = raw?.trim().orEmpty()
     val parsed = trimmed.takeIf { it.isNotBlank() }?.let { runCatching { URI(it) }.getOrNull() }

apps/android/app/src/main/java/com/clawdis/android/node/LocationCaptureManager.kt

@@ -1,98 +0,0 @@
-package com.clawdis.android.node
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.location.Location
-import android.location.LocationManager
-import android.os.CancellationSignal
-import java.time.Instant
-import java.time.format.DateTimeFormatter
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeout
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlinx.coroutines.suspendCancellableCoroutine
-
-class LocationCaptureManager(private val context: Context) {
-  data class Payload(val payloadJson: String)
-
-  suspend fun getLocation(
-    desiredProviders: List<String>,
-    maxAgeMs: Long?,
-    timeoutMs: Long,
-    isPrecise: Boolean,
-  ): Payload =
-    withContext(Dispatchers.Main) {
-      val manager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-      if (!manager.isProviderEnabled(LocationManager.GPS_PROVIDER) &&
-        !manager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-      ) {
-        throw IllegalStateException("LOCATION_UNAVAILABLE: no location providers enabled")
-      }
-
-      val cached = bestLastKnown(manager, desiredProviders, maxAgeMs)
-      val location =
-        cached ?: requestCurrent(manager, desiredProviders, timeoutMs)
-
-      val timestamp = DateTimeFormatter.ISO_INSTANT.format(Instant.ofEpochMilli(location.time))
-      val source = location.provider
-      val altitudeMeters = if (location.hasAltitude()) location.altitude else null
-      val speedMps = if (location.hasSpeed()) location.speed.toDouble() else null
-      val headingDeg = if (location.hasBearing()) location.bearing.toDouble() else null
-      Payload(
-        buildString {
-          append("{\"lat\":")
-          append(location.latitude)
-          append(",\"lon\":")
-          append(location.longitude)
-          append(",\"accuracyMeters\":")
-          append(location.accuracy.toDouble())
-          if (altitudeMeters != null) append(",\"altitudeMeters\":").append(altitudeMeters)
-          if (speedMps != null) append(",\"speedMps\":").append(speedMps)
-          if (headingDeg != null) append(",\"headingDeg\":").append(headingDeg)
-          append(",\"timestamp\":\"").append(timestamp).append('"')
-          append(",\"isPrecise\":").append(isPrecise)
-          append(",\"source\":\"").append(source).append('"')
-          append('}')
-        },
-      )
-    }
-
-  private fun bestLastKnown(
-    manager: LocationManager,
-    providers: List<String>,
-    maxAgeMs: Long?,
-  ): Location? {
-    val now = System.currentTimeMillis()
-    val candidates =
-      providers.mapNotNull { provider -> manager.getLastKnownLocation(provider) }
-    val freshest = candidates.maxByOrNull { it.time } ?: return null
-    if (maxAgeMs != null && now - freshest.time > maxAgeMs) return null
-    return freshest
-  }
-
-  @SuppressLint("MissingPermission")
-  private suspend fun requestCurrent(
-    manager: LocationManager,
-    providers: List<String>,
-    timeoutMs: Long,
-  ): Location {
-    val resolved =
-      providers.firstOrNull { manager.isProviderEnabled(it) }
-        ?: throw IllegalStateException("LOCATION_UNAVAILABLE: no providers available")
-    return withTimeout(timeoutMs.coerceAtLeast(1)) {
-      suspendCancellableCoroutine { cont ->
-        val signal = CancellationSignal()
-        cont.invokeOnCancellation { signal.cancel() }
-        manager.getCurrentLocation(resolved, signal, context.mainExecutor) { location ->
-          if (location != null) {
-            cont.resume(location)
-          } else {
-            cont.resumeWithException(IllegalStateException("LOCATION_UNAVAILABLE: no fix"))
-          }
-        }
-      }
-    }
-  }
-}

apps/android/app/src/main/java/com/clawdis/android/node/SmsManager.kt

@@ -1,230 +0,0 @@
-package com.clawdis.android.node
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import android.telephony.SmsManager as AndroidSmsManager
-import androidx.core.content.ContextCompat
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.encodeToString
-import com.clawdis.android.PermissionRequester
-
-/**
- * Sends SMS messages via the Android SMS API.
- * Requires SEND_SMS permission to be granted.
- */
-class SmsManager(private val context: Context) {
-
-    private val json = JsonConfig
-    @Volatile private var permissionRequester: PermissionRequester? = null
-
-    data class SendResult(
-        val ok: Boolean,
-        val to: String,
-        val message: String?,
-        val error: String? = null,
-        val payloadJson: String,
-    )
-
-    internal data class ParsedParams(
-        val to: String,
-        val message: String,
-    )
-
-    internal sealed class ParseResult {
-        data class Ok(val params: ParsedParams) : ParseResult()
-        data class Error(
-            val error: String,
-            val to: String = "",
-            val message: String? = null,
-        ) : ParseResult()
-    }
-
-    internal data class SendPlan(
-        val parts: List<String>,
-        val useMultipart: Boolean,
-    )
-
-    companion object {
-        internal val JsonConfig = Json { ignoreUnknownKeys = true }
-
-        internal fun parseParams(paramsJson: String?, json: Json = JsonConfig): ParseResult {
-            val params = paramsJson?.trim().orEmpty()
-            if (params.isEmpty()) {
-                return ParseResult.Error(error = "INVALID_REQUEST: paramsJSON required")
-            }
-
-            val obj = try {
-                json.parseToJsonElement(params).jsonObject
-            } catch (_: Throwable) {
-                null
-            }
-
-            if (obj == null) {
-                return ParseResult.Error(error = "INVALID_REQUEST: expected JSON object")
-            }
-
-            val to = (obj["to"] as? JsonPrimitive)?.content?.trim().orEmpty()
-            val message = (obj["message"] as? JsonPrimitive)?.content.orEmpty()
-
-            if (to.isEmpty()) {
-                return ParseResult.Error(
-                    error = "INVALID_REQUEST: 'to' phone number required",
-                    message = message,
-                )
-            }
-
-            if (message.isEmpty()) {
-                return ParseResult.Error(
-                    error = "INVALID_REQUEST: 'message' text required",
-                    to = to,
-                )
-            }
-
-            return ParseResult.Ok(ParsedParams(to = to, message = message))
-        }
-
-        internal fun buildSendPlan(
-            message: String,
-            divider: (String) -> List<String>,
-        ): SendPlan {
-            val parts = divider(message).ifEmpty { listOf(message) }
-            return SendPlan(parts = parts, useMultipart = parts.size > 1)
-        }
-
-        internal fun buildPayloadJson(
-            json: Json = JsonConfig,
-            ok: Boolean,
-            to: String,
-            error: String?,
-        ): String {
-            val payload =
-                mutableMapOf<String, JsonElement>(
-                    "ok" to JsonPrimitive(ok),
-                    "to" to JsonPrimitive(to),
-                )
-            if (!ok) {
-                payload["error"] = JsonPrimitive(error ?: "SMS_SEND_FAILED")
-            }
-            return json.encodeToString(JsonObject.serializer(), JsonObject(payload))
-        }
-    }
-
-    fun hasSmsPermission(): Boolean {
-        return ContextCompat.checkSelfPermission(
-            context,
-            Manifest.permission.SEND_SMS
-        ) == PackageManager.PERMISSION_GRANTED
-    }
-
-    fun canSendSms(): Boolean {
-        return hasSmsPermission() && hasTelephonyFeature()
-    }
-
-    fun hasTelephonyFeature(): Boolean {
-        return context.packageManager?.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) == true
-    }
-
-    fun attachPermissionRequester(requester: PermissionRequester) {
-        permissionRequester = requester
-    }
-
-    /**
-     * Send an SMS message.
-     * 
-     * @param paramsJson JSON with "to" (phone number) and "message" (text) fields
-     * @return SendResult indicating success or failure
-     */
-    suspend fun send(paramsJson: String?): SendResult {
-        if (!hasTelephonyFeature()) {
-            return errorResult(
-                error = "SMS_UNAVAILABLE: telephony not available",
-            )
-        }
-
-        if (!ensureSmsPermission()) {
-            return errorResult(
-                error = "SMS_PERMISSION_REQUIRED: grant SMS permission",
-            )
-        }
-
-        val parseResult = parseParams(paramsJson, json)
-        if (parseResult is ParseResult.Error) {
-            return errorResult(
-                error = parseResult.error,
-                to = parseResult.to,
-                message = parseResult.message,
-            )
-        }
-        val params = (parseResult as ParseResult.Ok).params
-
-        return try {
-            val smsManager = context.getSystemService(AndroidSmsManager::class.java)
-                ?: throw IllegalStateException("SMS_UNAVAILABLE: SmsManager not available")
-
-            val plan = buildSendPlan(params.message) { smsManager.divideMessage(it) }
-            if (plan.useMultipart) {
-                smsManager.sendMultipartTextMessage(
-                    params.to,     // destination
-                    null,          // service center (null = default)
-                    ArrayList(plan.parts),    // message parts
-                    null,          // sent intents
-                    null,          // delivery intents
-                )
-            } else {
-                smsManager.sendTextMessage(
-                    params.to,     // destination
-                    null,          // service center (null = default)
-                    params.message,// message
-                    null,          // sent intent
-                    null,          // delivery intent
-                )
-            }
-
-            okResult(to = params.to, message = params.message)
-        } catch (e: SecurityException) {
-            errorResult(
-                error = "SMS_PERMISSION_REQUIRED: ${e.message}",
-                to = params.to,
-                message = params.message,
-            )
-        } catch (e: Throwable) {
-            errorResult(
-                error = "SMS_SEND_FAILED: ${e.message ?: "unknown error"}",
-                to = params.to,
-                message = params.message,
-            )
-        }
-    }
-
-    private suspend fun ensureSmsPermission(): Boolean {
-        if (hasSmsPermission()) return true
-        val requester = permissionRequester ?: return false
-        val results = requester.requestIfMissing(listOf(Manifest.permission.SEND_SMS))
-        return results[Manifest.permission.SEND_SMS] == true
-    }
-
-    private fun okResult(to: String, message: String): SendResult {
-        return SendResult(
-            ok = true,
-            to = to,
-            message = message,
-            error = null,
-            payloadJson = buildPayloadJson(json = json, ok = true, to = to, error = null),
-        )
-    }
-
-    private fun errorResult(error: String, to: String = "", message: String? = null): SendResult {
-        return SendResult(
-            ok = false,
-            to = to,
-            message = message,
-            error = error,
-            payloadJson = buildPayloadJson(json = json, ok = false, to = to, error = error),
-        )
-    }
-}

apps/android/app/src/main/java/com/clawdis/android/protocol/ClawdisProtocolConstants.kt

@@ -4,9 +4,7 @@ enum class ClawdisCapability(val rawValue: String) {
   Canvas("canvas"),
   Camera("camera"),
   Screen("screen"),
-  Sms("sms"),
   VoiceWake("voiceWake"),
-  Location("location"),
 }
 
 enum class ClawdisCanvasCommand(val rawValue: String) {
@@ -51,21 +49,3 @@ enum class ClawdisScreenCommand(val rawValue: String) {
     const val NamespacePrefix: String = "screen."
   }
 }
-
-enum class ClawdisSmsCommand(val rawValue: String) {
-  Send("sms.send"),
-  ;
-
-  companion object {
-    const val NamespacePrefix: String = "sms."
-  }
-}
-
-enum class ClawdisLocationCommand(val rawValue: String) {
-  Get("location.get"),
-  ;
-
-  companion object {
-    const val NamespacePrefix: String = "location."
-  }
-}

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

@@ -1,12 +1,8 @@
 package com.clawdis.android.ui
 
 import android.Manifest
-import android.content.Context
-import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Build
-import android.provider.Settings
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
@@ -46,14 +42,12 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import com.clawdis.android.BuildConfig
-import com.clawdis.android.LocationMode
 import com.clawdis.android.MainViewModel
 import com.clawdis.android.NodeForegroundService
 import com.clawdis.android.VoiceWakeMode
@@ -64,8 +58,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
   val instanceId by viewModel.instanceId.collectAsState()
   val displayName by viewModel.displayName.collectAsState()
   val cameraEnabled by viewModel.cameraEnabled.collectAsState()
-  val locationMode by viewModel.locationMode.collectAsState()
-  val locationPreciseEnabled by viewModel.locationPreciseEnabled.collectAsState()
   val preventSleep by viewModel.preventSleep.collectAsState()
   val wakeWords by viewModel.wakeWords.collectAsState()
   val voiceWakeMode by viewModel.voiceWakeMode.collectAsState()
@@ -109,63 +101,11 @@ fun SettingsSheet(viewModel: MainViewModel) {
       viewModel.setCameraEnabled(cameraOk)
     }
 
-  var pendingLocationMode by remember { mutableStateOf<LocationMode?>(null) }
-  var pendingPreciseToggle by remember { mutableStateOf(false) }
-
-  val locationPermissionLauncher =
-    rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { perms ->
-      val fineOk = perms[Manifest.permission.ACCESS_FINE_LOCATION] == true
-      val coarseOk = perms[Manifest.permission.ACCESS_COARSE_LOCATION] == true
-      val granted = fineOk || coarseOk
-      val requestedMode = pendingLocationMode
-      pendingLocationMode = null
-
-      if (pendingPreciseToggle) {
-        pendingPreciseToggle = false
-        viewModel.setLocationPreciseEnabled(fineOk)
-        return@rememberLauncherForActivityResult
-      }
-
-      if (!granted) {
-        viewModel.setLocationMode(LocationMode.Off)
-        return@rememberLauncherForActivityResult
-      }
-
-      if (requestedMode != null) {
-        viewModel.setLocationMode(requestedMode)
-        if (requestedMode == LocationMode.Always && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-          val backgroundOk =
-            ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_BACKGROUND_LOCATION) ==
-              PackageManager.PERMISSION_GRANTED
-          if (!backgroundOk) {
-            openAppSettings(context)
-          }
-        }
-      }
-    }
-
   val audioPermissionLauncher =
     rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { _ ->
       // Status text is handled by NodeRuntime.
     }
 
-  val smsPermissionAvailable =
-    remember {
-      context.packageManager?.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) == true
-    }
-  var smsPermissionGranted by
-    remember {
-      mutableStateOf(
-        ContextCompat.checkSelfPermission(context, Manifest.permission.SEND_SMS) ==
-          PackageManager.PERMISSION_GRANTED,
-      )
-    }
-  val smsPermissionLauncher =
-    rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
-      smsPermissionGranted = granted
-      viewModel.refreshBridgeHello()
-    }
-
   fun setCameraEnabledChecked(checked: Boolean) {
     if (!checked) {
       viewModel.setCameraEnabled(false)
@@ -182,47 +122,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
     }
   }
 
-  fun requestLocationPermissions(targetMode: LocationMode) {
-    val fineOk =
-      ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ==
-        PackageManager.PERMISSION_GRANTED
-    val coarseOk =
-      ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) ==
-        PackageManager.PERMISSION_GRANTED
-    if (fineOk || coarseOk) {
-      viewModel.setLocationMode(targetMode)
-      if (targetMode == LocationMode.Always && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        val backgroundOk =
-          ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_BACKGROUND_LOCATION) ==
-            PackageManager.PERMISSION_GRANTED
-        if (!backgroundOk) {
-          openAppSettings(context)
-        }
-      }
-    } else {
-      pendingLocationMode = targetMode
-      locationPermissionLauncher.launch(
-        arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION),
-      )
-    }
-  }
-
-  fun setPreciseLocationChecked(checked: Boolean) {
-    if (!checked) {
-      viewModel.setLocationPreciseEnabled(false)
-      return
-    }
-    val fineOk =
-      ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ==
-        PackageManager.PERMISSION_GRANTED
-    if (fineOk) {
-      viewModel.setLocationPreciseEnabled(true)
-    } else {
-      pendingPreciseToggle = true
-      locationPermissionLauncher.launch(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION))
-    }
-  }
-
   val visibleBridges =
     if (isConnected && remoteAddress != null) {
       bridges.filterNot { "${it.host}:${it.port}" == remoteAddress }
@@ -250,7 +149,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
     contentPadding = PaddingValues(16.dp),
     verticalArrangement = Arrangement.spacedBy(6.dp),
   ) {
-    // Order parity: Node → Bridge → Voice → Camera → Messaging → Location → Screen.
+    // Order parity: Node → Bridge → Voice → Camera → Screen.
     item { Text("Node", style = MaterialTheme.typography.titleSmall) }
     item {
       OutlinedTextField(
@@ -524,104 +423,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
 
     item { HorizontalDivider() }
 
-    // Messaging
-    item { Text("Messaging", style = MaterialTheme.typography.titleSmall) }
-    item {
-      val buttonLabel =
-        when {
-          !smsPermissionAvailable -> "Unavailable"
-          smsPermissionGranted -> "Manage"
-          else -> "Grant"
-        }
-      ListItem(
-        headlineContent = { Text("SMS Permission") },
-        supportingContent = {
-          Text(
-            if (smsPermissionAvailable) {
-              "Allow the bridge to send SMS from this device."
-            } else {
-              "SMS requires a device with telephony hardware."
-            },
-          )
-        },
-        trailingContent = {
-          Button(
-            onClick = {
-              if (!smsPermissionAvailable) return@Button
-              if (smsPermissionGranted) {
-                openAppSettings(context)
-              } else {
-                smsPermissionLauncher.launch(Manifest.permission.SEND_SMS)
-              }
-            },
-            enabled = smsPermissionAvailable,
-          ) {
-            Text(buttonLabel)
-          }
-        },
-      )
-    }
-
-    item { HorizontalDivider() }
-
-    // Location
-    item { Text("Location", style = MaterialTheme.typography.titleSmall) }
-    item {
-      Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) {
-        ListItem(
-          headlineContent = { Text("Off") },
-          supportingContent = { Text("Disable location sharing.") },
-          trailingContent = {
-            RadioButton(
-              selected = locationMode == LocationMode.Off,
-              onClick = { viewModel.setLocationMode(LocationMode.Off) },
-            )
-          },
-        )
-        ListItem(
-          headlineContent = { Text("While Using") },
-          supportingContent = { Text("Only while Clawdis is open.") },
-          trailingContent = {
-            RadioButton(
-              selected = locationMode == LocationMode.WhileUsing,
-              onClick = { requestLocationPermissions(LocationMode.WhileUsing) },
-            )
-          },
-        )
-        ListItem(
-          headlineContent = { Text("Always") },
-          supportingContent = { Text("Allow background location (requires system permission).") },
-          trailingContent = {
-            RadioButton(
-              selected = locationMode == LocationMode.Always,
-              onClick = { requestLocationPermissions(LocationMode.Always) },
-            )
-          },
-        )
-      }
-    }
-    item {
-      ListItem(
-        headlineContent = { Text("Precise Location") },
-        supportingContent = { Text("Use precise GPS when available.") },
-        trailingContent = {
-          Switch(
-            checked = locationPreciseEnabled,
-            onCheckedChange = ::setPreciseLocationChecked,
-            enabled = locationMode != LocationMode.Off,
-          )
-        },
-      )
-    }
-    item {
-      Text(
-        "Always may require Android Settings to allow background location.",
-        color = MaterialTheme.colorScheme.onSurfaceVariant,
-      )
-    }
-
-    item { HorizontalDivider() }
-
     // Screen
     item { Text("Screen", style = MaterialTheme.typography.titleSmall) }
     item {
@@ -652,12 +453,3 @@ fun SettingsSheet(viewModel: MainViewModel) {
     item { Spacer(modifier = Modifier.height(20.dp)) }
   }
 }
-
-private fun openAppSettings(context: Context) {
-  val intent =
-    Intent(
-      Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-      Uri.fromParts("package", context.packageName, null),
-    )
-  context.startActivity(intent)
-}

apps/android/app/src/test/java/com/clawdis/android/node/SmsManagerTest.kt

@@ -1,91 +0,0 @@
-package com.clawdis.android.node
-
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class SmsManagerTest {
-  private val json = SmsManager.JsonConfig
-
-  @Test
-  fun parseParamsRejectsEmptyPayload() {
-    val result = SmsManager.parseParams("", json)
-    assertTrue(result is SmsManager.ParseResult.Error)
-    val error = result as SmsManager.ParseResult.Error
-    assertEquals("INVALID_REQUEST: paramsJSON required", error.error)
-  }
-
-  @Test
-  fun parseParamsRejectsInvalidJson() {
-    val result = SmsManager.parseParams("not-json", json)
-    assertTrue(result is SmsManager.ParseResult.Error)
-    val error = result as SmsManager.ParseResult.Error
-    assertEquals("INVALID_REQUEST: expected JSON object", error.error)
-  }
-
-  @Test
-  fun parseParamsRejectsNonObjectJson() {
-    val result = SmsManager.parseParams("[]", json)
-    assertTrue(result is SmsManager.ParseResult.Error)
-    val error = result as SmsManager.ParseResult.Error
-    assertEquals("INVALID_REQUEST: expected JSON object", error.error)
-  }
-
-  @Test
-  fun parseParamsRejectsMissingTo() {
-    val result = SmsManager.parseParams("{\"message\":\"Hi\"}", json)
-    assertTrue(result is SmsManager.ParseResult.Error)
-    val error = result as SmsManager.ParseResult.Error
-    assertEquals("INVALID_REQUEST: 'to' phone number required", error.error)
-    assertEquals("Hi", error.message)
-  }
-
-  @Test
-  fun parseParamsRejectsMissingMessage() {
-    val result = SmsManager.parseParams("{\"to\":\"+1234\"}", json)
-    assertTrue(result is SmsManager.ParseResult.Error)
-    val error = result as SmsManager.ParseResult.Error
-    assertEquals("INVALID_REQUEST: 'message' text required", error.error)
-    assertEquals("+1234", error.to)
-  }
-
-  @Test
-  fun parseParamsTrimsToField() {
-    val result = SmsManager.parseParams("{\"to\":\"  +1555  \",\"message\":\"Hello\"}", json)
-    assertTrue(result is SmsManager.ParseResult.Ok)
-    val ok = result as SmsManager.ParseResult.Ok
-    assertEquals("+1555", ok.params.to)
-    assertEquals("Hello", ok.params.message)
-  }
-
-  @Test
-  fun buildPayloadJsonEscapesFields() {
-    val payload = SmsManager.buildPayloadJson(
-      json = json,
-      ok = false,
-      to = "+1\"23",
-      error = "SMS_SEND_FAILED: \"nope\"",
-    )
-    val parsed = json.parseToJsonElement(payload).jsonObject
-    assertEquals("false", parsed["ok"]?.jsonPrimitive?.content)
-    assertEquals("+1\"23", parsed["to"]?.jsonPrimitive?.content)
-    assertEquals("SMS_SEND_FAILED: \"nope\"", parsed["error"]?.jsonPrimitive?.content)
-  }
-
-  @Test
-  fun buildSendPlanUsesMultipartWhenMultipleParts() {
-    val plan = SmsManager.buildSendPlan("hello") { listOf("a", "b") }
-    assertTrue(plan.useMultipart)
-    assertEquals(listOf("a", "b"), plan.parts)
-  }
-
-  @Test
-  fun buildSendPlanFallsBackToSinglePartWhenDividerEmpty() {
-    val plan = SmsManager.buildSendPlan("hello") { emptyList() }
-    assertFalse(plan.useMultipart)
-    assertEquals(listOf("hello"), plan.parts)
-  }
-}

apps/ios/Sources/Bridge/BridgeConnectionController.swift

@@ -229,10 +229,6 @@ final class BridgeConnectionController {
         let voiceWakeEnabled = UserDefaults.standard.bool(forKey: VoiceWakePreferences.enabledKey)
         if voiceWakeEnabled { caps.append(ClawdisCapability.voiceWake.rawValue) }
 
-        let locationModeRaw = UserDefaults.standard.string(forKey: "location.enabledMode") ?? "off"
-        let locationMode = ClawdisLocationMode(rawValue: locationModeRaw) ?? .off
-        if locationMode != .off { caps.append(ClawdisCapability.location.rawValue) }
-
         return caps
     }
 
@@ -255,9 +251,6 @@ final class BridgeConnectionController {
             commands.append(ClawdisCameraCommand.snap.rawValue)
             commands.append(ClawdisCameraCommand.clip.rawValue)
         }
-        if caps.contains(ClawdisCapability.location.rawValue) {
-            commands.append(ClawdisLocationCommand.get.rawValue)
-        }
 
         return commands
     }

apps/ios/Sources/Info.plist

@@ -35,10 +35,6 @@
 	<string>Clawdis can capture photos or short video clips when requested via the bridge.</string>
 	<key>NSLocalNetworkUsageDescription</key>
 	<string>Clawdis discovers and connects to your Clawdis bridge on the local network.</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Clawdis uses your location when you allow location sharing.</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Clawdis can share your location in the background when you enable Always.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Clawdis needs microphone access for voice wake.</string>
 	<key>NSSpeechRecognitionUsageDescription</key>

apps/ios/Sources/Location/LocationService.swift

@@ -1,142 +0,0 @@
-import ClawdisKit
-import CoreLocation
-import Foundation
-
-@MainActor
-final class LocationService: NSObject, CLLocationManagerDelegate {
-    enum Error: Swift.Error {
-        case timeout
-        case unavailable
-    }
-
-    private let manager = CLLocationManager()
-    private var authContinuation: CheckedContinuation<CLAuthorizationStatus, Never>?
-    private var locationContinuation: CheckedContinuation<CLLocation, Swift.Error>?
-
-    override init() {
-        super.init()
-        self.manager.delegate = self
-        self.manager.desiredAccuracy = kCLLocationAccuracyBest
-    }
-
-    func authorizationStatus() -> CLAuthorizationStatus {
-        self.manager.authorizationStatus
-    }
-
-    func accuracyAuthorization() -> CLAccuracyAuthorization {
-        if #available(iOS 14.0, *) {
-            return self.manager.accuracyAuthorization
-        }
-        return .fullAccuracy
-    }
-
-    func ensureAuthorization(mode: ClawdisLocationMode) async -> CLAuthorizationStatus {
-        guard CLLocationManager.locationServicesEnabled() else { return .denied }
-
-        let status = self.manager.authorizationStatus
-        if status == .notDetermined {
-            self.manager.requestWhenInUseAuthorization()
-            let updated = await self.awaitAuthorizationChange()
-            if mode != .always { return updated }
-        }
-
-        if mode == .always {
-            let current = self.manager.authorizationStatus
-            if current == .authorizedWhenInUse {
-                self.manager.requestAlwaysAuthorization()
-                return await self.awaitAuthorizationChange()
-            }
-            return current
-        }
-
-        return self.manager.authorizationStatus
-    }
-
-    func currentLocation(
-        params: ClawdisLocationGetParams,
-        desiredAccuracy: ClawdisLocationAccuracy,
-        maxAgeMs: Int?,
-        timeoutMs: Int?) async throws -> CLLocation
-    {
-        let now = Date()
-        if let maxAgeMs,
-           let cached = self.manager.location,
-           now.timeIntervalSince(cached.timestamp) * 1000 <= Double(maxAgeMs)
-        {
-            return cached
-        }
-
-        self.manager.desiredAccuracy = Self.accuracyValue(desiredAccuracy)
-        let timeout = max(0, timeoutMs ?? 10_000)
-        return try await self.withTimeout(timeoutMs: timeout) {
-            try await self.requestLocation()
-        }
-    }
-
-    private func requestLocation() async throws -> CLLocation {
-        try await withCheckedThrowingContinuation { cont in
-            self.locationContinuation = cont
-            self.manager.requestLocation()
-        }
-    }
-
-    private func awaitAuthorizationChange() async -> CLAuthorizationStatus {
-        await withCheckedContinuation { cont in
-            self.authContinuation = cont
-        }
-    }
-
-    private func withTimeout<T>(
-        timeoutMs: Int,
-        operation: @escaping () async throws -> T) async throws -> T
-    {
-        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: ClawdisLocationAccuracy) -> CLLocationAccuracy {
-        switch accuracy {
-        case .coarse:
-            return kCLLocationAccuracyKilometer
-        case .balanced:
-            return kCLLocationAccuracyHundredMeters
-        case .precise:
-            return kCLLocationAccuracyBest
-        }
-    }
-
-    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        if let cont = self.authContinuation {
-            self.authContinuation = nil
-            cont.resume(returning: manager.authorizationStatus)
-        }
-    }
-
-    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        guard let cont = self.locationContinuation else { return }
-        self.locationContinuation = nil
-        if let latest = locations.last {
-            cont.resume(returning: latest)
-        } else {
-            cont.resume(throwing: Error.unavailable)
-        }
-    }
-
-    func locationManager(_ manager: CLLocationManager, didFailWithError error: Swift.Error) {
-        guard let cont = self.locationContinuation else { return }
-        self.locationContinuation = nil
-        cont.resume(throwing: error)
-    }
-}

apps/ios/Sources/Model/NodeAppModel.swift

@@ -31,7 +31,6 @@ final class NodeAppModel {
     @ObservationIgnored private var cameraHUDDismissTask: Task<Void, Never>?
     let voiceWake = VoiceWakeManager()
     let talkMode = TalkModeManager()
-    private let locationService = LocationService()
     private var lastAutoA2uiURL: String?
 
     var bridgeSession: BridgeSession { self.bridge }
@@ -189,19 +188,6 @@ final class NodeAppModel {
         self.talkMode.setEnabled(enabled)
     }
 
-    func requestLocationPermissions(mode: ClawdisLocationMode) async -> Bool {
-        guard mode != .off else { return true }
-        let status = await self.locationService.ensureAuthorization(mode: mode)
-        switch status {
-        case .authorizedAlways:
-            return true
-        case .authorizedWhenInUse:
-            return mode != .always
-        default:
-            return false
-        }
-    }
-
     func connectToBridge(
         endpoint: NWEndpoint,
         hello: BridgeHello)
@@ -480,64 +466,6 @@ final class NodeAppModel {
 
         do {
             switch command {
-            case ClawdisLocationCommand.get.rawValue:
-                let mode = self.locationMode()
-                guard mode != .off else {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "LOCATION_DISABLED: enable Location in Settings"))
-                }
-                if self.isBackgrounded, mode != .always {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .backgroundUnavailable,
-                            message: "LOCATION_BACKGROUND_UNAVAILABLE: background location requires Always"))
-                }
-                let params = (try? Self.decodeParams(ClawdisLocationGetParams.self, from: req.paramsJSON)) ??
-                    ClawdisLocationGetParams()
-                let desired = params.desiredAccuracy ??
-                    (self.isLocationPreciseEnabled() ? .precise : .balanced)
-                let status = self.locationService.authorizationStatus()
-                if status != .authorizedAlways && status != .authorizedWhenInUse {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "LOCATION_PERMISSION_REQUIRED: grant Location permission"))
-                }
-                if self.isBackgrounded && status != .authorizedAlways {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "LOCATION_PERMISSION_REQUIRED: enable Always for background access"))
-                }
-                let location = try await self.locationService.currentLocation(
-                    params: params,
-                    desiredAccuracy: desired,
-                    maxAgeMs: params.maxAgeMs,
-                    timeoutMs: params.timeoutMs)
-                let isPrecise = self.locationService.accuracyAuthorization() == .fullAccuracy
-                let payload = ClawdisLocationPayload(
-                    lat: location.coordinate.latitude,
-                    lon: location.coordinate.longitude,
-                    accuracyMeters: location.horizontalAccuracy,
-                    altitudeMeters: location.verticalAccuracy >= 0 ? location.altitude : nil,
-                    speedMps: location.speed >= 0 ? location.speed : nil,
-                    headingDeg: location.course >= 0 ? location.course : nil,
-                    timestamp: ISO8601DateFormatter().string(from: location.timestamp),
-                    isPrecise: isPrecise,
-                    source: nil)
-                let json = try Self.encodePayload(payload)
-                return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: json)
-
             case ClawdisCanvasCommand.present.rawValue:
                 let params = (try? Self.decodeParams(ClawdisCanvasPresentParams.self, from: req.paramsJSON)) ??
                     ClawdisCanvasPresentParams()
@@ -768,16 +696,6 @@ final class NodeAppModel {
         }
     }
 
-    private func locationMode() -> ClawdisLocationMode {
-        let raw = UserDefaults.standard.string(forKey: "location.enabledMode") ?? "off"
-        return ClawdisLocationMode(rawValue: raw) ?? .off
-    }
-
-    private func isLocationPreciseEnabled() -> Bool {
-        if UserDefaults.standard.object(forKey: "location.preciseEnabled") == nil { return true }
-        return UserDefaults.standard.bool(forKey: "location.preciseEnabled")
-    }
-
     private static func decodeParams<T: Decodable>(_ type: T.Type, from json: String?) throws -> T {
         guard let json, let data = json.data(using: .utf8) else {
             throw NSError(domain: "Bridge", code: 20, userInfo: [

apps/ios/Sources/Settings/SettingsTab.swift

@@ -23,8 +23,6 @@ struct SettingsTab: View {
     @AppStorage("talk.enabled") private var talkEnabled: Bool = false
     @AppStorage("talk.button.enabled") private var talkButtonEnabled: Bool = true
     @AppStorage("camera.enabled") private var cameraEnabled: Bool = true
-    @AppStorage("location.enabledMode") private var locationEnabledModeRaw: String = ClawdisLocationMode.off.rawValue
-    @AppStorage("location.preciseEnabled") private var locationPreciseEnabled: Bool = true
     @AppStorage("screen.preventSleep") private var preventSleep: Bool = true
     @AppStorage("bridge.preferredStableID") private var preferredBridgeStableID: String = ""
     @AppStorage("bridge.lastDiscoveredStableID") private var lastDiscoveredBridgeStableID: String = ""
@@ -36,7 +34,6 @@ struct SettingsTab: View {
     @State private var connectStatus = ConnectStatusStore()
     @State private var connectingBridgeID: String?
     @State private var localIPAddress: String?
-    @State private var lastLocationModeRaw: String = ClawdisLocationMode.off.rawValue
 
     var body: some View {
         NavigationStack {
@@ -184,22 +181,6 @@ struct SettingsTab: View {
                         .foregroundStyle(.secondary)
                 }
 
-                Section("Location") {
-                    Picker("Location Access", selection: self.$locationEnabledModeRaw) {
-                        Text("Off").tag(ClawdisLocationMode.off.rawValue)
-                        Text("While Using").tag(ClawdisLocationMode.whileUsing.rawValue)
-                        Text("Always").tag(ClawdisLocationMode.always.rawValue)
-                    }
-                    .pickerStyle(.segmented)
-
-                    Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
-                        .disabled(self.locationMode == .off)
-
-                    Text("Always requires system permission and may prompt to open Settings.")
-                        .font(.footnote)
-                        .foregroundStyle(.secondary)
-                }
-
                 Section("Screen") {
                     Toggle("Prevent Sleep", isOn: self.$preventSleep)
                     Text("Keeps the screen awake while Clawdis is open.")
@@ -220,7 +201,6 @@ struct SettingsTab: View {
             }
             .onAppear {
                 self.localIPAddress = Self.primaryIPv4Address()
-                self.lastLocationModeRaw = self.locationEnabledModeRaw
             }
             .onChange(of: self.preferredBridgeStableID) { _, newValue in
                 let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -230,20 +210,6 @@ struct SettingsTab: View {
             .onChange(of: self.appModel.bridgeServerName) { _, _ in
                 self.connectStatus.text = nil
             }
-            .onChange(of: self.locationEnabledModeRaw) { _, newValue in
-                let previous = self.lastLocationModeRaw
-                self.lastLocationModeRaw = newValue
-                guard let mode = ClawdisLocationMode(rawValue: newValue) else { return }
-                Task {
-                    let granted = await self.appModel.requestLocationPermissions(mode: mode)
-                    if !granted {
-                        await MainActor.run {
-                            self.locationEnabledModeRaw = previous
-                            self.lastLocationModeRaw = previous
-                        }
-                    }
-                }
-            }
         }
     }
 
@@ -312,10 +278,6 @@ struct SettingsTab: View {
         return "iOS \(v.majorVersion).\(v.minorVersion).\(v.patchVersion)"
     }
 
-    private var locationMode: ClawdisLocationMode {
-        ClawdisLocationMode(rawValue: self.locationEnabledModeRaw) ?? .off
-    }
-
     private func appVersion() -> String {
         Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"
     }

apps/macos/Sources/Clawdis/AppState.swift

@@ -8,8 +8,6 @@ import SwiftUI
 @Observable
 final class AppState {
     private let isPreview: Bool
-    private var isInitializing = true
-    private var configWatcher: ConfigFileWatcher?
     private var suppressVoiceWakeGlobalSync = false
     private var voiceWakeGlobalSyncTask: Task<Void, Never>?
 
@@ -155,7 +153,6 @@ final class AppState {
     var connectionMode: ConnectionMode {
         didSet {
             self.ifNotPreview { UserDefaults.standard.set(self.connectionMode.rawValue, forKey: connectionModeKey) }
-            self.syncGatewayConfigIfNeeded()
         }
     }
 
@@ -184,10 +181,7 @@ final class AppState {
     }
 
     var remoteTarget: String {
-        didSet {
-            self.ifNotPreview { UserDefaults.standard.set(self.remoteTarget, forKey: remoteTargetKey) }
-            self.syncGatewayConfigIfNeeded()
-        }
+        didSet { self.ifNotPreview { UserDefaults.standard.set(self.remoteTarget, forKey: remoteTargetKey) } }
     }
 
     var remoteIdentity: String {
@@ -251,44 +245,13 @@ final class AppState {
             UserDefaults.standard.set(IconOverrideSelection.system.rawValue, forKey: iconOverrideKey)
         }
 
-        let configRoot = ClawdisConfigFile.loadDict()
-        let configGateway = configRoot["gateway"] as? [String: Any]
-        let configModeRaw = (configGateway?["mode"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let configMode: ConnectionMode? = {
-            switch configModeRaw {
-            case "local":
-                return .local
-            case "remote":
-                return .remote
-            default:
-                return nil
-            }
-        }()
-        let configRemoteUrl = (configGateway?["remote"] as? [String: Any])?["url"] as? String
-        let configHasRemoteUrl = !(configRemoteUrl?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .isEmpty ?? true)
-
         let storedMode = UserDefaults.standard.string(forKey: connectionModeKey)
-        if let configMode {
-            self.connectionMode = configMode
-        } else if configHasRemoteUrl {
-            self.connectionMode = .remote
-        } else if let storedMode {
+        if let storedMode {
             self.connectionMode = ConnectionMode(rawValue: storedMode) ?? .local
         } else {
             self.connectionMode = onboardingSeen ? .local : .unconfigured
         }
-
-        let storedRemoteTarget = UserDefaults.standard.string(forKey: remoteTargetKey) ?? ""
-        if self.connectionMode == .remote,
-           storedRemoteTarget.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,
-           let host = AppState.remoteHost(from: configRemoteUrl)
-        {
-            self.remoteTarget = "\(NSUserName())@\(host)"
-        } else {
-            self.remoteTarget = storedRemoteTarget
-        }
+        self.remoteTarget = UserDefaults.standard.string(forKey: remoteTargetKey) ?? ""
         self.remoteIdentity = UserDefaults.standard.string(forKey: remoteIdentityKey) ?? ""
         self.remoteProjectRoot = UserDefaults.standard.string(forKey: remoteProjectRootKey) ?? ""
         self.remoteCliPath = UserDefaults.standard.string(forKey: remoteCliPathKey) ?? ""
@@ -315,138 +278,6 @@ final class AppState {
             Task { await VoiceWakeRuntime.shared.refresh(state: self) }
             Task { await TalkModeController.shared.setEnabled(self.talkEnabled) }
         }
-
-        self.isInitializing = false
-        if !self.isPreview {
-            self.startConfigWatcher()
-        }
-    }
-
-    deinit {
-        self.configWatcher?.stop()
-    }
-
-    private static func remoteHost(from urlString: String?) -> String? {
-        guard let raw = urlString?.trimmingCharacters(in: .whitespacesAndNewlines),
-              !raw.isEmpty,
-              let url = URL(string: raw),
-              let host = url.host?.trimmingCharacters(in: .whitespacesAndNewlines),
-              !host.isEmpty
-        else {
-            return nil
-        }
-        return host
-    }
-
-    private func startConfigWatcher() {
-        let configUrl = ClawdisConfigFile.url()
-        self.configWatcher = ConfigFileWatcher(url: configUrl) { [weak self] in
-            Task { @MainActor in
-                self?.applyConfigFromDisk()
-            }
-        }
-        self.configWatcher?.start()
-    }
-
-    private func applyConfigFromDisk() {
-        let root = ClawdisConfigFile.loadDict()
-        self.applyConfigOverrides(root)
-    }
-
-    private func applyConfigOverrides(_ root: [String: Any]) {
-        let gateway = root["gateway"] as? [String: Any]
-        let modeRaw = (gateway?["mode"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let remoteUrl = (gateway?["remote"] as? [String: Any])?["url"] as? String
-        let hasRemoteUrl = !(remoteUrl?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .isEmpty ?? true)
-
-        let desiredMode: ConnectionMode? = {
-            switch modeRaw {
-            case "local":
-                return .local
-            case "remote":
-                return .remote
-            case "unconfigured":
-                return .unconfigured
-            default:
-                return nil
-            }
-        }()
-
-        if let desiredMode {
-            if desiredMode != self.connectionMode {
-                self.connectionMode = desiredMode
-            }
-        } else if hasRemoteUrl, self.connectionMode != .remote {
-            self.connectionMode = .remote
-        }
-
-        let targetMode = desiredMode ?? self.connectionMode
-        if targetMode == .remote,
-           let host = AppState.remoteHost(from: remoteUrl)
-        {
-            self.updateRemoteTarget(host: host)
-        }
-    }
-
-    private func updateRemoteTarget(host: String) {
-        let parsed = CommandResolver.parseSSHTarget(self.remoteTarget)
-        let user = parsed?.user ?? NSUserName()
-        let port = parsed?.port ?? 22
-        let assembled = port == 22 ? "\(user)@\(host)" : "\(user)@\(host):\(port)"
-        if assembled != self.remoteTarget {
-            self.remoteTarget = assembled
-        }
-    }
-
-    private func syncGatewayConfigIfNeeded() {
-        guard !self.isPreview, !self.isInitializing else { return }
-
-        var root = ClawdisConfigFile.loadDict()
-        var gateway = root["gateway"] as? [String: Any] ?? [:]
-        var changed = false
-
-        let desiredMode: String?
-        switch self.connectionMode {
-        case .local:
-            desiredMode = "local"
-        case .remote:
-            desiredMode = "remote"
-        case .unconfigured:
-            desiredMode = nil
-        }
-
-        let currentMode = (gateway["mode"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-        if let desiredMode {
-            if currentMode != desiredMode {
-                gateway["mode"] = desiredMode
-                changed = true
-            }
-        } else if currentMode != nil {
-            gateway.removeValue(forKey: "mode")
-            changed = true
-        }
-
-        if self.connectionMode == .remote,
-           let host = CommandResolver.parseSSHTarget(self.remoteTarget)?.host
-        {
-            var remote = gateway["remote"] as? [String: Any] ?? [:]
-            let existingUrl = (remote["url"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-            let parsedExisting = existingUrl.isEmpty ? nil : URL(string: existingUrl)
-            let scheme = parsedExisting?.scheme?.isEmpty == false ? parsedExisting?.scheme : "ws"
-            let port = parsedExisting?.port ?? 18789
-            let desiredUrl = "\(scheme ?? "ws")://\(host):\(port)"
-            if existingUrl != desiredUrl {
-                remote["url"] = desiredUrl
-                gateway["remote"] = remote
-                changed = true
-            }
-        }
-
-        guard changed else { return }
-        root["gateway"] = gateway
-        ClawdisConfigFile.saveDict(root)
     }
 
     func triggerVoiceEars(ttl: TimeInterval? = 5) {

apps/macos/Sources/Clawdis/ConfigFileWatcher.swift

@@ -1,118 +0,0 @@
-import CoreServices
-import Foundation
-
-final class ConfigFileWatcher: @unchecked Sendable {
-    private let url: URL
-    private let queue: DispatchQueue
-    private var stream: FSEventStreamRef?
-    private var pending = false
-    private let onChange: () -> Void
-    private let watchedDir: URL
-    private let targetPath: String
-    private let targetName: String
-
-    init(url: URL, onChange: @escaping () -> Void) {
-        self.url = url
-        self.queue = DispatchQueue(label: "com.clawdis.configwatcher")
-        self.onChange = onChange
-        self.watchedDir = url.deletingLastPathComponent()
-        self.targetPath = url.path
-        self.targetName = url.lastPathComponent
-    }
-
-    deinit {
-        self.stop()
-    }
-
-    func start() {
-        guard self.stream == nil else { return }
-
-        let retainedSelf = Unmanaged.passRetained(self)
-        var context = FSEventStreamContext(
-            version: 0,
-            info: retainedSelf.toOpaque(),
-            retain: nil,
-            release: { pointer in
-                guard let pointer else { return }
-                Unmanaged<ConfigFileWatcher>.fromOpaque(pointer).release()
-            },
-            copyDescription: nil)
-
-        let paths = [self.watchedDir.path] as CFArray
-        let flags = FSEventStreamCreateFlags(
-            kFSEventStreamCreateFlagFileEvents |
-                kFSEventStreamCreateFlagUseCFTypes |
-                kFSEventStreamCreateFlagNoDefer)
-
-        guard let stream = FSEventStreamCreate(
-            kCFAllocatorDefault,
-            Self.callback,
-            &context,
-            paths,
-            FSEventStreamEventId(kFSEventStreamEventIdSinceNow),
-            0.05,
-            flags)
-        else {
-            retainedSelf.release()
-            return
-        }
-
-        self.stream = stream
-        FSEventStreamSetDispatchQueue(stream, self.queue)
-        if FSEventStreamStart(stream) == false {
-            self.stream = nil
-            FSEventStreamSetDispatchQueue(stream, nil)
-            FSEventStreamInvalidate(stream)
-            FSEventStreamRelease(stream)
-        }
-    }
-
-    func stop() {
-        guard let stream = self.stream else { return }
-        self.stream = nil
-        FSEventStreamStop(stream)
-        FSEventStreamSetDispatchQueue(stream, nil)
-        FSEventStreamInvalidate(stream)
-        FSEventStreamRelease(stream)
-    }
-}
-
-extension ConfigFileWatcher {
-    private static let callback: FSEventStreamCallback = { _, info, numEvents, eventPaths, eventFlags, _ in
-        guard let info else { return }
-        let watcher = Unmanaged<ConfigFileWatcher>.fromOpaque(info).takeUnretainedValue()
-        watcher.handleEvents(
-            numEvents: numEvents,
-            eventPaths: eventPaths,
-            eventFlags: eventFlags)
-    }
-
-    private func handleEvents(
-        numEvents: Int,
-        eventPaths: UnsafeMutableRawPointer?,
-        eventFlags: UnsafePointer<FSEventStreamEventFlags>?
-    ) {
-        guard numEvents > 0 else { return }
-        guard eventFlags != nil else { return }
-        guard self.matchesTarget(eventPaths: eventPaths) else { return }
-
-        if self.pending { return }
-        self.pending = true
-        self.queue.asyncAfter(deadline: .now() + 0.12) { [weak self] in
-            guard let self else { return }
-            self.pending = false
-            self.onChange()
-        }
-    }
-
-    private func matchesTarget(eventPaths: UnsafeMutableRawPointer?) -> Bool {
-        guard let eventPaths else { return true }
-        let paths = unsafeBitCast(eventPaths, to: NSArray.self)
-        for case let path as String in paths {
-            if path == self.targetPath { return true }
-            if path.hasSuffix("/\(self.targetName)") { return true }
-            if path == self.watchedDir.path { return true }
-        }
-        return false
-    }
-}

apps/macos/Sources/Clawdis/ConnectionsSettings.swift

@@ -515,17 +515,6 @@ struct ConnectionsSettings: View {
                                         .labelsHidden()
                                         .toggleStyle(.checkbox)
                                 }
-                                GridRow {
-                                    self.gridLabel("Reaction notifications")
-                                    Picker("", selection: $guild.reactionNotifications) {
-                                        Text("Off").tag("off")
-                                        Text("Own").tag("own")
-                                        Text("All").tag("all")
-                                        Text("Allowlist").tag("allowlist")
-                                    }
-                                    .labelsHidden()
-                                    .pickerStyle(.segmented)
-                                }
                                 GridRow {
                                     self.gridLabel("Users allowlist")
                                     TextField("123456789, username#1234", text: $guild.users)

apps/macos/Sources/Clawdis/ConnectionsStore.swift

@@ -162,7 +162,6 @@ struct DiscordGuildForm: Identifiable {
     var key: String
     var slug: String
     var requireMention: Bool
-    var reactionNotifications: String
     var users: String
     var channels: [DiscordGuildChannelForm]
 
@@ -170,14 +169,12 @@ struct DiscordGuildForm: Identifiable {
         key: String = "",
         slug: String = "",
         requireMention: Bool = false,
-        reactionNotifications: String = "own",
         users: String = "",
         channels: [DiscordGuildChannelForm] = []
     ) {
         self.key = key
         self.slug = slug
         self.requireMention = requireMention
-        self.reactionNotifications = reactionNotifications
         self.users = users
         self.channels = channels
     }
@@ -494,10 +491,6 @@ final class ConnectionsStore {
                         let entry = value.dictionaryValue ?? [:]
                         let slug = entry["slug"]?.stringValue ?? ""
                         let requireMention = entry["requireMention"]?.boolValue ?? false
-                        let reactionModeRaw = entry["reactionNotifications"]?.stringValue ?? ""
-                        let reactionNotifications = ["off", "own", "all", "allowlist"].contains(reactionModeRaw)
-                            ? reactionModeRaw
-                            : "own"
                         let users = entry["users"]?.arrayValue?
                             .compactMap { item -> String? in
                                 if let str = item.stringValue { return str }
@@ -525,7 +518,6 @@ final class ConnectionsStore {
                             key: key,
                             slug: slug,
                             requireMention: requireMention,
-                            reactionNotifications: reactionNotifications,
                             users: users,
                             channels: channels)
                     }
@@ -802,9 +794,6 @@ final class ConnectionsStore {
             let slug = entry.slug.trimmingCharacters(in: .whitespacesAndNewlines)
             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 = entry.users
                 .split(separator: ",")
                 .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }

apps/macos/Sources/Clawdis/Constants.swift

@@ -25,8 +25,6 @@ let remoteProjectRootKey = "clawdis.remoteProjectRoot"
 let remoteCliPathKey = "clawdis.remoteCliPath"
 let canvasEnabledKey = "clawdis.canvasEnabled"
 let cameraEnabledKey = "clawdis.cameraEnabled"
-let locationModeKey = "clawdis.locationMode"
-let locationPreciseKey = "clawdis.locationPreciseEnabled"
 let peekabooBridgeEnabledKey = "clawdis.peekabooBridgeEnabled"
 let deepLinkKeyKey = "clawdis.deepLinkKey"
 let modelCatalogPathKey = "clawdis.modelCatalogPath"

apps/macos/Sources/Clawdis/GatewayConnection.swift

@@ -51,10 +51,6 @@ actor GatewayConnection {
         case providersStatus = "providers.status"
         case configGet = "config.get"
         case configSet = "config.set"
-        case wizardStart = "wizard.start"
-        case wizardNext = "wizard.next"
-        case wizardCancel = "wizard.cancel"
-        case wizardStatus = "wizard.status"
         case talkMode = "talk.mode"
         case webLoginStart = "web.login.start"
         case webLoginWait = "web.login.wait"
@@ -306,7 +302,6 @@ extension GatewayConnection {
         struct SnapshotConfig: Decodable, Sendable {
             struct Session: Decodable, Sendable {
                 let mainKey: String?
-                let scope: String?
             }
 
             let session: Session?
@@ -317,11 +312,9 @@ extension GatewayConnection {
 
     static func mainSessionKey(fromConfigGetData data: Data) throws -> String {
         let snapshot = try JSONDecoder().decode(ConfigGetSnapshot.self, from: data)
-        let scope = snapshot.config?.session?.scope?.trimmingCharacters(in: .whitespacesAndNewlines)
-        if scope == "global" {
-            return "global"
-        }
-        return "main"
+        let raw = snapshot.config?.session?.mainKey
+        let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        return trimmed.isEmpty ? "main" : trimmed
     }
 
     func mainSessionKey(timeoutMs: Double = 15000) async -> String {

apps/macos/Sources/Clawdis/GeneralSettings.swift

@@ -1,15 +1,11 @@
 import AppKit
 import ClawdisIPC
-import ClawdisKit
-import CoreLocation
 import Observation
 import SwiftUI
 
 struct GeneralSettings: View {
     @Bindable var state: AppState
     @AppStorage(cameraEnabledKey) private var cameraEnabled: Bool = false
-    @AppStorage(locationModeKey) private var locationModeRaw: String = ClawdisLocationMode.off.rawValue
-    @AppStorage(locationPreciseKey) private var locationPreciseEnabled: Bool = true
     private let healthStore = HealthStore.shared
     private let gatewayManager = GatewayProcessManager.shared
     @State private var gatewayDiscovery = GatewayDiscoveryModel()
@@ -22,7 +18,6 @@ struct GeneralSettings: View {
     @State private var showRemoteAdvanced = false
     private let isPreview = ProcessInfo.processInfo.isPreview
     private var isNixMode: Bool { ProcessInfo.processInfo.isNixMode }
-    @State private var lastLocationModeRaw: String = ClawdisLocationMode.off.rawValue
 
     var body: some View {
         ScrollView(.vertical) {
@@ -69,26 +64,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("Location Access")
-                            .font(.body)
-
-                        Picker("", selection: self.$locationModeRaw) {
-                            Text("Off").tag(ClawdisLocationMode.off.rawValue)
-                            Text("While Using").tag(ClawdisLocationMode.whileUsing.rawValue)
-                            Text("Always").tag(ClawdisLocationMode.always.rawValue)
-                        }
-                        .pickerStyle(.segmented)
-
-                        Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
-                            .disabled(self.locationMode == .off)
-
-                        Text("Always may require System Settings to approve background location.")
-                            .font(.footnote)
-                            .foregroundStyle(.tertiary)
-                            .fixedSize(horizontal: false, vertical: true)
-                    }
-
                     SettingsToggleRow(
                         title: "Enable Peekaboo Bridge",
                         subtitle: "Allow signed tools (e.g. `peekaboo`) to drive UI automation via PeekabooBridge.",
@@ -115,27 +90,12 @@ struct GeneralSettings: View {
             guard !self.isPreview else { return }
             self.refreshCLIStatus()
             self.refreshGatewayStatus()
-            self.lastLocationModeRaw = self.locationModeRaw
         }
         .onChange(of: self.state.canvasEnabled) { _, enabled in
             if !enabled {
                 CanvasManager.shared.hideAll()
             }
         }
-        .onChange(of: self.locationModeRaw) { _, newValue in
-            let previous = self.lastLocationModeRaw
-            self.lastLocationModeRaw = newValue
-            guard let mode = ClawdisLocationMode(rawValue: newValue) else { return }
-            Task {
-                let granted = await self.requestLocationAuthorization(mode: mode)
-                if !granted {
-                    await MainActor.run {
-                        self.locationModeRaw = previous
-                        self.lastLocationModeRaw = previous
-                    }
-                }
-            }
-        }
     }
 
     private var activeBinding: Binding<Bool> {
@@ -144,29 +104,6 @@ struct GeneralSettings: View {
             set: { self.state.isPaused = !$0 })
     }
 
-    private var locationMode: ClawdisLocationMode {
-        ClawdisLocationMode(rawValue: self.locationModeRaw) ?? .off
-    }
-
-    private func requestLocationAuthorization(mode: ClawdisLocationMode) async -> Bool {
-        guard mode != .off else { return true }
-        let status = CLLocationManager.authorizationStatus()
-        if status == .authorizedAlways || status == .authorizedWhenInUse {
-            if mode == .always && status != .authorizedAlways {
-                let updated = await LocationPermissionRequester.shared.request(always: true)
-                return updated == .authorizedAlways || updated == .authorizedWhenInUse
-            }
-            return true
-        }
-        let updated = await LocationPermissionRequester.shared.request(always: mode == .always)
-        switch updated {
-        case .authorizedAlways, .authorizedWhenInUse:
-            return true
-        default:
-            return false
-        }
-    }
-
     private var connectionSection: some View {
         VStack(alignment: .leading, spacing: 10) {
             Text("Clawdis runs")

apps/macos/Sources/Clawdis/InstancesSettings.swift

@@ -73,7 +73,6 @@ struct InstancesSettings: View {
             VStack(alignment: .leading, spacing: 4) {
                 HStack(spacing: 8) {
                     Text(inst.host ?? "unknown host").font(.subheadline.bold())
-                    self.presenceIndicator(inst)
                     if let ip = inst.ip { Text("(") + Text(ip).monospaced() + Text(")") }
                 }
 
@@ -147,29 +146,6 @@ struct InstancesSettings: View {
         .font(.footnote)
     }
 
-    private func presenceIndicator(_ inst: InstanceInfo) -> some View {
-        let status = self.presenceStatus(for: inst)
-        return HStack(spacing: 4) {
-            Circle()
-                .fill(status.color)
-                .frame(width: 6, height: 6)
-                .accessibilityHidden(true)
-            Text(status.label)
-                .foregroundStyle(.secondary)
-        }
-        .font(.caption)
-        .help("Presence updated \(inst.ageDescription).")
-        .accessibilityLabel("\(status.label) presence")
-    }
-
-    private func presenceStatus(for inst: InstanceInfo) -> (label: String, color: Color) {
-        let nowMs = Date().timeIntervalSince1970 * 1000
-        let ageSeconds = max(0, Int((nowMs - inst.ts) / 1000))
-        if ageSeconds <= 120 { return ("Active", .green) }
-        if ageSeconds <= 300 { return ("Idle", .yellow) }
-        return ("Stale", .gray)
-    }
-
     @ViewBuilder
     private func leadingDeviceIcon(_ inst: InstanceInfo, device: DevicePresentation?) -> some View {
         let symbol = self.leadingDeviceSymbol(inst, device: device)
@@ -331,10 +307,6 @@ struct InstancesSettings: View {
             return "Connect"
         case "disconnect":
             return "Disconnect"
-        case "node-connected":
-            return "Node connect"
-        case "node-disconnected":
-            return "Node disconnect"
         case "launch":
             return "Launch"
         case "periodic":

apps/macos/Sources/Clawdis/MenuSessionsInjector.swift

@@ -435,7 +435,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         compact.representedObject = row.key
         menu.addItem(compact)
 
-        if row.key != "main" && row.key != "global" {
+        if row.key != "main" {
             let del = NSMenuItem(title: "Delete Session", action: #selector(self.deleteSession(_:)), keyEquivalent: "")
             del.target = self
             del.representedObject = row.key

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

@@ -1,116 +0,0 @@
-import ClawdisKit
-import CoreLocation
-import Foundation
-
-@MainActor
-final class MacNodeLocationService: NSObject, CLLocationManagerDelegate {
-    enum Error: Swift.Error {
-        case timeout
-        case unavailable
-    }
-
-    private let manager = CLLocationManager()
-    private var locationContinuation: CheckedContinuation<CLLocation, Swift.Error>?
-
-    override init() {
-        super.init()
-        self.manager.delegate = self
-        self.manager.desiredAccuracy = kCLLocationAccuracyBest
-    }
-
-    func authorizationStatus() -> CLAuthorizationStatus {
-        self.manager.authorizationStatus
-    }
-
-    func accuracyAuthorization() -> CLAccuracyAuthorization {
-        if #available(macOS 11.0, *) {
-            return self.manager.accuracyAuthorization
-        }
-        return .fullAccuracy
-    }
-
-    func currentLocation(
-        desiredAccuracy: ClawdisLocationAccuracy,
-        maxAgeMs: Int?,
-        timeoutMs: Int?) async throws -> CLLocation
-    {
-        guard CLLocationManager.locationServicesEnabled() else {
-            throw Error.unavailable
-        }
-
-        let now = Date()
-        if let maxAgeMs,
-           let cached = self.manager.location,
-           now.timeIntervalSince(cached.timestamp) * 1000 <= Double(maxAgeMs)
-        {
-            return cached
-        }
-
-        self.manager.desiredAccuracy = Self.accuracyValue(desiredAccuracy)
-        let timeout = max(0, timeoutMs ?? 10_000)
-        return try await self.withTimeout(timeoutMs: timeout) {
-            try await self.requestLocation()
-        }
-    }
-
-    private func requestLocation() async throws -> CLLocation {
-        try await withCheckedThrowingContinuation { cont in
-            self.locationContinuation = cont
-            self.manager.requestLocation()
-        }
-    }
-
-    private func withTimeout<T>(
-        timeoutMs: Int,
-        operation: @escaping () async throws -> T) async throws -> T
-    {
-        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: ClawdisLocationAccuracy) -> CLLocationAccuracy {
-        switch accuracy {
-        case .coarse:
-            return kCLLocationAccuracyKilometer
-        case .balanced:
-            return kCLLocationAccuracyHundredMeters
-        case .precise:
-            return kCLLocationAccuracyBest
-        }
-    }
-
-    // MARK: - CLLocationManagerDelegate (nonisolated for Swift 6 compatibility)
-
-    nonisolated func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        Task { @MainActor in
-            guard let cont = self.locationContinuation else { return }
-            self.locationContinuation = nil
-            if let latest = locations.last {
-                cont.resume(returning: latest)
-            } else {
-                cont.resume(throwing: Error.unavailable)
-            }
-        }
-    }
-
-    nonisolated func locationManager(_ manager: CLLocationManager, didFailWithError error: Swift.Error) {
-        let errorCopy = error // Capture error for Sendable compliance
-        Task { @MainActor in
-            guard let cont = self.locationContinuation else { return }
-            self.locationContinuation = nil
-            cont.resume(throwing: errorCopy)
-        }
-    }
-}

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

@@ -110,10 +110,6 @@ final class MacNodeModeCoordinator {
         if UserDefaults.standard.object(forKey: cameraEnabledKey) as? Bool ?? false {
             caps.append(ClawdisCapability.camera.rawValue)
         }
-        let rawLocationMode = UserDefaults.standard.string(forKey: locationModeKey) ?? "off"
-        if ClawdisLocationMode(rawValue: rawLocationMode) != .off {
-            caps.append(ClawdisCapability.location.rawValue)
-        }
         return caps
     }
 
@@ -143,9 +139,6 @@ final class MacNodeModeCoordinator {
             commands.append(ClawdisCameraCommand.snap.rawValue)
             commands.append(ClawdisCameraCommand.clip.rawValue)
         }
-        if capsSet.contains(ClawdisCapability.location.rawValue) {
-            commands.append(ClawdisLocationCommand.get.rawValue)
-        }
 
         return commands
     }

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

@@ -6,7 +6,6 @@ import Foundation
 actor MacNodeRuntime {
     private let cameraCapture = CameraCaptureService()
     @MainActor private let screenRecorder = ScreenRecordService()
-    @MainActor private let locationService = MacNodeLocationService()
 
     // swiftlint:disable:next function_body_length cyclomatic_complexity
     func handleInvoke(_ req: BridgeInvokeRequest) async -> BridgeInvokeResponse {
@@ -169,63 +168,6 @@ actor MacNodeRuntime {
                 let payload = try Self.encodePayload(["devices": devices])
                 return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
 
-            case ClawdisLocationCommand.get.rawValue:
-                let mode = Self.locationMode()
-                guard mode != .off else {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "LOCATION_DISABLED: enable Location in Settings"))
-                }
-                let params = (try? Self.decodeParams(ClawdisLocationGetParams.self, from: req.paramsJSON)) ??
-                    ClawdisLocationGetParams()
-                let desired = params.desiredAccuracy ??
-                    (Self.locationPreciseEnabled() ? .precise : .balanced)
-                let status = await self.locationService.authorizationStatus()
-                if status != .authorizedAlways && status != .authorizedWhenInUse {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "LOCATION_PERMISSION_REQUIRED: grant Location permission"))
-                }
-                do {
-                    let location = try await self.locationService.currentLocation(
-                        desiredAccuracy: desired,
-                        maxAgeMs: params.maxAgeMs,
-                        timeoutMs: params.timeoutMs)
-                    let isPrecise = await self.locationService.accuracyAuthorization() == .fullAccuracy
-                    let payload = ClawdisLocationPayload(
-                        lat: location.coordinate.latitude,
-                        lon: location.coordinate.longitude,
-                        accuracyMeters: location.horizontalAccuracy,
-                        altitudeMeters: location.verticalAccuracy >= 0 ? location.altitude : nil,
-                        speedMps: location.speed >= 0 ? location.speed : nil,
-                        headingDeg: location.course >= 0 ? location.course : nil,
-                        timestamp: ISO8601DateFormatter().string(from: location.timestamp),
-                        isPrecise: isPrecise,
-                        source: nil)
-                    let json = try Self.encodePayload(payload)
-                    return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: json)
-                } catch MacNodeLocationService.Error.timeout {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "LOCATION_TIMEOUT: no fix in time"))
-                } catch {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "LOCATION_UNAVAILABLE: \(error.localizedDescription)"))
-                }
-
             case MacNodeScreenCommand.record.rawValue:
                 let params = (try? Self.decodeParams(MacNodeScreenRecordParams.self, from: req.paramsJSON)) ??
                     MacNodeScreenRecordParams()
@@ -471,16 +413,6 @@ actor MacNodeRuntime {
         UserDefaults.standard.object(forKey: cameraEnabledKey) as? Bool ?? false
     }
 
-    private nonisolated static func locationMode() -> ClawdisLocationMode {
-        let raw = UserDefaults.standard.string(forKey: locationModeKey) ?? "off"
-        return ClawdisLocationMode(rawValue: raw) ?? .off
-    }
-
-    private nonisolated static func locationPreciseEnabled() -> Bool {
-        if UserDefaults.standard.object(forKey: locationPreciseKey) == nil { return true }
-        return UserDefaults.standard.bool(forKey: locationPreciseKey)
-    }
-
     private static func errorResponse(
         _ req: BridgeInvokeRequest,
         code: ClawdisNodeErrorCode,

apps/macos/Sources/Clawdis/Onboarding.swift

@@ -86,7 +86,6 @@ struct OnboardingView: View {
     @State var gatewayDiscovery: GatewayDiscoveryModel
     @State var onboardingChatModel: ClawdisChatViewModel
     @State var onboardingSkillsModel = SkillsSettingsModel()
-    @State var onboardingWizard = OnboardingWizardModel()
     @State var didLoadOnboardingSkills = false
     @State var localGatewayProbe: LocalGatewayProbe?
     @Bindable var state: AppState
@@ -96,7 +95,6 @@ struct OnboardingView: View {
     let contentHeight: CGFloat = 460
     let connectionPageIndex = 1
     let anthropicAuthPageIndex = 2
-    let wizardPageIndex = 3
     let onboardingChatPageIndex = 8
 
     static let clipboardPoll: AnyPublisher<Date, Never> = {
@@ -121,7 +119,7 @@ struct OnboardingView: View {
         case .unconfigured:
             needsBootstrap ? [0, 1, 8, 9] : [0, 1, 9]
         case .local:
-            needsBootstrap ? [0, 1, 3, 5, 8, 9] : [0, 1, 3, 5, 9]
+            needsBootstrap ? [0, 1, 2, 5, 6, 8, 9] : [0, 1, 2, 5, 6, 9]
         }
     }
 
@@ -135,11 +133,6 @@ struct OnboardingView: View {
     }
 
     var buttonTitle: String { self.currentPage == self.pageCount - 1 ? "Finish" : "Next" }
-    var wizardPageOrderIndex: Int? { self.pageOrder.firstIndex(of: self.wizardPageIndex) }
-    var isWizardBlocking: Bool {
-        self.activePageIndex == self.wizardPageIndex && !self.onboardingWizard.isComplete
-    }
-    var canAdvance: Bool { !self.isWizardBlocking }
     var devLinkCommand: String {
         let bundlePath = Bundle.main.bundlePath
         return "ln -sf '\(bundlePath)/Contents/Resources/Relay/clawdis' /usr/local/bin/clawdis"

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

@@ -11,7 +11,6 @@ extension OnboardingView {
     }
 
     func selectUnconfiguredGateway() {
-        Task { await self.onboardingWizard.cancelIfRunning() }
         self.state.connectionMode = .unconfigured
         self.preferredGatewayID = nil
         self.showAdvancedConnection = false
@@ -19,7 +18,6 @@ extension OnboardingView {
     }
 
     func selectRemoteGateway(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) {
-        Task { await self.onboardingWizard.cancelIfRunning() }
         self.preferredGatewayID = gateway.stableID
         BridgeDiscoveryPreferences.setPreferredStableID(gateway.stableID)
 
@@ -49,7 +47,6 @@ extension OnboardingView {
     }
 
     func handleNext() {
-        if self.isWizardBlocking { return }
         if self.currentPage < self.pageCount - 1 {
             withAnimation { self.currentPage += 1 }
         } else {

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

@@ -46,10 +46,6 @@ extension OnboardingView {
                 self.currentPage = max(0, self.pageOrder.count - 1)
             }
         }
-        .onChange(of: self.onboardingWizard.isComplete) { _, newValue in
-            guard newValue, self.activePageIndex == self.wizardPageIndex else { return }
-            self.handleNext()
-        }
         .onDisappear {
             self.stopPermissionMonitoring()
             self.stopDiscovery()
@@ -85,7 +81,6 @@ extension OnboardingView {
     }
 
     var navigationBar: some View {
-        let wizardLockIndex = self.wizardPageOrderIndex
         HStack(spacing: 20) {
             ZStack(alignment: .leading) {
                 Button(action: {}, label: {
@@ -112,7 +107,6 @@ extension OnboardingView {
 
             HStack(spacing: 8) {
                 ForEach(0..<self.pageCount, id: \.self) { index in
-                    let isLocked = wizardLockIndex != nil && !self.onboardingWizard.isComplete && index > (wizardLockIndex ?? 0)
                     Button {
                         withAnimation { self.currentPage = index }
                     } label: {
@@ -121,8 +115,6 @@ extension OnboardingView {
                             .frame(width: 8, height: 8)
                     }
                     .buttonStyle(.plain)
-                    .disabled(isLocked)
-                    .opacity(isLocked ? 0.3 : 1)
                 }
             }
 
@@ -134,7 +126,6 @@ extension OnboardingView {
             }
             .keyboardShortcut(.return)
             .buttonStyle(.borderedProminent)
-            .disabled(!self.canAdvance)
         }
         .padding(.horizontal, 28)
         .padding(.bottom, 13)

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

@@ -13,8 +13,6 @@ extension OnboardingView {
             self.connectionPage()
         case 2:
             self.anthropicAuthPage()
-        case 3:
-            self.wizardPage()
         case 5:
             self.permissionsPage()
         case 6:

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

@@ -47,7 +47,6 @@ extension OnboardingView {
         _ = view.welcomePage()
         _ = view.connectionPage()
         _ = view.anthropicAuthPage()
-        _ = view.wizardPage()
         _ = view.permissionsPage()
         _ = view.cliPage()
         _ = view.workspacePage()

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

@@ -1,93 +0,0 @@
-import Observation
-import SwiftUI
-
-extension OnboardingView {
-    func wizardPage() -> some View {
-        self.onboardingPage {
-            VStack(spacing: 16) {
-                Text("Setup Wizard")
-                    .font(.largeTitle.weight(.semibold))
-                Text("Follow the guided setup from the Gateway. This keeps onboarding in sync with the CLI.")
-                    .font(.body)
-                    .foregroundStyle(.secondary)
-                    .multilineTextAlignment(.center)
-                    .frame(maxWidth: 520)
-
-                self.onboardingCard(spacing: 14, padding: 16) {
-                    OnboardingWizardCardContent(
-                        wizard: self.onboardingWizard,
-                        mode: self.state.connectionMode,
-                        workspacePath: self.workspacePath)
-                }
-            }
-            .task {
-                await self.onboardingWizard.startIfNeeded(
-                    mode: self.state.connectionMode,
-                    workspace: self.workspacePath.isEmpty ? nil : self.workspacePath)
-            }
-        }
-    }
-}
-
-private struct OnboardingWizardCardContent: View {
-    @Bindable var wizard: OnboardingWizardModel
-    let mode: AppState.ConnectionMode
-    let workspacePath: String
-
-    private enum CardState {
-        case error(String)
-        case starting
-        case step(WizardStep)
-        case complete
-        case waiting
-    }
-
-    private var state: CardState {
-        if let error = wizard.errorMessage { return .error(error) }
-        if wizard.isStarting { return .starting }
-        if let step = wizard.currentStep { return .step(step) }
-        if wizard.isComplete { return .complete }
-        return .waiting
-    }
-
-    var body: some View {
-        switch state {
-        case .error(let error):
-            Text("Wizard error")
-                .font(.headline)
-            Text(error)
-                .font(.subheadline)
-                .foregroundStyle(.secondary)
-                .fixedSize(horizontal: false, vertical: true)
-            Button("Retry") {
-                wizard.reset()
-                Task {
-                    await wizard.startIfNeeded(
-                        mode: mode,
-                        workspace: workspacePath.isEmpty ? nil : workspacePath)
-                }
-            }
-            .buttonStyle(.borderedProminent)
-        case .starting:
-            HStack(spacing: 8) {
-                ProgressView()
-                Text("Starting wizard…")
-                    .foregroundStyle(.secondary)
-            }
-        case .step(let step):
-            OnboardingWizardStepView(
-                step: step,
-                isSubmitting: wizard.isSubmitting)
-            { value in
-                Task { await wizard.submit(step: step, value: value) }
-            }
-            .id(step.id)
-        case .complete:
-            Text("Wizard complete. Continue to the next step.")
-                .font(.headline)
-        case .waiting:
-            Text("Waiting for wizard…")
-                .foregroundStyle(.secondary)
-        }
-    }
-}

apps/macos/Sources/Clawdis/OnboardingWizard.swift

@@ -1,421 +0,0 @@
-import ClawdisProtocol
-import Foundation
-import Observation
-import OSLog
-import SwiftUI
-
-private let onboardingWizardLogger = Logger(subsystem: "com.clawdis", category: "onboarding.wizard")
-
-// MARK: - Swift 6 AnyCodable Bridging Helpers
-// Bridge between ClawdisProtocol.AnyCodable and the local module to avoid
-// Swift 6 strict concurrency type conflicts.
-
-private typealias ProtocolAnyCodable = ClawdisProtocol.AnyCodable
-
-private func bridgeToLocal(_ value: ProtocolAnyCodable) -> AnyCodable {
-    if let data = try? JSONEncoder().encode(value),
-       let decoded = try? JSONDecoder().decode(AnyCodable.self, from: data)
-    {
-        return decoded
-    }
-    return AnyCodable(value.value)
-}
-
-private func bridgeToLocal(_ value: ProtocolAnyCodable?) -> AnyCodable? {
-    value.map(bridgeToLocal)
-}
-
-@MainActor
-@Observable
-final class OnboardingWizardModel {
-    private(set) var sessionId: String?
-    private(set) var currentStep: WizardStep?
-    private(set) var status: String?
-    private(set) var errorMessage: String?
-    var isStarting = false
-    var isSubmitting = false
-
-    var isComplete: Bool { self.status == "done" }
-    var isRunning: Bool { self.status == "running" }
-
-    func reset() {
-        self.sessionId = nil
-        self.currentStep = nil
-        self.status = nil
-        self.errorMessage = nil
-        self.isStarting = false
-        self.isSubmitting = false
-    }
-
-    func startIfNeeded(mode: AppState.ConnectionMode, workspace: String? = nil) async {
-        guard self.sessionId == nil, !self.isStarting else { return }
-        guard mode == .local else { return }
-        self.isStarting = true
-        self.errorMessage = nil
-        defer { self.isStarting = false }
-
-        do {
-            var params: [String: AnyCodable] = ["mode": AnyCodable("local")]
-            if let workspace, !workspace.isEmpty {
-                params["workspace"] = AnyCodable(workspace)
-            }
-            let res: WizardStartResult = try await GatewayConnection.shared.requestDecoded(
-                method: .wizardStart,
-                params: params)
-            applyStartResult(res)
-        } catch {
-            self.status = "error"
-            self.errorMessage = error.localizedDescription
-            onboardingWizardLogger.error("start failed: \(error.localizedDescription, privacy: .public)")
-        }
-    }
-
-    func submit(step: WizardStep, value: AnyCodable?) async {
-        guard let sessionId, !self.isSubmitting else { return }
-        self.isSubmitting = true
-        self.errorMessage = nil
-        defer { self.isSubmitting = false }
-
-        do {
-            var params: [String: AnyCodable] = ["sessionId": AnyCodable(sessionId)]
-            var answer: [String: AnyCodable] = ["stepId": AnyCodable(step.id)]
-            if let value {
-                answer["value"] = value
-            }
-            params["answer"] = AnyCodable(answer)
-            let res: WizardNextResult = try await GatewayConnection.shared.requestDecoded(
-                method: .wizardNext,
-                params: params)
-            applyNextResult(res)
-        } catch {
-            self.status = "error"
-            self.errorMessage = error.localizedDescription
-            onboardingWizardLogger.error("submit failed: \(error.localizedDescription, privacy: .public)")
-        }
-    }
-
-    func cancelIfRunning() async {
-        guard let sessionId, self.isRunning else { return }
-        do {
-            let res: WizardStatusResult = try await GatewayConnection.shared.requestDecoded(
-                method: .wizardCancel,
-                params: ["sessionId": AnyCodable(sessionId)])
-            applyStatusResult(res)
-        } catch {
-            self.status = "error"
-            self.errorMessage = error.localizedDescription
-            onboardingWizardLogger.error("cancel failed: \(error.localizedDescription, privacy: .public)")
-        }
-    }
-
-    private func applyStartResult(_ res: WizardStartResult) {
-        self.sessionId = res.sessionid
-        self.status = anyCodableStringValue(res.status) ?? (res.done ? "done" : "running")
-        self.errorMessage = res.error
-        self.currentStep = decodeWizardStep(res.step)
-        if res.done { self.currentStep = nil }
-    }
-
-    private func applyNextResult(_ res: WizardNextResult) {
-        self.status = anyCodableStringValue(res.status) ?? self.status
-        self.errorMessage = res.error
-        self.currentStep = decodeWizardStep(res.step)
-        if res.done { self.currentStep = nil }
-        if res.done || anyCodableStringValue(res.status) == "done" || anyCodableStringValue(res.status) == "cancelled"
-            || anyCodableStringValue(res.status) == "error" {
-            self.sessionId = nil
-        }
-    }
-
-    private func applyStatusResult(_ res: WizardStatusResult) {
-        self.status = anyCodableStringValue(res.status) ?? "unknown"
-        self.errorMessage = res.error
-        self.currentStep = nil
-        self.sessionId = nil
-    }
-}
-
-struct OnboardingWizardStepView: View {
-    let step: WizardStep
-    let isSubmitting: Bool
-    let onSubmit: (AnyCodable?) -> Void
-
-    @State private var textValue: String
-    @State private var confirmValue: Bool
-    @State private var selectedIndex: Int
-    @State private var selectedIndices: Set<Int>
-
-    private let optionItems: [WizardOptionItem]
-
-    init(step: WizardStep, isSubmitting: Bool, onSubmit: @escaping (AnyCodable?) -> Void) {
-        self.step = step
-        self.isSubmitting = isSubmitting
-        self.onSubmit = onSubmit
-        let options = parseWizardOptions(step.options).enumerated().map { index, option in
-            WizardOptionItem(index: index, option: option)
-        }
-        self.optionItems = options
-        let initialText = anyCodableString(step.initialvalue)
-        let initialConfirm = anyCodableBool(step.initialvalue)
-        let initialIndex = options.firstIndex(where: { anyCodableEqual($0.option.value, step.initialvalue) }) ?? 0
-        let initialMulti = Set(
-            options.filter { option in
-                anyCodableArray(step.initialvalue).contains { anyCodableEqual($0, option.option.value) }
-            }.map { $0.index }
-        )
-
-        _textValue = State(initialValue: initialText)
-        _confirmValue = State(initialValue: initialConfirm)
-        _selectedIndex = State(initialValue: initialIndex)
-        _selectedIndices = State(initialValue: initialMulti)
-    }
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 12) {
-            if let title = step.title, !title.isEmpty {
-                Text(title)
-                    .font(.title2.weight(.semibold))
-            }
-            if let message = step.message, !message.isEmpty {
-                Text(message)
-                    .font(.body)
-                    .foregroundStyle(.secondary)
-                    .fixedSize(horizontal: false, vertical: true)
-            }
-
-            switch wizardStepType(step) {
-            case "note":
-                EmptyView()
-            case "text":
-                textField
-            case "confirm":
-                Toggle("", isOn: $confirmValue)
-                    .toggleStyle(.switch)
-            case "select":
-                selectOptions
-            case "multiselect":
-                multiselectOptions
-            case "progress":
-                ProgressView()
-                    .controlSize(.small)
-            case "action":
-                EmptyView()
-            default:
-                Text("Unsupported step type")
-                    .foregroundStyle(.secondary)
-            }
-
-            Button(action: submit) {
-                Text(wizardStepType(step) == "action" ? "Run" : "Continue")
-                    .frame(minWidth: 120)
-            }
-            .buttonStyle(.borderedProminent)
-            .disabled(isSubmitting || isBlocked)
-        }
-        .frame(maxWidth: .infinity, alignment: .leading)
-    }
-
-    @ViewBuilder
-    private var textField: some View {
-        let isSensitive = step.sensitive == true
-        if isSensitive {
-            SecureField(step.placeholder ?? "", text: $textValue)
-                .textFieldStyle(.roundedBorder)
-                .frame(maxWidth: 360)
-        } else {
-            TextField(step.placeholder ?? "", text: $textValue)
-                .textFieldStyle(.roundedBorder)
-                .frame(maxWidth: 360)
-        }
-    }
-
-    private var selectOptions: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            ForEach(optionItems) { item in
-                Button {
-                    selectedIndex = item.index
-                } label: {
-                    HStack(alignment: .top, spacing: 8) {
-                        Image(systemName: selectedIndex == item.index ? "largecircle.fill.circle" : "circle")
-                            .foregroundStyle(.accent)
-                        VStack(alignment: .leading, spacing: 2) {
-                            Text(item.option.label)
-                                .foregroundStyle(.primary)
-                            if let hint = item.option.hint, !hint.isEmpty {
-                                Text(hint)
-                                    .font(.caption)
-                                    .foregroundStyle(.secondary)
-                            }
-                        }
-                    }
-                }
-                .buttonStyle(.plain)
-            }
-        }
-    }
-
-    private var multiselectOptions: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            ForEach(optionItems) { item in
-                Toggle(isOn: bindingForOption(item)) {
-                    VStack(alignment: .leading, spacing: 2) {
-                        Text(item.option.label)
-                        if let hint = item.option.hint, !hint.isEmpty {
-                            Text(hint)
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private func bindingForOption(_ item: WizardOptionItem) -> Binding<Bool> {
-        Binding(get: {
-            selectedIndices.contains(item.index)
-        }, set: { newValue in
-            if newValue {
-                selectedIndices.insert(item.index)
-            } else {
-                selectedIndices.remove(item.index)
-            }
-        })
-    }
-
-    private var isBlocked: Bool {
-        let type = wizardStepType(step)
-        if type == "select" { return optionItems.isEmpty }
-        if type == "multiselect" { return optionItems.isEmpty }
-        return false
-    }
-
-    private func submit() {
-        switch wizardStepType(step) {
-        case "note", "progress":
-            onSubmit(nil)
-        case "text":
-            onSubmit(AnyCodable(textValue))
-        case "confirm":
-            onSubmit(AnyCodable(confirmValue))
-        case "select":
-            guard optionItems.indices.contains(selectedIndex) else {
-                onSubmit(nil)
-                return
-            }
-            let option = optionItems[selectedIndex].option
-            onSubmit(bridgeToLocal(option.value) ?? AnyCodable(option.label))
-        case "multiselect":
-            let values = optionItems
-                .filter { selectedIndices.contains($0.index) }
-                .map { bridgeToLocal($0.option.value) ?? AnyCodable($0.option.label) }
-            onSubmit(AnyCodable(values))
-        case "action":
-            onSubmit(AnyCodable(true))
-        default:
-            onSubmit(nil)
-        }
-    }
-}
-
-private struct WizardOptionItem: Identifiable {
-    let index: Int
-    let option: WizardOption
-
-    var id: Int { index }
-}
-
-private struct WizardOption {
-    let value: ProtocolAnyCodable?
-    let label: String
-    let hint: String?
-}
-
-private func decodeWizardStep(_ raw: [String: ProtocolAnyCodable]?) -> WizardStep? {
-    guard let raw else { return nil }
-    do {
-        let data = try JSONEncoder().encode(raw)
-        return try JSONDecoder().decode(WizardStep.self, from: data)
-    } catch {
-        onboardingWizardLogger.error("wizard step decode failed: \(error.localizedDescription, privacy: .public)")
-        return nil
-    }
-}
-
-private func parseWizardOptions(_ raw: [[String: ProtocolAnyCodable]]?) -> [WizardOption] {
-    guard let raw else { return [] }
-    return raw.map { entry in
-        let value = entry["value"]
-        let label = (entry["label"]?.value as? String) ?? ""
-        let hint = entry["hint"]?.value as? String
-        return WizardOption(value: value, label: label, hint: hint)
-    }
-}
-
-private func wizardStepType(_ step: WizardStep) -> String {
-    (step.type.value as? String) ?? ""
-}
-
-private func anyCodableString(_ value: ProtocolAnyCodable?) -> String {
-    switch value?.value {
-    case let string as String:
-        return string
-    case let int as Int:
-        return String(int)
-    case let double as Double:
-        return String(double)
-    case let bool as Bool:
-        return bool ? "true" : "false"
-    default:
-        return ""
-    }
-}
-
-private func anyCodableStringValue(_ value: ProtocolAnyCodable?) -> String? {
-    value?.value as? String
-}
-
-private func anyCodableBool(_ value: ProtocolAnyCodable?) -> Bool {
-    switch value?.value {
-    case let bool as Bool:
-        return bool
-    case let string as String:
-        return string.lowercased() == "true"
-    default:
-        return false
-    }
-}
-
-private func anyCodableArray(_ value: ProtocolAnyCodable?) -> [ProtocolAnyCodable] {
-    switch value?.value {
-    case let arr as [ProtocolAnyCodable]:
-        return arr
-    case let arr as [Any]:
-        return arr.map { ProtocolAnyCodable($0) }
-    default:
-        return []
-    }
-}
-
-private func anyCodableEqual(_ lhs: ProtocolAnyCodable?, _ rhs: ProtocolAnyCodable?) -> Bool {
-    switch (lhs?.value, rhs?.value) {
-    case let (l as String, r as String):
-        return l == r
-    case let (l as Int, r as Int):
-        return l == r
-    case let (l as Double, r as Double):
-        return l == r
-    case let (l as Bool, r as Bool):
-        return l == r
-    case let (l as String, r as Int):
-        return l == String(r)
-    case let (l as Int, r as String):
-        return String(l) == r
-    case let (l as String, r as Double):
-        return l == String(r)
-    case let (l as Double, r as String):
-        return String(l) == r
-    default:
-        return false
-    }
-}

apps/macos/Sources/Clawdis/PermissionManager.swift

@@ -3,7 +3,6 @@ import ApplicationServices
 import AVFoundation
 import ClawdisIPC
 import CoreGraphics
-import CoreLocation
 import Foundation
 import Observation
 import Speech
@@ -34,8 +33,6 @@ enum PermissionManager {
             await self.ensureSpeechRecognition(interactive: interactive)
         case .camera:
             await self.ensureCamera(interactive: interactive)
-        case .location:
-            await self.ensureLocation(interactive: interactive)
         }
     }
 
@@ -137,25 +134,6 @@ enum PermissionManager {
         }
     }
 
-    private static func ensureLocation(interactive: Bool) async -> Bool {
-        let status = CLLocationManager.authorizationStatus()
-        switch status {
-        case .authorizedAlways, .authorizedWhenInUse:
-            return true
-        case .notDetermined:
-            guard interactive else { return false }
-            let updated = await LocationPermissionRequester.shared.request(always: false)
-            return updated == .authorizedAlways || updated == .authorizedWhenInUse
-        case .denied, .restricted:
-            if interactive {
-                LocationPermissionHelper.openSettings()
-            }
-            return false
-        @unknown default:
-            return false
-        }
-    }
-
     static func voiceWakePermissionsGranted() -> Bool {
         let mic = AVCaptureDevice.authorizationStatus(for: .audio) == .authorized
         let speech = SFSpeechRecognizer.authorizationStatus() == .authorized
@@ -198,9 +176,6 @@ enum PermissionManager {
 
             case .camera:
                 results[cap] = AVCaptureDevice.authorizationStatus(for: .video) == .authorized
-            case .location:
-                let status = CLLocationManager.authorizationStatus()
-                results[cap] = status == .authorizedAlways || status == .authorizedWhenInUse
             }
         }
         return results
@@ -252,54 +227,6 @@ enum CameraPermissionHelper {
     }
 }
 
-enum LocationPermissionHelper {
-    static func openSettings() {
-        let candidates = [
-            "x-apple.systempreferences:com.apple.preference.security?Privacy_LocationServices",
-            "x-apple.systempreferences:com.apple.preference.security",
-        ]
-
-        for candidate in candidates {
-            if let url = URL(string: candidate), NSWorkspace.shared.open(url) {
-                return
-            }
-        }
-    }
-}
-
-@MainActor
-final class LocationPermissionRequester: NSObject, CLLocationManagerDelegate {
-    static let shared = LocationPermissionRequester()
-    private let manager = CLLocationManager()
-    private var continuation: CheckedContinuation<CLAuthorizationStatus, Never>?
-
-    override init() {
-        super.init()
-        self.manager.delegate = self
-    }
-
-    func request(always: Bool) async -> CLAuthorizationStatus {
-        if always {
-            self.manager.requestAlwaysAuthorization()
-        } else {
-            self.manager.requestWhenInUseAuthorization()
-        }
-        return await withCheckedContinuation { cont in
-            self.continuation = cont
-        }
-    }
-
-    // nonisolated for Swift 6 strict concurrency compatibility
-    nonisolated func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        let status = manager.authorizationStatus
-        Task { @MainActor in
-            guard let cont = self.continuation else { return }
-            self.continuation = nil
-            cont.resume(returning: status)
-        }
-    }
-}
-
 enum AppleScriptPermission {
     private static let logger = Logger(subsystem: "com.clawdis", category: "AppleScriptPermission")
 

apps/macos/Sources/Clawdis/PermissionsSettings.swift

@@ -121,7 +121,6 @@ struct PermissionRow: View {
         case .microphone: "Microphone"
         case .speechRecognition: "Speech Recognition"
         case .camera: "Camera"
-        case .location: "Location"
         }
     }
 
@@ -135,7 +134,6 @@ struct PermissionRow: View {
         case .microphone: "Allow Voice Wake and audio capture"
         case .speechRecognition: "Transcribe Voice Wake trigger phrases on-device"
         case .camera: "Capture photos and video from the camera"
-        case .location: "Share location when requested by the agent"
         }
     }
 
@@ -148,7 +146,6 @@ struct PermissionRow: View {
         case .microphone: "mic"
         case .speechRecognition: "waveform"
         case .camera: "camera"
-        case .location: "location"
         }
     }
 }

apps/macos/Sources/Clawdis/Resources/Info.plist

@@ -47,8 +47,6 @@
     <string>Clawdis captures the screen when the agent needs screenshots for context.</string>
     <key>NSCameraUsageDescription</key>
     <string>Clawdis can capture photos or short video clips when requested by the agent.</string>
-    <key>NSLocationUsageDescription</key>
-    <string>Clawdis can share your location when requested by the agent.</string>
     <key>NSMicrophoneUsageDescription</key>
     <string>Clawdis needs the mic for Voice Wake tests and agent audio capture.</string>
     <key>NSSpeechRecognitionUsageDescription</key>

apps/macos/Sources/ClawdisIPC/IPC.swift

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

apps/macos/Sources/ClawdisProtocol/GatewayModels.swift

@@ -340,7 +340,6 @@ public struct SendParams: Codable {
     public let to: String
     public let message: String
     public let mediaurl: String?
-    public let gifplayback: Bool?
     public let provider: String?
     public let idempotencykey: String
 
@@ -348,14 +347,12 @@ public struct SendParams: Codable {
         to: String,
         message: String,
         mediaurl: String?,
-        gifplayback: Bool?,
         provider: String?,
         idempotencykey: String
     ) {
         self.to = to
         self.message = message
         self.mediaurl = mediaurl
-        self.gifplayback = gifplayback
         self.provider = provider
         self.idempotencykey = idempotencykey
     }
@@ -363,7 +360,6 @@ public struct SendParams: Codable {
         case to
         case message
         case mediaurl = "mediaUrl"
-        case gifplayback = "gifPlayback"
         case provider
         case idempotencykey = "idempotencyKey"
     }
@@ -378,8 +374,6 @@ public struct AgentParams: Codable {
     public let deliver: Bool?
     public let channel: String?
     public let timeout: Int?
-    public let lane: String?
-    public let extrasystemprompt: String?
     public let idempotencykey: String
 
     public init(
@@ -391,8 +385,6 @@ public struct AgentParams: Codable {
         deliver: Bool?,
         channel: String?,
         timeout: Int?,
-        lane: String?,
-        extrasystemprompt: String?,
         idempotencykey: String
     ) {
         self.message = message
@@ -403,8 +395,6 @@ public struct AgentParams: Codable {
         self.deliver = deliver
         self.channel = channel
         self.timeout = timeout
-        self.lane = lane
-        self.extrasystemprompt = extrasystemprompt
         self.idempotencykey = idempotencykey
     }
     private enum CodingKeys: String, CodingKey {
@@ -416,33 +406,10 @@ public struct AgentParams: Codable {
         case deliver
         case channel
         case timeout
-        case lane
-        case extrasystemprompt = "extraSystemPrompt"
         case idempotencykey = "idempotencyKey"
     }
 }
 
-public struct AgentWaitParams: Codable {
-    public let runid: String
-    public let afterms: Int?
-    public let timeoutms: Int?
-
-    public init(
-        runid: String,
-        afterms: Int?,
-        timeoutms: Int?
-    ) {
-        self.runid = runid
-        self.afterms = afterms
-        self.timeoutms = timeoutms
-    }
-    private enum CodingKeys: String, CodingKey {
-        case runid = "runId"
-        case afterms = "afterMs"
-        case timeoutms = "timeoutMs"
-    }
-}
-
 public struct WakeParams: Codable {
     public let mode: AnyCodable
     public let text: String
@@ -646,35 +613,27 @@ public struct SessionsPatchParams: Codable {
     public let key: String
     public let thinkinglevel: AnyCodable?
     public let verboselevel: AnyCodable?
-    public let elevatedlevel: AnyCodable?
     public let model: AnyCodable?
-    public let sendpolicy: AnyCodable?
     public let groupactivation: AnyCodable?
 
     public init(
         key: String,
         thinkinglevel: AnyCodable?,
         verboselevel: AnyCodable?,
-        elevatedlevel: AnyCodable?,
         model: AnyCodable?,
-        sendpolicy: AnyCodable?,
         groupactivation: AnyCodable?
     ) {
         self.key = key
         self.thinkinglevel = thinkinglevel
         self.verboselevel = verboselevel
-        self.elevatedlevel = elevatedlevel
         self.model = model
-        self.sendpolicy = sendpolicy
         self.groupactivation = groupactivation
     }
     private enum CodingKeys: String, CodingKey {
         case key
         case thinkinglevel = "thinkingLevel"
         case verboselevel = "verboseLevel"
-        case elevatedlevel = "elevatedLevel"
         case model
-        case sendpolicy = "sendPolicy"
         case groupactivation = "groupActivation"
     }
 }
@@ -742,210 +701,6 @@ public struct ConfigSetParams: Codable {
     }
 }
 
-public struct ConfigSchemaParams: Codable {
-}
-
-public struct ConfigSchemaResponse: Codable {
-    public let schema: AnyCodable
-    public let uihints: [String: AnyCodable]
-    public let version: String
-    public let generatedat: String
-
-    public init(
-        schema: AnyCodable,
-        uihints: [String: AnyCodable],
-        version: String,
-        generatedat: String
-    ) {
-        self.schema = schema
-        self.uihints = uihints
-        self.version = version
-        self.generatedat = generatedat
-    }
-    private enum CodingKeys: String, CodingKey {
-        case schema
-        case uihints = "uiHints"
-        case version
-        case generatedat = "generatedAt"
-    }
-}
-
-public struct WizardStartParams: Codable {
-    public let mode: AnyCodable?
-    public let workspace: String?
-
-    public init(
-        mode: AnyCodable?,
-        workspace: String?
-    ) {
-        self.mode = mode
-        self.workspace = workspace
-    }
-    private enum CodingKeys: String, CodingKey {
-        case mode
-        case workspace
-    }
-}
-
-public struct WizardNextParams: Codable {
-    public let sessionid: String
-    public let answer: [String: AnyCodable]?
-
-    public init(
-        sessionid: String,
-        answer: [String: AnyCodable]?
-    ) {
-        self.sessionid = sessionid
-        self.answer = answer
-    }
-    private enum CodingKeys: String, CodingKey {
-        case sessionid = "sessionId"
-        case answer
-    }
-}
-
-public struct WizardCancelParams: Codable {
-    public let sessionid: String
-
-    public init(
-        sessionid: String
-    ) {
-        self.sessionid = sessionid
-    }
-    private enum CodingKeys: String, CodingKey {
-        case sessionid = "sessionId"
-    }
-}
-
-public struct WizardStatusParams: Codable {
-    public let sessionid: String
-
-    public init(
-        sessionid: String
-    ) {
-        self.sessionid = sessionid
-    }
-    private enum CodingKeys: String, CodingKey {
-        case sessionid = "sessionId"
-    }
-}
-
-public struct WizardStep: Codable {
-    public let id: String
-    public let type: AnyCodable
-    public let title: String?
-    public let message: String?
-    public let options: [[String: AnyCodable]]?
-    public let initialvalue: AnyCodable?
-    public let placeholder: String?
-    public let sensitive: Bool?
-    public let executor: AnyCodable?
-
-    public init(
-        id: String,
-        type: AnyCodable,
-        title: String?,
-        message: String?,
-        options: [[String: AnyCodable]]?,
-        initialvalue: AnyCodable?,
-        placeholder: String?,
-        sensitive: Bool?,
-        executor: AnyCodable?
-    ) {
-        self.id = id
-        self.type = type
-        self.title = title
-        self.message = message
-        self.options = options
-        self.initialvalue = initialvalue
-        self.placeholder = placeholder
-        self.sensitive = sensitive
-        self.executor = executor
-    }
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case type
-        case title
-        case message
-        case options
-        case initialvalue = "initialValue"
-        case placeholder
-        case sensitive
-        case executor
-    }
-}
-
-public struct WizardNextResult: Codable {
-    public let done: Bool
-    public let step: [String: AnyCodable]?
-    public let status: AnyCodable?
-    public let error: String?
-
-    public init(
-        done: Bool,
-        step: [String: AnyCodable]?,
-        status: AnyCodable?,
-        error: String?
-    ) {
-        self.done = done
-        self.step = step
-        self.status = status
-        self.error = error
-    }
-    private enum CodingKeys: String, CodingKey {
-        case done
-        case step
-        case status
-        case error
-    }
-}
-
-public struct WizardStartResult: Codable {
-    public let sessionid: String
-    public let done: Bool
-    public let step: [String: AnyCodable]?
-    public let status: AnyCodable?
-    public let error: String?
-
-    public init(
-        sessionid: String,
-        done: Bool,
-        step: [String: AnyCodable]?,
-        status: AnyCodable?,
-        error: String?
-    ) {
-        self.sessionid = sessionid
-        self.done = done
-        self.step = step
-        self.status = status
-        self.error = error
-    }
-    private enum CodingKeys: String, CodingKey {
-        case sessionid = "sessionId"
-        case done
-        case step
-        case status
-        case error
-    }
-}
-
-public struct WizardStatusResult: Codable {
-    public let status: AnyCodable
-    public let error: String?
-
-    public init(
-        status: AnyCodable,
-        error: String?
-    ) {
-        self.status = status
-        self.error = error
-    }
-    private enum CodingKeys: String, CodingKey {
-        case status
-        case error
-    }
-}
-
 public struct TalkModeParams: Codable {
     public let enabled: Bool
     public let phase: String?

apps/macos/Tests/ClawdisIPCTests/OnboardingViewSmokeTests.swift

@@ -17,7 +17,7 @@ struct OnboardingViewSmokeTests {
     @Test func pageOrderOmitsWorkspaceAndIdentitySteps() {
         let order = OnboardingView.pageOrder(for: .local, needsBootstrap: false)
         #expect(!order.contains(7))
-        #expect(order.contains(3))
+        #expect(!order.contains(3))
     }
 
     @Test func pageOrderOmitsOnboardingChatWhenIdentityKnown() {

apps/macos/Tests/ClawdisIPCTests/OnboardingWizardStepViewTests.swift

@@ -1,42 +0,0 @@
-import SwiftUI
-import Testing
-import ClawdisProtocol
-@testable import Clawdis
-
-@Suite(.serialized)
-@MainActor
-struct OnboardingWizardStepViewTests {
-    @Test func noteStepBuilds() {
-        let step = WizardStep(
-            id: "step-1",
-            type: AnyCodable("note"),
-            title: "Welcome",
-            message: "Hello",
-            options: nil,
-            initialvalue: nil,
-            placeholder: nil,
-            sensitive: nil,
-            executor: nil)
-        let view = OnboardingWizardStepView(step: step, isSubmitting: false, onSubmit: { _ in })
-        _ = view.body
-    }
-
-    @Test func selectStepBuilds() {
-        let options: [[String: AnyCodable]] = [
-            ["value": AnyCodable("local"), "label": AnyCodable("Local"), "hint": AnyCodable("This Mac")],
-            ["value": AnyCodable("remote"), "label": AnyCodable("Remote")],
-        ]
-        let step = WizardStep(
-            id: "step-2",
-            type: AnyCodable("select"),
-            title: "Mode",
-            message: "Choose a mode",
-            options: options,
-            initialvalue: AnyCodable("local"),
-            placeholder: nil,
-            sensitive: nil,
-            executor: nil)
-        let view = OnboardingWizardStepView(step: step, isSubmitting: false, onSubmit: { _ in })
-        _ = view.body
-    }
-}

apps/macos/Tests/ClawdisIPCTests/WebChatMainSessionKeyTests.swift

@@ -32,7 +32,7 @@ import Testing
         }
         """
         let key = try GatewayConnection.mainSessionKey(fromConfigGetData: Data(json.utf8))
-        #expect(key == "main")
+        #expect(key == "primary")
     }
 
     @Test func configGetSnapshotMainKeyFallsBackWhenEmptyOrWhitespace() throws {
@@ -54,14 +54,4 @@ import Testing
         let key = try GatewayConnection.mainSessionKey(fromConfigGetData: Data(json.utf8))
         #expect(key == "main")
     }
-
-    @Test func configGetSnapshotUsesGlobalScope() throws {
-        let json = """
-        {
-          "config": { "session": { "scope": "global" } }
-        }
-        """
-        let key = try GatewayConnection.mainSessionKey(fromConfigGetData: Data(json.utf8))
-        #expect(key == "global")
-    }
 }

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

@@ -1,139 +0,0 @@
-import Foundation
-
-struct AssistantTextSegment: Identifiable {
-    enum Kind {
-        case thinking
-        case response
-    }
-
-    let id = UUID()
-    let kind: Kind
-    let text: String
-}
-
-enum AssistantTextParser {
-    static func segments(from raw: String) -> [AssistantTextSegment] {
-        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else { return [] }
-        guard raw.contains("<") else {
-            return [AssistantTextSegment(kind: .response, text: trimmed)]
-        }
-
-        var segments: [AssistantTextSegment] = []
-        var cursor = raw.startIndex
-        var currentKind: AssistantTextSegment.Kind = .response
-        var matchedTag = false
-
-        while let match = self.nextTag(in: raw, from: cursor) {
-            matchedTag = true
-            if match.range.lowerBound > cursor {
-                self.appendSegment(kind: currentKind, text: raw[cursor..<match.range.lowerBound], to: &segments)
-            }
-
-            guard let tagEnd = raw.range(of: ">", range: match.range.upperBound..<raw.endIndex) else {
-                cursor = raw.endIndex
-                break
-            }
-
-            let isSelfClosing = self.isSelfClosingTag(in: raw, tagEnd: tagEnd)
-            cursor = tagEnd.upperBound
-            if isSelfClosing { continue }
-
-            if match.closing {
-                currentKind = .response
-            } else {
-                currentKind = match.kind == .think ? .thinking : .response
-            }
-        }
-
-        if cursor < raw.endIndex {
-            self.appendSegment(kind: currentKind, text: raw[cursor..<raw.endIndex], to: &segments)
-        }
-
-        guard matchedTag else {
-            return [AssistantTextSegment(kind: .response, text: trimmed)]
-        }
-
-        return segments
-    }
-
-    static func hasVisibleContent(in raw: String) -> Bool {
-        !self.segments(from: raw).isEmpty
-    }
-
-    private enum TagKind {
-        case think
-        case final
-    }
-
-    private struct TagMatch {
-        let kind: TagKind
-        let closing: Bool
-        let range: Range<String.Index>
-    }
-
-    private static func nextTag(in text: String, from start: String.Index) -> TagMatch? {
-        let candidates: [TagMatch] = [
-            self.findTagStart(tag: "think", closing: false, in: text, from: start).map {
-                TagMatch(kind: .think, closing: false, range: $0)
-            },
-            self.findTagStart(tag: "think", closing: true, in: text, from: start).map {
-                TagMatch(kind: .think, closing: true, range: $0)
-            },
-            self.findTagStart(tag: "final", closing: false, in: text, from: start).map {
-                TagMatch(kind: .final, closing: false, range: $0)
-            },
-            self.findTagStart(tag: "final", closing: true, in: text, from: start).map {
-                TagMatch(kind: .final, closing: true, range: $0)
-            },
-        ].compactMap { $0 }
-
-        return candidates.min { $0.range.lowerBound < $1.range.lowerBound }
-    }
-
-    private static func findTagStart(
-        tag: String,
-        closing: Bool,
-        in text: String,
-        from start: String.Index) -> Range<String.Index>?
-    {
-        let token = closing ? "</\(tag)" : "<\(tag)"
-        var searchRange = start..<text.endIndex
-        while let range = text.range(
-            of: token,
-            options: [.caseInsensitive, .diacriticInsensitive],
-            range: searchRange)
-        {
-            let boundaryIndex = range.upperBound
-            guard boundaryIndex < text.endIndex else { return range }
-            let boundary = text[boundaryIndex]
-            let isBoundary = boundary == ">" || boundary.isWhitespace || (!closing && boundary == "/")
-            if isBoundary {
-                return range
-            }
-            searchRange = boundaryIndex..<text.endIndex
-        }
-        return nil
-    }
-
-    private static func isSelfClosingTag(in text: String, tagEnd: Range<String.Index>) -> Bool {
-        var cursor = tagEnd.lowerBound
-        while cursor > text.startIndex {
-            cursor = text.index(before: cursor)
-            let char = text[cursor]
-            if char.isWhitespace { continue }
-            return char == "/"
-        }
-        return false
-    }
-
-    private static func appendSegment(
-        kind: AssistantTextSegment.Kind,
-        text: Substring,
-        to segments: inout [AssistantTextSegment])
-    {
-        let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else { return }
-        segments.append(AssistantTextSegment(kind: kind, text: trimmed))
-    }
-}

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

@@ -158,6 +158,7 @@ private struct ChatMessageBody: View {
 
     var body: some View {
         let text = self.primaryText
+        let split = ChatMarkdownSplitter.split(markdown: text)
         let textColor = self.isUser ? ClawdisChatTheme.userText : ClawdisChatTheme.assistantText
 
         VStack(alignment: .leading, spacing: 10) {
@@ -168,40 +169,37 @@ private struct ChatMessageBody: View {
                         text: text,
                         isUser: self.isUser)
                 }
-            } else if self.isUser {
-                let split = ChatMarkdownSplitter.split(markdown: text)
+            } else {
                 ForEach(split.blocks) { block in
                     switch block.kind {
                     case .text:
-                        MarkdownTextView(text: block.text, textColor: textColor, font: .system(size: 14))
+                        MarkdownTextView(text: block.text, textColor: textColor)
                     case let .code(language):
                         CodeBlockView(code: block.text, language: language, isUser: self.isUser)
                     }
                 }
+            }
 
-                if !split.images.isEmpty {
-                    ForEach(
-                        split.images,
-                        id: \ChatMarkdownSplitter.InlineImage.id)
-                    { (item: ChatMarkdownSplitter.InlineImage) in
-                        if let img = item.image {
-                            ClawdisPlatformImageFactory.image(img)
-                                .resizable()
-                                .scaledToFit()
-                                .frame(maxHeight: 260)
-                                .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
-                                .overlay(
-                                    RoundedRectangle(cornerRadius: 12, style: .continuous)
-                                        .strokeBorder(Color.white.opacity(0.12), lineWidth: 1))
-                        } else {
-                            Text(item.label.isEmpty ? "Image" : item.label)
-                                .font(.footnote)
-                                .foregroundStyle(.secondary)
-                        }
+            if !split.images.isEmpty {
+                ForEach(
+                    split.images,
+                    id: \ChatMarkdownSplitter.InlineImage.id)
+                { (item: ChatMarkdownSplitter.InlineImage) in
+                    if let img = item.image {
+                        ClawdisPlatformImageFactory.image(img)
+                            .resizable()
+                            .scaledToFit()
+                            .frame(maxHeight: 260)
+                            .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
+                            .overlay(
+                                RoundedRectangle(cornerRadius: 12, style: .continuous)
+                                    .strokeBorder(Color.white.opacity(0.12), lineWidth: 1))
+                    } else {
+                        Text(item.label.isEmpty ? "Image" : item.label)
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
                     }
                 }
-            } else {
-                ChatAssistantTextBody(text: text)
             }
 
             if !self.inlineAttachments.isEmpty {
@@ -508,7 +506,7 @@ struct ChatStreamingAssistantBubble: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
-            ChatAssistantTextBody(text: self.text)
+            ChatMarkdownBody(text: self.text, textColor: ClawdisChatTheme.assistantText)
         }
         .padding(12)
         .background(
@@ -616,7 +614,6 @@ private struct TypingDots: View {
 private struct MarkdownTextView: View {
     let text: String
     let textColor: Color
-    let font: Font
 
     var body: some View {
         let normalized = self.text.replacingOccurrences(
@@ -627,36 +624,20 @@ private struct MarkdownTextView: View {
             interpretedSyntax: .inlineOnlyPreservingWhitespace)
         if let attributed = try? AttributedString(markdown: normalized, options: options) {
             Text(attributed)
-                .font(self.font)
+                .font(.system(size: 14))
                 .foregroundStyle(self.textColor)
         } else {
             Text(normalized)
-                .font(self.font)
+                .font(.system(size: 14))
                 .foregroundStyle(self.textColor)
         }
     }
 }
 
-@MainActor
-private struct ChatAssistantTextBody: View {
-    let text: String
-
-    var body: some View {
-        let segments = AssistantTextParser.segments(from: self.text)
-        VStack(alignment: .leading, spacing: 10) {
-            ForEach(segments) { segment in
-                let font = segment.kind == .thinking ? Font.system(size: 14).italic() : Font.system(size: 14)
-                ChatMarkdownBody(text: segment.text, textColor: ClawdisChatTheme.assistantText, font: font)
-            }
-        }
-    }
-}
-
 @MainActor
 private struct ChatMarkdownBody: View {
     let text: String
     let textColor: Color
-    let font: Font
 
     var body: some View {
         let split = ChatMarkdownSplitter.split(markdown: self.text)
@@ -664,7 +645,7 @@ private struct ChatMarkdownBody: View {
             ForEach(split.blocks) { block in
                 switch block.kind {
                 case .text:
-                    MarkdownTextView(text: block.text, textColor: self.textColor, font: self.font)
+                    MarkdownTextView(text: block.text, textColor: self.textColor)
                 case let .code(language):
                     CodeBlockView(code: block.text, language: language, isUser: false)
                 }

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

@@ -169,7 +169,7 @@ public struct ClawdisChatView: View {
                 .frame(maxWidth: .infinity, alignment: .leading)
         }
 
-        if let text = self.viewModel.streamingAssistantText, AssistantTextParser.hasVisibleContent(in: text) {
+        if let text = self.viewModel.streamingAssistantText, !text.isEmpty {
             ChatStreamingAssistantBubble(text: text)
                 .frame(maxWidth: .infinity, alignment: .leading)
         }
@@ -246,7 +246,7 @@ public struct ClawdisChatView: View {
             return true
         }
         if let text = self.viewModel.streamingAssistantText,
-           AssistantTextParser.hasVisibleContent(in: text)
+           !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
         {
             return true
         }
@@ -261,7 +261,7 @@ public struct ClawdisChatView: View {
 
     private var showsEmptyState: Bool {
         self.viewModel.messages.isEmpty &&
-            !(self.viewModel.streamingAssistantText.map { AssistantTextParser.hasVisibleContent(in: $0) } ?? false) &&
+            (self.viewModel.streamingAssistantText?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true) &&
             self.viewModel.pendingRunCount == 0 &&
             self.viewModel.pendingToolCalls.isEmpty
     }

apps/shared/ClawdisKit/Sources/ClawdisKit/Capabilities.swift

@@ -5,5 +5,4 @@ public enum ClawdisCapability: String, Codable, Sendable {
     case camera
     case screen
     case voiceWake
-    case location
 }

apps/shared/ClawdisKit/Sources/ClawdisKit/LocationCommands.swift

@@ -1,57 +0,0 @@
-import Foundation
-
-public enum ClawdisLocationCommand: String, Codable, Sendable {
-    case get = "location.get"
-}
-
-public enum ClawdisLocationAccuracy: String, Codable, Sendable {
-    case coarse
-    case balanced
-    case precise
-}
-
-public struct ClawdisLocationGetParams: Codable, Sendable, Equatable {
-    public var timeoutMs: Int?
-    public var maxAgeMs: Int?
-    public var desiredAccuracy: ClawdisLocationAccuracy?
-
-    public init(timeoutMs: Int? = nil, maxAgeMs: Int? = nil, desiredAccuracy: ClawdisLocationAccuracy? = nil) {
-        self.timeoutMs = timeoutMs
-        self.maxAgeMs = maxAgeMs
-        self.desiredAccuracy = desiredAccuracy
-    }
-}
-
-public struct ClawdisLocationPayload: Codable, Sendable, Equatable {
-    public var lat: Double
-    public var lon: Double
-    public var accuracyMeters: Double
-    public var altitudeMeters: Double?
-    public var speedMps: Double?
-    public var headingDeg: Double?
-    public var timestamp: String
-    public var isPrecise: Bool
-    public var source: String?
-
-    public init(
-        lat: Double,
-        lon: Double,
-        accuracyMeters: Double,
-        altitudeMeters: Double? = nil,
-        speedMps: Double? = nil,
-        headingDeg: Double? = nil,
-        timestamp: String,
-        isPrecise: Bool,
-        source: String? = nil)
-    {
-        self.lat = lat
-        self.lon = lon
-        self.accuracyMeters = accuracyMeters
-        self.altitudeMeters = altitudeMeters
-        self.speedMps = speedMps
-        self.headingDeg = headingDeg
-        self.timestamp = timestamp
-        self.isPrecise = isPrecise
-        self.source = source
-    }
-}

apps/shared/ClawdisKit/Sources/ClawdisKit/LocationSettings.swift

@@ -1,7 +0,0 @@
-import Foundation
-
-public enum ClawdisLocationMode: String, Codable, Sendable, CaseIterable {
-    case off
-    case whileUsing
-    case always
-}

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

@@ -1,37 +0,0 @@
-@testable import ClawdisChatUI
-import Testing
-
-@Suite struct AssistantTextParserTests {
-    @Test func splitsThinkAndFinalSegments() {
-        let segments = AssistantTextParser.segments(
-            from: "<think>internal</think>\n\n<final>Hello there</final>")
-
-        #expect(segments.count == 2)
-        #expect(segments[0].kind == .thinking)
-        #expect(segments[0].text == "internal")
-        #expect(segments[1].kind == .response)
-        #expect(segments[1].text == "Hello there")
-    }
-
-    @Test func keepsTextWithoutTags() {
-        let segments = AssistantTextParser.segments(from: "Just text.")
-
-        #expect(segments.count == 1)
-        #expect(segments[0].kind == .response)
-        #expect(segments[0].text == "Just text.")
-    }
-
-    @Test func ignoresThinkingLikeTags() {
-        let raw = "<thinking>example</thinking>\nKeep this."
-        let segments = AssistantTextParser.segments(from: raw)
-
-        #expect(segments.count == 1)
-        #expect(segments[0].kind == .response)
-        #expect(segments[0].text == raw.trimmingCharacters(in: .whitespacesAndNewlines))
-    }
-
-    @Test func dropsEmptyTaggedContent() {
-        let segments = AssistantTextParser.segments(from: "<think></think>")
-        #expect(segments.isEmpty)
-    }
-}

docs/agent-send.md

@@ -11,7 +11,7 @@ read_when:
 - Required: `--message <text>`
 - Session selection:
   - If `--session-id` is given, reuse it.
-  - Else if `--to <e164>` is given, derive the session key from `session.scope` (direct chats collapse to `main`, or `global` when scope is global).
+  - Else if `--to <e164>` is given, derive the session key from `session.scope` (direct chats collapse to `session.mainKey`).
 - Runs the embedded Pi agent (configured via `agent`).
 - Thinking/verbose:
   - Flags `--thinking <off|minimal|low|medium|high>` and `--verbose <on|off>` persist into the session store.

docs/agent.md

@@ -14,10 +14,6 @@ You must set an agent home directory via `agent.workspace`. CLAWDIS uses this as
 
 Recommended: use `clawdis setup` to create `~/.clawdis/clawdis.json` if missing and initialize the workspace files.
 
-If `agent.sandbox` is enabled, non-main sessions can override this with
-per-session workspaces under `agent.sandbox.workspaceRoot` (see
-`docs/configuration.md`).
-
 ## Bootstrap files (injected)
 
 Inside `agent.workspace`, CLAWDIS expects these user-editable files:
@@ -86,11 +82,7 @@ current turn ends, then a new agent turn starts with the queued payloads. See
 
 Block streaming sends completed assistant blocks as soon as they finish; disable
 via `agent.blockStreamingDefault: "off"` if you only want the final response.
-Tune the boundary via `agent.blockStreamingBreak` (`text_end` vs `message_end`; defaults to text_end).
-Control soft block chunking with `agent.blockStreamingChunk` (defaults to
-800–1200 chars; prefers paragraph breaks, then newlines; sentences last).
-Verbose tool summaries are emitted at tool start (no debounce); Control UI
-streams tool output via agent events when available.
+Tune the boundary via `agent.blockStreamingBreak` (`text_end` vs `message_end`).
 
 ## Configuration (minimal)
 

docs/background-process.md

@@ -13,11 +13,10 @@ Clawdis runs shell commands through the `bash` tool and keeps long‑running tas
 
 Key parameters:
 - `command` (required)
-- `yieldMs` (default 10000): auto‑background after this delay
+- `yieldMs` (default 20000): auto‑background after this delay
 - `background` (bool): background immediately
 - `timeout` (seconds, default 1800): kill the process after this timeout
-- `elevated` (bool): run on host if elevated mode is enabled/allowed
-- Need a real TTY? Use the tmux skill.
+- `stdinMode` (`pipe` | `pty`): use a real TTY when `pty` is requested and node-pty loads (otherwise warns + falls back)
 - `workdir`, `env`
 
 Behavior:
@@ -31,7 +30,7 @@ Environment overrides:
 - `PI_BASH_JOB_TTL_MS`: TTL for finished sessions (ms, bounded to 1m–3h)
 
 Config (preferred):
-- `agent.bash.backgroundMs` (default 10000)
+- `agent.bash.backgroundMs` (default 20000)
 - `agent.bash.timeoutSec` (default 1800)
 - `agent.bash.cleanupMs` (default 1800000)
 

docs/bash.md

@@ -12,11 +12,18 @@ Run shell commands in the workspace. Supports foreground + background execution
 ## Parameters
 
 - `command` (required)
-- `yieldMs` (default 10000): auto-background after delay
+- `yieldMs` (default 20000): auto-background after delay
 - `background` (bool): background immediately
 - `timeout` (seconds, default 1800): kill on expiry
-- `elevated` (bool): run on host if elevated mode is enabled/allowed
-- Need a real TTY? Use the tmux skill.
+- `stdinMode` (`pipe` | `pty`):
+  - `pipe` (default): classic stdin/stdout/stderr pipes
+  - `pty`: real TTY via node-pty (merged stdout/stderr)
+
+## TTY mode (`stdinMode: "pty"`)
+
+- Uses node-pty if available. If node-pty fails to load/start, the tool warns and falls back to `pipe`.
+- Output streams are merged (no separate stderr).
+- `process write` sends raw input; `eof: true` sends Ctrl-D (`\x04`).
 
 ## Examples
 
@@ -30,3 +37,8 @@ Background + poll:
 {"tool":"bash","command":"npm run build","yieldMs":1000}
 {"tool":"process","action":"poll","sessionId":"<id>"}
 ```
+
+TTY command:
+```json
+{"tool":"bash","command":"htop","stdinMode":"pty","background":true}
+```

docs/browser.md

@@ -153,59 +153,6 @@ Hooks (arming):
 Clawdis should treat "open/closed" as a health check (fast path), not by scanning
 global Chrome processes (avoid false positives).
 
-## Multi-profile support
-
-Clawdis supports multiple named browser profiles, each with:
-- Dedicated CDP port (auto-allocated from 18800-18899) **or** a per-profile CDP URL
-- Persistent user data directory (`~/.clawdis/browser/<name>/user-data/`)
-- Unique color for visual distinction
-
-### Configuration
-
-```json
-{
-  "browser": {
-    "enabled": true,
-    "defaultProfile": "clawd",
-    "profiles": {
-      "clawd": { "cdpPort": 18800, "color": "#FF4500" },
-      "work": { "cdpPort": 18801, "color": "#0066CC" },
-      "remote": { "cdpUrl": "http://10.0.0.42:9222", "color": "#00AA00" }
-    }
-  }
-}
-```
-
-### Profile actions
-
-- `GET /profiles` — list all profiles with status
-- `POST /profiles/create` `{ name, color?, cdpUrl? }` — create new profile (auto-allocates port if no `cdpUrl`)
-- `DELETE /profiles/:name` — delete profile (stops browser + removes user data for local profiles)
-- `POST /reset-profile?profile=<name>` — kill orphan process on profile's port (local profiles only)
-
-### Profile parameter
-
-All existing endpoints accept optional `?profile=<name>` query parameter:
-- `GET /?profile=work` — status for work profile
-- `POST /start?profile=work` — start work profile browser
-- `GET /tabs?profile=work` — list tabs for work profile
-- etc.
-
-When `profile` is omitted, uses `browser.defaultProfile` (defaults to "clawd").
-
-### Profile naming rules
-
-- Lowercase alphanumeric characters and hyphens only
-- Must start with a letter or number (not a hyphen)
-- Maximum 64 characters
-- Examples: `clawd`, `work`, `my-project-1`
-
-### Port allocation
-
-Ports are allocated from range 18800-18899 (~100 profiles max). This is far more
-than practical use — memory and CPU exhaustion occur well before port exhaustion.
-Ports are allocated once at profile creation and persisted permanently.
-Remote profiles are attach-only and do **not** use the local port range.
 ## Interaction with the agent (clawd)
 
 The agent should use browser tools only when:
@@ -221,13 +168,6 @@ The agent should not assume tabs are ephemeral. It should:
 
 ## CLI quick reference (one example each)
 
-All commands accept `--profile <name>` to target a specific profile (default: `clawd`).
-
-Profile management:
-- `clawdis browser profiles`
-- `clawdis browser create-profile --name work`
-- `clawdis browser create-profile --name remote --cdp-url http://10.0.0.42:9222`
-- `clawdis browser delete-profile --name work`
 Basics:
 - `clawdis browser status`
 - `clawdis browser start`

docs/clawd.md

@@ -138,7 +138,8 @@ Example:
   session: {
     scope: "per-sender",
     resetTriggers: ["/new", "/reset"],
-    idleMinutes: 10080
+    idleMinutes: 10080,
+    mainKey: "main"
   }
 }
 ```

docs/clawdis-mac.md

@@ -31,9 +31,6 @@ Author: steipete · Status: draft spec · Date: 2025-12-20
 - The gateway port is configurable via `gateway.port` or `CLAWDIS_GATEWAY_PORT` (default 18789). The mac app reads that value for launchd, probes, and remote SSH tunnels.
 - The mac app connects to the bridge as a **node** and advertises capabilities/commands.
 - Agent‑facing actions are exposed via `node.invoke` (no local control socket).
-- The mac app watches `~/.clawdis/clawdis.json` and switches modes live when `gateway.mode` or `gateway.remote.url` changes.
-- If `gateway.mode` is unset but `gateway.remote.url` is set, the mac app treats it as remote mode.
-- Changing connection mode in the mac app writes `gateway.mode` (and `gateway.remote.url` in remote mode) back to the config file.
 
 ### Node commands (mac)
 - Canvas: `canvas.present|navigate|eval|snapshot|a2ui.*`

docs/configuration.md

@@ -16,14 +16,6 @@ If the file is missing, CLAWDIS uses safe-ish defaults (embedded Pi agent + per-
 - tune the embedded agent (`agent`) and session behavior (`session`)
 - set the agent's identity (`identity`)
 
-## Schema + UI hints
-
-The Gateway exposes a JSON Schema representation of the config via `config.schema` for UI editors.
-The Control UI renders a form from this schema, with a **Raw JSON** editor as an escape hatch.
-
-Hints (labels, grouping, sensitive fields) ship alongside the schema so clients can render
-better forms without hard-coding config knowledge.
-
 ## Minimal config (recommended starting point)
 
 ```json5
@@ -33,11 +25,6 @@ better forms without hard-coding config knowledge.
 }
 ```
 
-Build the default image once with:
-```bash
-scripts/sandbox-setup.sh
-```
-
 ## Self-chat mode (recommended for group control)
 
 To prevent the bot from responding to WhatsApp @-mentions in groups (only respond to specific text triggers):
@@ -176,7 +163,7 @@ Controls how inbound messages behave when an agent run is already active.
       bySurface: {
         whatsapp: "collect",
         telegram: "collect",
-        discord: "collect",
+        discord: "steer-backlog",
         imessage: "collect",
         webchat: "collect"
       }
@@ -271,7 +258,6 @@ Configure the Discord bot by setting the bot token and optional gating:
       "123456789012345678": {               // guild id (preferred) or slug
         slug: "friends-of-clawd",
         requireMention: false,              // per-guild default
-        reactionNotifications: "own",       // off | own | all | allowlist
         users: ["987654321098765432"],      // optional per-guild user allowlist
         channels: {
           general: { allow: true },
@@ -286,69 +272,7 @@ Configure the Discord bot by setting the bot token and optional gating:
 
 Clawdis starts Discord only when a `discord` config section exists. The token is resolved from `DISCORD_BOT_TOKEN` or `discord.token` (unless `discord.enabled` is `false`). Use `user:<id>` (DM) or `channel:<id>` (guild channel) when specifying delivery targets for cron/CLI commands.
 Guild slugs are lowercase with spaces replaced by `-`; channel keys use the slugged channel name (no leading `#`). Prefer guild ids as keys to avoid rename ambiguity.
-Reaction notification modes:
-- `off`: no reaction events.
-- `own`: reactions on the bot's own messages (default).
-- `all`: all reactions on all messages.
-- `allowlist`: reactions from `guilds.<id>.users` on all messages (empty list disables).
 
-### `slack` (socket mode)
-
-Slack runs in Socket Mode and requires both a bot token and app token:
-
-```json5
-{
-  slack: {
-    enabled: true,
-    botToken: "xoxb-...",
-    appToken: "xapp-...",
-    dm: {
-      enabled: true,
-      allowFrom: ["U123", "U456", "*"],
-      groupEnabled: false,
-      groupChannels: ["G123"]
-    },
-    channels: {
-      C123: { allow: true, requireMention: true },
-      "#general": { allow: true, requireMention: false }
-    },
-    reactionNotifications: "own", // off | own | all | allowlist
-    reactionAllowlist: ["U123"],
-    actions: {
-      reactions: true,
-      messages: true,
-      pins: true,
-      memberInfo: true,
-      emojiList: true
-    },
-    slashCommand: {
-      enabled: true,
-      name: "clawd",
-      sessionPrefix: "slack:slash",
-      ephemeral: true
-    },
-    textChunkLimit: 4000,
-    mediaMaxMb: 20
-  }
-}
-```
-
-Clawdis starts Slack when the provider is enabled and both tokens are set (via config or `SLACK_BOT_TOKEN` + `SLACK_APP_TOKEN`). Use `user:<id>` (DM) or `channel:<id>` when specifying delivery targets for cron/CLI commands.
-
-Reaction notification modes:
-- `off`: no reaction events.
-- `own`: reactions on the bot's own messages (default).
-- `all`: all reactions on all messages.
-- `allowlist`: reactions from `slack.reactionAllowlist` on all messages (empty list disables).
-
-Slack action groups (gate `slack` tool actions):
-| Action group | Default | Notes |
-| --- | --- | --- |
-| reactions | enabled | React + list reactions |
-| messages | enabled | Read/send/edit/delete |
-| pins | enabled | Pin/unpin/list |
-| memberInfo | enabled | Member info |
-| emojiList | enabled | Custom emoji list |
 ### `imessage` (imsg CLI)
 
 Clawdis spawns `imsg rpc` (JSON-RPC over stdio). No daemon or port required.
@@ -385,9 +309,6 @@ Default: `~/clawd`.
 }
 ```
 
-If `agent.sandbox` is enabled, non-main sessions can override this with their
-own per-session workspaces under `agent.sandbox.workspaceRoot`.
-
 ### `messages`
 
 Controls inbound/outbound prefixes and timestamps.
@@ -445,7 +366,6 @@ Controls the embedded agent runtime (model/thinking/verbose/timeouts).
     },
     thinkingDefault: "low",
     verboseDefault: "off",
-    elevatedDefault: "on",
     timeoutSeconds: 600,
     mediaMaxMb: 5,
     heartbeat: {
@@ -454,7 +374,7 @@ Controls the embedded agent runtime (model/thinking/verbose/timeouts).
     },
     maxConcurrent: 3,
     bash: {
-      backgroundMs: 10000,
+      backgroundMs: 20000,
       timeoutSec: 1800,
       cleanupMs: 1800000
     },
@@ -463,20 +383,6 @@ Controls the embedded agent runtime (model/thinking/verbose/timeouts).
 }
 ```
 
-Block streaming:
-- `agent.blockStreamingDefault`: `"on"`/`"off"` (default on).
-- `agent.blockStreamingBreak`: `"text_end"` or `"message_end"` (default: text_end).
-- `agent.blockStreamingChunk`: soft chunking for streamed blocks. Defaults to
-  800–1200 chars, prefers paragraph breaks (`\n\n`), then newlines, then sentences.
-  Example:
-  ```json5
-  {
-    agent: {
-      blockStreamingChunk: { minChars: 800, maxChars: 1200 }
-    }
-  }
-  ```
-
 `agent.model` should be set as `provider/model` (e.g. `anthropic/claude-opus-4-5`).
 If `modelAliases` is configured, you may also use the alias key (e.g. `Opus`).
 If you omit the provider, CLAWDIS currently assumes `anthropic` as a temporary
@@ -493,110 +399,14 @@ Z.AI models are available as `zai/<model>` (e.g. `zai/glm-4.7`) and require
 - `prompt`: optional override for the heartbeat body (default: `HEARTBEAT`).
 
 `agent.bash` configures background bash defaults:
-- `backgroundMs`: time before auto-background (ms, default 10000)
+- `backgroundMs`: time before auto-background (ms, default 20000)
 - `timeoutSec`: auto-kill after this runtime (seconds, default 1800)
 - `cleanupMs`: how long to keep finished sessions in memory (ms, default 1800000)
 
-`agent.elevated` controls elevated (host) bash access:
-- `enabled`: allow elevated mode (default true)
-- `allowFrom`: per-surface allowlists (empty = disabled)
-  - `whatsapp`: E.164 numbers
-  - `telegram`: chat ids or usernames
-  - `discord`: user ids or usernames (falls back to `discord.dm.allowFrom` if omitted)
-  - `signal`: E.164 numbers
-  - `imessage`: handles/chat ids
-  - `webchat`: session ids or usernames
-
-Example:
-```json5
-{
-  agent: {
-    elevated: {
-      enabled: true,
-      allowFrom: {
-        whatsapp: ["+15555550123"],
-        discord: ["steipete", "1234567890123"]
-      }
-    }
-  }
-}
-```
-
 `agent.maxConcurrent` sets the maximum number of embedded agent runs that can
 execute in parallel across sessions. Each session is still serialized (one run
 per session key at a time). Default: 1.
 
-### `agent.sandbox`
-
-Optional per-session **Docker sandboxing** for the embedded agent. Intended for
-non-main sessions so they cannot access your host system.
-
-Defaults (if enabled):
-- one container per session
-- Debian bookworm-slim based image
-- workspace per session under `~/.clawdis/sandboxes`
-- auto-prune: idle > 24h OR age > 7d
-- tools: allow only `bash`, `process`, `read`, `write`, `edit` (deny wins)
-- optional sandboxed browser (Chromium + CDP, noVNC observer)
-
-```json5
-{
-  agent: {
-    sandbox: {
-      mode: "non-main", // off | non-main | all
-      perSession: true,
-      workspaceRoot: "~/.clawdis/sandboxes",
-      docker: {
-        image: "clawdis-sandbox:bookworm-slim",
-        containerPrefix: "clawdis-sbx-",
-        workdir: "/workspace",
-        readOnlyRoot: true,
-        tmpfs: ["/tmp", "/var/tmp", "/run"],
-        network: "bridge",
-        user: "1000:1000",
-        capDrop: ["ALL"],
-        env: { LANG: "C.UTF-8" },
-        setupCommand: "apt-get update && apt-get install -y git curl jq"
-      },
-      browser: {
-        enabled: false,
-        image: "clawdis-sandbox-browser:bookworm-slim",
-        containerPrefix: "clawdis-sbx-browser-",
-        cdpPort: 9222,
-        vncPort: 5900,
-        noVncPort: 6080,
-        headless: false,
-        enableNoVnc: true
-      },
-      tools: {
-        allow: ["bash", "process", "read", "write", "edit"],
-        deny: ["browser", "canvas", "nodes", "cron", "discord", "gateway"]
-      },
-      prune: {
-        idleHours: 24,  // 0 disables idle pruning
-        maxAgeDays: 7   // 0 disables max-age pruning
-      }
-    }
-  }
-}
-```
-
-Build the default sandbox image once with:
-```bash
-scripts/sandbox-setup.sh
-```
-
-Build the optional browser image with:
-```bash
-scripts/sandbox-browser-setup.sh
-```
-
-When `agent.sandbox.browser.enabled=true`, the browser tool uses a sandboxed
-Chromium instance (CDP). If noVNC is enabled (default when headless=false),
-the noVNC URL is injected into the system prompt so the agent can reference it.
-This does not require `browser.enabled` in the main config; the sandbox control
-URL is injected per session.
-
 ### `models` (custom providers + base URLs)
 
 Clawdis uses the **pi-coding-agent** model catalog. You can add custom providers
@@ -703,26 +513,11 @@ Controls session scoping, idle expiry, reset triggers, and where the session sto
     idleMinutes: 60,
     resetTriggers: ["/new", "/reset"],
     store: "~/.clawdis/sessions/sessions.json",
-    // mainKey is ignored; primary key is fixed to "main"
-    agentToAgent: {
-      // Max ping-pong reply turns between requester/target (0–5).
-      maxPingPongTurns: 5
-    },
-    sendPolicy: {
-      rules: [
-        { action: "deny", match: { surface: "discord", chatType: "group" } }
-      ],
-      default: "allow"
-    }
+    mainKey: "main"
   }
 }
 ```
 
-Fields:
-- `agentToAgent.maxPingPongTurns`: max reply-back turns between requester/target (0–5, default 5).
-- `sendPolicy.default`: `allow` or `deny` fallback when no rule matches.
-- `sendPolicy.rules[]`: match by `surface` (provider), `chatType` (`direct|group|room`), or `keyPrefix` (e.g. `cron:`). First deny wins; otherwise allow.
-
 ### `skills` (skills config)
 
 Controls bundled allowlist, install preferences, extra skill folders, and per-skill
@@ -775,16 +570,11 @@ Example:
 ### `browser` (clawd-managed Chrome)
 
 Clawdis can start a **dedicated, isolated** Chrome/Chromium instance for clawd and expose a small loopback control server.
-Profiles can point at a **remote** Chrome via `profiles.<name>.cdpUrl`. Remote
-profiles are attach-only (start/stop/reset are disabled).
-
-`browser.cdpUrl` remains for legacy single-profile configs and as the base
-scheme/host for profiles that only set `cdpPort`.
 
 Defaults:
 - enabled: `true`
 - control URL: `http://127.0.0.1:18791` (CDP uses `18792`)
-- CDP URL: `http://127.0.0.1:18792` (control URL + 1, legacy single-profile)
+- CDP URL: `http://127.0.0.1:18792` (control URL + 1)
 - profile color: `#FF4500` (lobster-orange)
 - Note: the control server is started by the running gateway (Clawdis.app menubar, or `clawdis gateway`).
 
@@ -793,13 +583,7 @@ Defaults:
   browser: {
     enabled: true,
     controlUrl: "http://127.0.0.1:18791",
-    // cdpUrl: "http://127.0.0.1:18792", // legacy single-profile override
-    defaultProfile: "clawd",
-    profiles: {
-      clawd: { cdpPort: 18800, color: "#FF4500" },
-      work: { cdpPort: 18801, color: "#0066CC" },
-      remote: { cdpUrl: "http://10.0.0.42:9222", color: "#00AA00" }
-    },
+    // cdpUrl: "http://127.0.0.1:18792", // override for remote CDP
     color: "#FF4500",
     // Advanced:
     // headless: false,
@@ -839,18 +623,13 @@ Defaults:
     mode: "local", // or "remote"
     port: 18789, // WS + HTTP multiplex
     bind: "loopback",
-    // controlUi: { enabled: true, basePath: "/clawdis" }
+    // controlUi: { enabled: true }
     // auth: { mode: "token", token: "your-token" } // token is for multi-machine CLI access
     // tailscale: { mode: "off" | "serve" | "funnel" }
   }
 }
 ```
 
-Control UI base path:
-- `gateway.controlUi.basePath` sets the URL prefix where the Control UI is served.
-- Examples: `"/ui"`, `"/clawdis"`, `"/apps/clawdis"`.
-- Default: root (`/`) (unchanged).
-
 Notes:
 - `clawdis gateway` refuses to start unless `gateway.mode` is set to `local` (or you pass the override flag).
 - `gateway.port` controls the single multiplexed port used for WebSocket + HTTP (control UI, hooks, A2UI).
@@ -871,11 +650,6 @@ Remote client defaults (CLI):
 - `gateway.remote.token` supplies the token for remote calls (leave unset for no auth).
 - `gateway.remote.password` supplies the password for remote calls (leave unset for no auth).
 
-macOS app behavior:
-- Clawdis.app watches `~/.clawdis/clawdis.json` and switches modes live when `gateway.mode` or `gateway.remote.url` changes.
-- If `gateway.mode` is unset but `gateway.remote.url` is set, the macOS app treats it as remote mode.
-- When you change connection mode in the macOS app, it writes `gateway.mode` (and `gateway.remote.url` in remote mode) back to the config file.
-
 ```json5
 {
   gateway: {
@@ -889,48 +663,6 @@ macOS app behavior:
 }
 ```
 
-### `gateway.reload` (Config hot reload)
-
-The Gateway watches `~/.clawdis/clawdis.json` (or `CLAWDIS_CONFIG_PATH`) and applies changes automatically.
-
-Modes:
-- `hybrid` (default): hot-apply safe changes; restart the Gateway for critical changes.
-- `hot`: only apply hot-safe changes; log when a restart is required.
-- `restart`: restart the Gateway on any config change.
-- `off`: disable hot reload.
-
-```json5
-{
-  gateway: {
-    reload: {
-      mode: "hybrid",
-      debounceMs: 300
-    }
-  }
-}
-```
-
-#### Hot reload matrix (files + impact)
-
-Files watched:
-- `~/.clawdis/clawdis.json` (or `CLAWDIS_CONFIG_PATH`)
-
-Hot-applied (no full gateway restart):
-- `hooks` (webhook auth/path/mappings) + `hooks.gmail` (Gmail watcher restarted)
-- `browser` (browser control server restart)
-- `cron` (cron service restart + concurrency update)
-- `agent.heartbeat` (heartbeat runner restart)
-- `web` (WhatsApp web provider restart)
-- `telegram`, `discord`, `signal`, `imessage` (provider restarts)
-- `agent`, `models`, `routing`, `messages`, `session`, `whatsapp`, `logging`, `skills`, `ui`, `talk`, `identity`, `wizard` (dynamic reads)
-
-Requires full Gateway restart:
-- `gateway` (port/bind/auth/control UI/tailscale)
-- `bridge`
-- `discovery`
-- `canvasHost`
-- Any unknown/unsupported config path (defaults to restart for safety)
-
 ### Multi-instance isolation
 
 To run multiple gateways on one host, isolate per-instance state + config and use unique ports:

docs/control-ui.md

@@ -6,10 +6,9 @@ read_when:
 ---
 # Control UI (browser)
 
-The Control UI is a small **Vite + Lit** single-page app served by the Gateway:
+The Control UI is a small **Vite + Lit** single-page app served by the Gateway under:
 
-- default: `http://<host>:18789/`
-- optional prefix: set `gateway.controlUi.basePath` (e.g. `/clawdis`)
+- `http://<host>:18789/`
 
 It speaks **directly to the Gateway WebSocket** on the same port.
 
@@ -20,7 +19,6 @@ The dashboard settings panel lets you store a token; passwords are not persisted
 
 ## What it can do (today)
 - Chat with the model via Gateway WS (`chat.history`, `chat.send`, `chat.abort`)
-- Stream tool calls + live tool output cards in Chat (agent events)
 - Connections: WhatsApp/Telegram status + QR login + Telegram config (`providers.status`, `web.login.*`, `config.set`)
 - Instances: presence list + refresh (`system-presence`)
 - Sessions: list + per-session thinking/verbose overrides (`sessions.list`, `sessions.patch`)
@@ -28,7 +26,6 @@ The dashboard settings panel lets you store a token; passwords are not persisted
 - Skills: status, enable/disable, install, API key updates (`skills.*`)
 - Nodes: list + caps (`node.list`)
 - Config: view/edit `~/.clawdis/clawdis.json` (`config.get`, `config.set`)
-- Config schema + form rendering (`config.schema`); Raw JSON editor remains available
 - Debug: status/health/models snapshots + event log + manual RPC calls (`status`, `health`, `models.list`)
 
 ## Tailnet access (recommended)
@@ -42,7 +39,7 @@ clawdis gateway --tailscale serve
 ```
 
 Open:
-- `https://<magicdns>/` (or your configured `gateway.controlUi.basePath`)
+- `https://<magicdns>/ui/`
 
 By default, the gateway trusts Tailscale identity headers in serve mode. You can still set
 `CLAWDIS_GATEWAY_TOKEN` or `gateway.auth` if you want a shared secret instead.
@@ -54,7 +51,7 @@ clawdis gateway --bind tailnet --token "$(openssl rand -hex 32)"
 ```
 
 Then open:
-- `http://<tailscale-ip>:18789/` (or your configured `gateway.controlUi.basePath`)
+- `http://<tailscale-ip>:18789/ui/`
 
 Paste the token into the UI settings (sent as `connect.params.auth.token`).
 
@@ -67,12 +64,6 @@ pnpm ui:install
 pnpm ui:build
 ```
 
-Optional absolute base (when you want fixed asset URLs):
-
-```bash
-CLAWDIS_CONTROL_UI_BASE_PATH=/clawdis/ pnpm ui:build
-```
-
 For local development (separate dev server):
 
 ```bash

docs/dashboard.md

@@ -5,8 +5,7 @@ read_when:
 ---
 # Dashboard (Control UI)
 
-The Gateway dashboard is the browser Control UI served at `/` by default
-(override with `gateway.controlUi.basePath`).
+The Gateway dashboard is the browser Control UI served at `/ui/`.
 
 Key references:
 - `docs/control-ui.md` for usage and UI capabilities.

docs/discord.md

@@ -86,7 +86,6 @@ Note: Guild context `[from:]` lines include `author.tag` + `id` to make ping-rea
       "123456789012345678": {
         slug: "friends-of-clawd",
         requireMention: false,
-        reactionNotifications: "own",
         users: ["987654321098765432", "steipete"],
         channels: {
           general: { allow: true },
@@ -108,7 +107,6 @@ Note: Guild context `[from:]` lines include `author.tag` + `id` to make ping-rea
 - `guilds.<id>.users`: optional per-guild user allowlist (ids or names).
 - `guilds.<id>.channels`: channel rules (keys are channel slugs or ids).
 - `guilds.<id>.requireMention`: per-guild mention requirement (overridable per channel).
-- `guilds.<id>.reactionNotifications`: reaction system event mode (`off`, `own`, `all`, `allowlist`).
 - `slashCommand`: optional config for user-installed slash commands (ephemeral responses).
 - `mediaMaxMb`: clamp inbound media saved to disk.
 - `historyLimit`: number of recent guild messages to include as context when replying to a mention (default 20, `0` disables).
@@ -119,12 +117,6 @@ Note: Guild context `[from:]` lines include `author.tag` + `id` to make ping-rea
   - `roles` (role add/remove, default `false`)
   - `moderation` (timeout/kick/ban, default `false`)
 
-Reaction notifications use `guilds.<id>.reactionNotifications`:
-- `off`: no reaction events.
-- `own`: reactions on the bot's own messages (default).
-- `all`: all reactions on all messages.
-- `allowlist`: reactions from `guilds.<id>.users` on all messages (empty list disables).
-
 ### Tool action defaults
 
 | Action group | Default | Notes |

docs/docker.md

@@ -9,27 +9,16 @@ read_when:
 
 Docker is **optional**. Use it only if you want a containerized gateway or to validate the Docker flow.
 
-This guide covers:
-- Containerized Gateway (full Clawdis in Docker)
-- Per-session Agent Sandbox (host gateway + Docker-isolated agent tools)
+## Quick start (recommended)
 
-## Requirements
-
-- Docker Desktop (or Docker Engine) + Docker Compose v2
-- Enough disk for images + logs
-
-## Containerized Gateway (Docker Compose)
-
-### Quick start (recommended)
-
-From repo root:
+From the repo root:
 
 ```bash
 ./docker-setup.sh
 ```
 
 This script:
-- builds the gateway image
+- builds the image
 - runs the onboarding wizard
 - runs WhatsApp login
 - starts the gateway via Docker Compose
@@ -38,7 +27,7 @@ It writes config/workspace on the host:
 - `~/.clawdis/`
 - `~/clawd`
 
-### Manual flow (compose)
+## Manual flow (compose)
 
 ```bash
 docker build -t clawdis:local -f Dockerfile .
@@ -47,173 +36,14 @@ docker compose run --rm clawdis-cli login
 docker compose up -d clawdis-gateway
 ```
 
-### Health check
-
-```bash
-docker compose exec clawdis-gateway node dist/index.js health --token "$CLAWDIS_GATEWAY_TOKEN"
-```
-
-### E2E smoke test (Docker)
+## E2E smoke test (Docker)
 
 ```bash
 scripts/e2e/onboard-docker.sh
 ```
 
-### Notes
+## Notes
 
 - Gateway bind defaults to `lan` for container use.
-- The gateway container is the source of truth for sessions (`~/.clawdis/sessions`).
-
-## Per-session Agent Sandbox (host gateway + Docker tools)
-
-### What it does
-
-When `agent.sandbox` is enabled, **non-main sessions** run tools inside a Docker
-container. The gateway stays on your host, but the tool execution is isolated:
-- one container per session (hard wall)
-- per-session workspace folder mounted at `/workspace`
-- allow/deny tool policy (deny wins)
-
-### Default behavior
-
-- Image: `clawdis-sandbox:bookworm-slim`
-- One container per session
-- Workspace per session under `~/.clawdis/sandboxes`
-- Auto-prune: idle > 24h OR age > 7d
-- Default allow: `bash`, `process`, `read`, `write`, `edit`
-- Default deny: `browser`, `canvas`, `nodes`, `cron`, `discord`, `gateway`
-
-### Enable sandboxing
-
-```json5
-{
-  agent: {
-    sandbox: {
-      mode: "non-main", // off | non-main | all
-      perSession: true,
-      workspaceRoot: "~/.clawdis/sandboxes",
-      docker: {
-        image: "clawdis-sandbox:bookworm-slim",
-        workdir: "/workspace",
-        readOnlyRoot: true,
-        tmpfs: ["/tmp", "/var/tmp", "/run"],
-        network: "bridge",
-        user: "1000:1000",
-        capDrop: ["ALL"],
-        env: { LANG: "C.UTF-8" },
-        setupCommand: "apt-get update && apt-get install -y git curl jq"
-      },
-      tools: {
-        allow: ["bash", "process", "read", "write", "edit"],
-        deny: ["browser", "canvas", "nodes", "cron", "discord", "gateway"]
-      },
-      prune: {
-        idleHours: 24, // 0 disables idle pruning
-        maxAgeDays: 7  // 0 disables max-age pruning
-      }
-    }
-  }
-}
-```
-
-### Build the default sandbox image
-
-```bash
-scripts/sandbox-setup.sh
-```
-
-This builds `clawdis-sandbox:bookworm-slim` using `Dockerfile.sandbox`.
-
-### Sandbox browser image
-
-To run the browser tool inside the sandbox, build the browser image:
-
-```bash
-scripts/sandbox-browser-setup.sh
-```
-
-This builds `clawdis-sandbox-browser:bookworm-slim` using
-`Dockerfile.sandbox-browser`. The container runs Chromium with CDP enabled and
-an optional noVNC observer (headful via Xvfb).
-
-Notes:
-- Headful (Xvfb) reduces bot blocking vs headless.
-- Headless can still be used by setting `agent.sandbox.browser.headless=true`.
-- No full desktop environment (GNOME) is needed; Xvfb provides the display.
-
-Use config:
-
-```json5
-{
-  agent: {
-    sandbox: {
-      browser: { enabled: true }
-    }
-  }
-}
-```
-
-Custom browser image:
-
-```json5
-{
-  agent: {
-    sandbox: { browser: { image: "my-clawdis-browser" } }
-  }
-}
-```
-
-When enabled, the agent receives:
-- a sandbox browser control URL (for the `browser` tool)
-- a noVNC URL (if enabled and headless=false)
-
-Remember: if you use an allowlist for tools, add `browser` (and remove it from
-deny) or the tool remains blocked.
-Prune rules (`agent.sandbox.prune`) apply to browser containers too.
-
-### Custom sandbox image
-
-Build your own image and point config to it:
-
-```bash
-docker build -t my-clawdis-sbx -f Dockerfile.sandbox .
-```
-
-```json5
-{
-  agent: {
-    sandbox: { docker: { image: "my-clawdis-sbx" } }
-  }
-}
-```
-
-### Tool policy (allow/deny)
-
-- `deny` wins over `allow`.
-- If `allow` is empty: all tools (except deny) are available.
-- If `allow` is non-empty: only tools in `allow` are available (minus deny).
-
-### Pruning strategy
-
-Two knobs:
-- `prune.idleHours`: remove containers not used in X hours (0 = disable)
-- `prune.maxAgeDays`: remove containers older than X days (0 = disable)
-
-Example:
-- Keep busy sessions but cap lifetime:
-  `idleHours: 24`, `maxAgeDays: 7`
-- Never prune:
-  `idleHours: 0`, `maxAgeDays: 0`
-
-### Security notes
-
-- Hard wall only applies to **tools** (bash/read/write/edit).  
-- Host-only tools like browser/camera/canvas are blocked by default.  
-- Allowing `browser` in sandbox **breaks isolation** (browser runs on host).
-
-## Troubleshooting
-
-- Image missing: build with `scripts/sandbox-setup.sh` or set `agent.sandbox.docker.image`.
-- Container not running: it will auto-create per session on demand.
-- Permission errors in sandbox: set `docker.user` to a UID:GID that matches your
-  mounted workspace ownership (or chown the workspace folder).
+- Health check:
+  `docker compose exec clawdis-gateway node dist/index.js health --token "$CLAWDIS_GATEWAY_TOKEN"`

docs/docs.json

@@ -1,86 +0,0 @@
-{
-  "$schema": "https://mintlify.com/docs.json",
-  "name": "Clawdis",
-  "theme": "mint",
-  "logo": {
-    "light": "/assets/pixel-lobster.svg",
-    "dark": "/assets/pixel-lobster.svg"
-  },
-  "favicon": "/assets/pixel-lobster.svg",
-  "colors": {
-    "primary": "#FF5A36"
-  },
-  "topbarLinks": [
-    {
-      "name": "GitHub",
-      "url": "https://github.com/steipete/clawdis"
-    },
-    {
-      "name": "Releases",
-      "url": "https://github.com/steipete/clawdis/releases"
-    }
-  ],
-  "navigation": {
-    "groups": [
-      {
-        "group": "Getting Started",
-        "pages": [
-          "index",
-          "onboarding",
-          "wizard",
-          "clawd",
-          "faq"
-        ]
-      },
-      {
-        "group": "Core Concepts",
-        "pages": [
-          "architecture",
-          "agent",
-          "session",
-          "rpc",
-          "queue",
-          "tools"
-        ]
-      },
-      {
-        "group": "Gateway & Providers",
-        "pages": [
-          "gateway",
-          "gateway/pairing",
-          "whatsapp",
-          "telegram",
-          "discord",
-          "imessage",
-          "webhook",
-          "gmail-pubsub"
-        ]
-      },
-      {
-        "group": "Platforms",
-        "pages": [
-          "mac/dev-setup",
-          "mac/menu-bar",
-          "mac/voicewake",
-          "ios/connect",
-          "android/connect",
-          "webchat",
-          "web"
-        ]
-      },
-      {
-        "group": "Operations",
-        "pages": [
-          "doctor",
-          "troubleshooting",
-          "logging",
-          "security",
-          "health",
-          "background-process",
-          "gateway-lock",
-          "remote"
-        ]
-      }
-    ]
-  }
-}

docs/elevated.md

@@ -1,31 +0,0 @@
----
-summary: "Elevated bash mode and /elevated directives"
-read_when:
-  - Adjusting elevated mode defaults, allowlists, or slash command behavior
----
-# Elevated Mode (/elevated directives)
-
-## What it does
-- Elevated mode allows the bash tool to run with elevated privileges when the feature is available and the sender is approved.
-- Directive forms: `/elevated on`, `/elevated off`, `/elev on`, `/elev off`.
-- Only `on|off` are accepted; anything else returns a hint and does not change state.
-
-## Resolution order
-1. Inline directive on the message (applies only to that message).
-2. Session override (set by sending a directive-only message).
-3. Global default (`agent.elevatedDefault` in config).
-
-## Setting a session default
-- Send a message that is **only** the directive (whitespace allowed), e.g. `/elevated on`.
-- Confirmation reply is sent (`Elevated mode enabled.` / `Elevated mode disabled.`).
-- If elevated access is disabled or the sender is not on the approved allowlist, the directive replies `elevated is not available right now.` and does not change session state.
-
-## Availability + allowlists
-- Feature gate: `agent.elevated.enabled` (default can be off via config even if the code supports it).
-- Sender allowlist: `agent.elevated.allowFrom` with per-surface allowlists (e.g. `discord`, `whatsapp`).
-- Both must pass; otherwise elevated is treated as unavailable.
-- Discord fallback: if `agent.elevated.allowFrom.discord` is omitted, the `discord.dm.allowFrom` list is used as a fallback. Set `agent.elevated.allowFrom.discord` (even `[]`) to override.
-
-## Logging + status
-- Elevated bash calls are logged at info level.
-- Session status includes elevated mode (e.g. `elevated=on`).

docs/faq.md

@@ -433,7 +433,6 @@ Common issues:
 - Port already in use (change with `--port`)
 - Missing API keys in config
 - Invalid config syntax (remember it's JSON5, but still check for errors)
-- **Tailscale serve + bind conflict:** If using `tailscale.mode: "serve"`, you must set `gateway.bind: "loopback"` (not `"lan"`). Tailscale serve proxies traffic itself.
 
 **Debug mode** — use watch for live reload:
 ```bash
@@ -494,7 +493,6 @@ Quick reference (send these in chat):
 | `/new` or `/reset` | Reset the session |
 | `/think <level>` | Set thinking level (off\|minimal\|low\|medium\|high) |
 | `/verbose on\|off` | Toggle verbose mode |
-| `/elevated on\|off` | Toggle elevated bash mode (approved senders only) |
 | `/activation mention\|always` | Group activation (owner-only) |
 | `/model <name>` | Switch AI model (see below) |
 | `/queue instant\|batch\|serial` | Message queuing mode |
@@ -531,42 +529,6 @@ Use `/model` to switch without restarting:
 
 **Tip:** `/model` is processed at the gateway level — it works even if you're rate-limited (429) on the current model!
 
-### Alternative providers (OpenRouter, Z.AI)?
-
-If you don't want to use Anthropic directly, you can use alternative providers:
-
-**OpenRouter** (pay-per-token, many models):
-```json5
-{
-  agent: {
-    model: "openrouter/anthropic/claude-sonnet-4",
-    env: { OPENROUTER_API_KEY: "sk-or-..." }
-  }
-}
-```
-
-**Z.AI** (flat-rate plans, GLM models):
-```json5
-{
-  agent: {
-    model: "zai/glm-4.7",
-    env: { ZAI_API_KEY: "..." }
-  }
-}
-```
-
-**Important:** Always use the latest Claude models (4.5 series). Don't use older 3.x models — they're deprecated and less capable. Check [OpenRouter models](https://openrouter.ai/models?q=claude) for exact IDs.
-
-### Model + thinking mode issues?
-
-Some models don't support extended thinking well:
-
-- **Gemini Flash + thinking:** Can cause "Corrupted thought signature" errors. Fix: `/think off`
-- **Claude Opus + thinking off:** Opus may "think out loud" anyway. Better to use `/think low` than `off`.
-- **Local LLMs:** Most don't support the thinking/reasoning separation. Set `reasoning: false` in your model config.
-
-If you get weird errors after switching models, try `/think off` and `/new` to reset.
-
 ### How do I stop/cancel a running task?
 
 Send `/stop` to immediately abort the current agent run. Other stop words also work:

docs/gateway.md

@@ -22,10 +22,6 @@ pnpm clawdis gateway --force
 # dev loop (auto-reload on TS changes):
 pnpm gateway:watch
 ```
-- Config hot reload watches `~/.clawdis/clawdis.json` (or `CLAWDIS_CONFIG_PATH`).
-  - Default mode: `gateway.reload.mode="hybrid"` (hot-apply safe changes, restart on critical).
-  - Hot reload uses in-process restart via **SIGUSR1** when needed.
-  - Disable with `gateway.reload.mode="off"`.
 - Binds WebSocket control plane to `127.0.0.1:<port>` (default 18789).
 - The same port also serves HTTP (control UI, hooks, A2UI). Single-port multiplex.
 - Starts a Canvas file server by default on `canvasHost.port` (default `18793`), serving `http://<gateway-host>:18793/__clawdis__/canvas/` from `~/clawd/canvas`. Disable with `canvasHost.enabled=false` or `CLAWDIS_SKIP_CANVAS_HOST=1`.

docs/heartbeat.md

@@ -50,7 +50,7 @@ message. If the reply is only `HEARTBEAT_OK`, it is dropped.
 - `prompt`: optional override for the heartbeat body (default: `HEARTBEAT`).
 
 ## Behavior
-- Runs in the main session (`main`, or `global` when scope is global).
+- Runs in the main session (`session.mainKey`, or `global` when scope is global).
 - Uses the main lane queue; if requests are in flight, the wake is retried.
 - Empty output or `HEARTBEAT_OK` is treated as “ok” and does **not** keep the
   session alive (`updatedAt` is restored).

docs/images.md

@@ -24,7 +24,6 @@ CLAWDIS is now **web-only** (Baileys). This document captures the current media
   - **Images:** resize & recompress to JPEG (max side 2048px) targeting `agent.mediaMaxMb` (default 5 MB), capped at 6 MB.
   - **Audio/Voice/Video:** pass-through up to 16 MB; audio is sent as a voice note (`ptt: true`).
   - **Documents:** anything else, up to 100 MB, with filename preserved when available.
-- WhatsApp GIF-style playback: send an MP4 with `gifPlayback: true` (CLI: `--gif-playback`) so mobile clients loop inline.
 - MIME detection prefers magic bytes, then headers, then file extension.
 - Caption comes from `--message` or `reply.text`; empty caption is allowed.
 - Logging: non-verbose shows `↩️`/`✅`; verbose includes size and source path/URL.

docs/index.md

@@ -169,10 +169,6 @@ Example:
 - **Mario Zechner** ([@badlogicc](https://twitter.com/badlogicgames)) — Pi creator, security pen-tester
 - **Clawd** — The space lobster who demanded a better name
 
-## Core Contributors
-
-- **Maxim Vovshin** (@Hyaxia, 36747317+Hyaxia@users.noreply.github.com) — Blogwatcher skill
-
 ## License
 
 MIT — Free as a lobster in the ocean 🦞

docs/ios/connect.md

@@ -100,7 +100,7 @@ Pairing details: `docs/gateway/pairing.md`.
 
 ## 5) Verify the node is connected
 
-- In the macOS app: **Instances** tab should show something like `iOS Node (...)` with a green “Active” presence dot shortly after connect.
+- In the macOS app: **Instances** tab should show something like `iOS Node (...)`.
 - Via nodes status (paired + connected):
   ```bash
   clawdis nodes status

docs/location-command.md

@@ -1,95 +0,0 @@
----
-summary: "Location command for nodes (location.get), permission modes, and background behavior"
-read_when:
-  - Adding location node support or permissions UI
-  - Designing background location + push flows
----
-
-# Location command (nodes)
-
-## TL;DR
-- `location.get` is a node command (via `node.invoke`).
-- Off by default.
-- Settings use a selector: Off / While Using / Always.
-- Separate toggle: Precise Location.
-
-## Why a selector (not just a switch)
-OS permissions are multi-level. We can expose a selector in-app, but the OS still decides the actual grant.
-- iOS/macOS: user can choose **While Using** or **Always** in system prompts/Settings. App can request upgrade, but OS may require Settings.
-- Android: background location is a separate permission; on Android 10+ it often requires a Settings flow.
-- Precise location is a separate grant (iOS 14+ “Precise”, Android “fine” vs “coarse”).
-
-Selector in UI drives our requested mode; actual grant lives in OS settings.
-
-## Settings model
-Per node device:
-- `location.enabledMode`: `off | whileUsing | always`
-- `location.preciseEnabled`: bool
-
-UI behavior:
-- Selecting `whileUsing` requests foreground permission.
-- Selecting `always` first ensures `whileUsing`, then requests background (or sends user to Settings if required).
-- If OS denies requested level, revert to the highest granted level and show status.
-
-## Permissions mapping (node.permissions)
-Optional. macOS node reports `location` via the permissions map; iOS/Android may omit it.
-
-## Command: `location.get`
-Called via `node.invoke`.
-
-Params (suggested):
-```json
-{
-  "timeoutMs": 10000,
-  "maxAgeMs": 15000,
-  "desiredAccuracy": "coarse|balanced|precise"
-}
-```
-
-Response payload:
-```json
-{
-  "lat": 48.20849,
-  "lon": 16.37208,
-  "accuracyMeters": 12.5,
-  "altitudeMeters": 182.0,
-  "speedMps": 0.0,
-  "headingDeg": 270.0,
-  "timestamp": "2026-01-03T12:34:56.000Z",
-  "isPrecise": true,
-  "source": "gps|wifi|cell|unknown"
-}
-```
-
-Errors (stable codes):
-- `LOCATION_DISABLED`: selector is off.
-- `LOCATION_PERMISSION_REQUIRED`: permission missing for requested mode.
-- `LOCATION_BACKGROUND_UNAVAILABLE`: app is backgrounded but only While Using allowed.
-- `LOCATION_TIMEOUT`: no fix in time.
-- `LOCATION_UNAVAILABLE`: system failure / no providers.
-
-## Background behavior (future)
-Goal: model can request location even when node is backgrounded, but only when:
-- User selected **Always**.
-- OS grants background location.
-- App is allowed to run in background for location (iOS background mode / Android foreground service or special allowance).
-
-Push-triggered flow (future):
-1) Gateway sends a push to the node (silent push or FCM data).
-2) Node wakes briefly and calls `location.get` internally.
-3) Node forwards payload to Gateway.
-
-Notes:
-- iOS: Always permission + background location mode required. Silent push may be throttled; expect intermittent failures.
-- Android: background location may require a foreground service; otherwise, expect denial.
-
-## Model/tooling integration
-- Tool surface: `nodes` tool adds `location_get` action (node required).
-- CLI: `clawdis nodes location get --node <id>`.
-- Agent guidelines: only call when user enabled location and understands the scope.
-
-## UX copy (suggested)
-- Off: “Location sharing is disabled.”
-- While Using: “Only when Clawdis is open.”
-- Always: “Allow background location. Requires system permission.”
-- Precise: “Use precise GPS location. Toggle off to share approximate location.”

docs/mac/menu-bar.md

@@ -11,7 +11,7 @@ read_when:
 - The “Nodes” block in the menu lists **devices** only (gateway bridge nodes via `node.list`), not client/presence entries.
 
 ## State model
-- Sessions: events arrive with `runId` (per-run) plus `sessionKey` in the payload. The “main” session is the key `main`; if absent, we fall back to the most recently updated session.
+- Sessions: events arrive with `runId` (session key). The “main” session is the key `main`; if absent, we fall back to the most recently updated session.
 - Priority: main always wins. If main is active, its state is shown immediately. If main is idle, the most recently active non‑main session is shown. We do not flip‑flop mid‑activity; we only switch when the current session goes idle or main becomes active.
 - Activity kinds:
   - `job`: high‑level command execution (`state: started|streaming|done|error`).

docs/mac/permissions.md

@@ -1,40 +0,0 @@
----
-summary: "macOS permission persistence (TCC) and signing requirements"
-read_when:
-  - Debugging missing or stuck macOS permission prompts
-  - Packaging or signing the macOS app
-  - Changing bundle IDs or app install paths
----
-# macOS permissions (TCC)
-
-macOS permission grants are fragile. TCC associates a permission grant with the
-app's code signature, bundle identifier, and on-disk path. If any of those change,
-macOS treats the app as new and may drop or hide prompts.
-
-## Requirements for stable permissions
-- Same path: run the app from a fixed location (for Clawdis, `dist/Clawdis.app`).
-- Same bundle identifier: changing the bundle ID creates a new permission identity.
-- Signed app: unsigned or ad-hoc signed builds do not persist permissions.
-- Consistent signature: use a real Apple Development or Developer ID certificate
-  so the signature stays stable across rebuilds.
-
-Ad-hoc signatures generate a new identity every build. macOS will forget previous
-grants, and prompts can disappear entirely until the stale entries are cleared.
-
-## Recovery checklist when prompts disappear
-1. Quit the app.
-2. Remove the app entry in System Settings -> Privacy & Security.
-3. Relaunch the app from the same path and re-grant permissions.
-4. If the prompt still does not appear, reset TCC entries with `tccutil` and try again.
-5. Some permissions only reappear after a full macOS restart.
-
-Example resets (replace bundle ID as needed):
-
-```bash
-sudo tccutil reset Accessibility com.clawdis.mac
-sudo tccutil reset ScreenCapture com.clawdis.mac
-sudo tccutil reset AppleEvents
-```
-
-If you are testing permissions, always sign with a real certificate. Ad-hoc
-builds are only acceptable for quick local runs where permissions do not matter.

docs/mac/signing.md

@@ -9,24 +9,22 @@ This app is usually built from `scripts/package-mac-app.sh`, which now:
 
 - sets a stable debug bundle identifier: `com.clawdis.mac.debug`
 - writes the Info.plist with that bundle id (override via `BUNDLE_ID=...`)
-- calls `scripts/codesign-mac-app.sh` to sign the main binary, bundled CLI, and app bundle so macOS treats each rebuild as the same signed bundle and keeps TCC permissions (notifications, accessibility, screen recording, mic, speech). For stable permissions, use a real signing identity; ad-hoc is opt-in and fragile (see `docs/mac/permissions.md`).
+- calls `scripts/codesign-mac-app.sh` to sign the main binary, bundled CLI, and app bundle so macOS treats each rebuild as the same signed bundle and keeps TCC permissions (notifications, accessibility, screen recording, mic, speech). Requires a valid signing identity.
 - uses `CODESIGN_TIMESTAMP=auto` by default; it enables trusted timestamps for Developer ID signatures. Set `CODESIGN_TIMESTAMP=off` to skip timestamping (offline debug builds).
 - inject build metadata into Info.plist: `ClawdisBuildTimestamp` (UTC) and `ClawdisGitCommit` (short hash) so the About pane can show build, git, and debug/release channel.
 - **Packaging requires Bun**: The embedded gateway relay is compiled using `bun`. Ensure it is installed (`curl -fsSL https://bun.sh/install | bash`).
-- reads `SIGN_IDENTITY` from the environment. Add `export SIGN_IDENTITY="Apple Development: Your Name (TEAMID)"` (or your Developer ID Application cert) to your shell rc to always sign with your cert. Ad-hoc signing requires explicit opt-in via `ALLOW_ADHOC_SIGNING=1` or `SIGN_IDENTITY="-"` (not recommended for permission testing).
+- reads `SIGN_IDENTITY` from the environment. Add `export SIGN_IDENTITY="Apple Development: Your Name (TEAMID)"` (or your Developer ID Application cert) to your shell rc to always sign with your cert; otherwise signing falls back to ad‑hoc.
 
 ## Usage
 
 ```bash
 # from repo root
-scripts/package-mac-app.sh               # auto-selects identity; errors if none found
+scripts/package-mac-app.sh               # ad-hoc signing
 SIGN_IDENTITY="Developer ID Application: Your Name" scripts/package-mac-app.sh   # real cert
-ALLOW_ADHOC_SIGNING=1 scripts/package-mac-app.sh    # ad-hoc (permissions will not stick)
-SIGN_IDENTITY="-" scripts/package-mac-app.sh        # explicit ad-hoc (same caveat)
 ```
 
 ### Ad-hoc Signing Note
-When signing with `SIGN_IDENTITY="-"` (ad-hoc), the script automatically disables the **Hardened Runtime** (`--options runtime`). This is necessary to prevent crashes when the app attempts to load embedded frameworks (like Sparkle) that do not share the same Team ID. Ad-hoc signatures also break TCC permission persistence; see `docs/mac/permissions.md` for recovery steps.
+When signing with `SIGN_IDENTITY="-"` (ad-hoc), the script automatically disables the **Hardened Runtime** (`--options runtime`). This is necessary to prevent crashes when the app attempts to load embedded frameworks (like Sparkle) that do not share the same Team ID.
 
 ## Build metadata for About
 

docs/mac/webchat.md

@@ -5,7 +5,7 @@ read_when:
 ---
 # Web Chat (macOS app)
 
-The macOS menu bar app shows the WebChat UI as a native SwiftUI view and reuses the **primary Clawd session** (`main`, or `global` when scope is global).
+The macOS menu bar app shows the WebChat UI as a native SwiftUI view and reuses the **primary Clawd session** (`main` by default, configurable via `session.mainKey`).
 
 - **Local mode**: connects directly to the local Gateway WebSocket.
 - **Remote mode**: forwards the Gateway WebSocket control port over SSH and uses that as the data plane.

docs/nodes.md

@@ -94,36 +94,6 @@ Notes:
 - Screen recordings are clamped to `<= 60s`.
 - `--no-audio` disables microphone capture (supported on iOS/Android; macOS uses system capture audio).
 
-## Location (nodes)
-
-Nodes expose `location.get` when Location is enabled in settings.
-
-CLI helper:
-
-```bash
-clawdis nodes location get --node <idOrNameOrIp>
-clawdis nodes location get --node <idOrNameOrIp> --accuracy precise --max-age 15000 --location-timeout 10000
-```
-
-Notes:
-- Location is **off by default**.
-- “Always” requires system permission; background fetch is best-effort.
-- The response includes lat/lon, accuracy (meters), and timestamp.
-
-## SMS (Android nodes)
-
-Android nodes can expose `sms.send` when the user grants **SMS** permission and the device supports telephony.
-
-Low-level invoke:
-
-```bash
-clawdis nodes invoke --node <idOrNameOrIp> --command sms.send --params '{"to":"+15555550123","message":"Hello from Clawdis"}'
-```
-
-Notes:
-- The permission prompt must be accepted on the Android device before the capability is advertised.
-- Wi-Fi-only devices without telephony will not advertise `sms.send`.
-
 ## System commands (mac node)
 
 The macOS node exposes `system.run` and `system.notify`.

docs/onboarding-config-protocol.md

@@ -1,29 +0,0 @@
-# Onboarding + Config Protocol
-
-Purpose: shared onboarding + config surfaces across CLI, macOS app, and Web UI.
-
-## Components
-- Wizard engine: `src/wizard` (session + prompts + onboarding state).
-- CLI: `src/commands/onboard-*.ts` uses the wizard with the CLI prompter.
-- Gateway RPC: wizard + config schema endpoints serve UI clients.
-- macOS: SwiftUI onboarding uses the wizard step model.
-- Web UI: config form renders from JSON Schema + hints.
-
-## Gateway RPC
-- `wizard.start` params: `{ mode?: "local"|"remote", workspace?: string }`
-- `wizard.next` params: `{ sessionId, answer?: { stepId, value? } }`
-- `wizard.cancel` params: `{ sessionId }`
-- `wizard.status` params: `{ sessionId }`
-- `config.schema` params: `{}`
-
-Responses (shape)
-- Wizard: `{ sessionId, done, step?, status?, error? }`
-- Config schema: `{ schema, uiHints, version, generatedAt }`
-
-## UI Hints
-- `uiHints` keyed by path; optional metadata (label/help/group/order/advanced/sensitive/placeholder).
-- Sensitive fields render as password inputs; no redaction layer.
-- Unsupported schema nodes fall back to the raw JSON editor.
-
-## Notes
-- This doc is the single place to track protocol refactors for onboarding/config.

docs/presence.md

@@ -24,7 +24,7 @@ Presence entries are structured objects with (some) fields:
 - `modelIdentifier` (optional): hardware model identifier like `iPad16,6` or `Mac16,6`
 - `mode`: e.g. `gateway`, `app`, `webchat`, `cli`
 - `lastInputSeconds` (optional): “seconds since last user input” for that client machine
-- `reason`: a short marker like `self`, `connect`, `node-connected`, `node-disconnected`, `periodic`, `instances-refresh`
+- `reason`: a short marker like `self`, `connect`, `periodic`, `instances-refresh`
 - `text`: legacy/debug summary string (kept for backwards compatibility and UI display)
 - `ts`: last update timestamp (ms since epoch)
 
@@ -61,16 +61,6 @@ Implementation:
 - Gateway: `src/gateway/server.ts` handles method `system-event` by calling `updateSystemPresence(...)`.
 - mac app beaconing: `apps/macos/Sources/Clawdis/PresenceReporter.swift`.
 
-### 4) Node bridge beacons (gateway-owned presence)
-
-When a node bridge connection authenticates, the Gateway emits a presence entry
-for that node and starts periodic refresh beacons so it does not expire.
-
-- Connect/disconnect markers: `node-connected`, `node-disconnected`
-- Periodic heartbeat: every 3 minutes (`reason: periodic`)
-
-Implementation: `src/gateway/server.ts` (node bridge handlers + timer beacons).
-
 ## Merge + dedupe rules (why `instanceId` matters)
 
 All producers write into a single in-memory presence map.
@@ -119,9 +109,6 @@ Implementation:
 - View: `apps/macos/Sources/Clawdis/InstancesSettings.swift`
 - Store: `apps/macos/Sources/Clawdis/InstancesStore.swift`
 
-The Instances rows show a small presence indicator (Active/Idle/Stale) based on
-the last beacon age. The label is derived from the entry timestamp (`ts`).
-
 The store refreshes periodically and also applies `presence` WS events.
 
 ## Debugging tips

docs/queue.md

@@ -27,11 +27,6 @@ Inbound messages can steer the current run, wait for a followup turn, or do both
 - `interrupt` (legacy): abort the active run for that session, then run the newest message.
 - `queue` (legacy alias): same as `steer`.
 
-Steer-backlog means you can get a followup response after the steered run, so
-streaming surfaces can look like duplicates. Prefer `collect`/`steer` if you want
-one response per inbound message.
-Inline fix: `/queue collect` (per-session) or set `routing.queue.bySurface.discord: "collect"`.
-
 Defaults (when unset in config):
 - All surfaces → `collect`
 
@@ -45,7 +40,7 @@ Configure globally or per surface via `routing.queue`:
       debounceMs: 1000,
       cap: 20,
       drop: "summarize",
-      bySurface: { discord: "collect" }
+      bySurface: { discord: "steer-backlog" }
     }
   }
 }

docs/remote-gateway-readme.md

@@ -1,148 +0,0 @@
-# Running Clawdis.app with a Remote Gateway
-
-Clawdis.app uses SSH tunneling to connect to a remote gateway. This guide shows you how to set it up.
-
-## Overview
-
-```
-┌─────────────────────────────────────────────────────────────┐
-│                          MacBook                              │
-│                                                              │
-│  Clawdis.app ──► ws://127.0.0.1:18789 (local port)           │
-│                     │                                        │
-│                     ▼                                        │
-│  SSH Tunnel ────────────────────────────────────────────────│
-│                     │                                        │
-└─────────────────────┼──────────────────────────────────────┘
-                      │
-                      ▼
-┌─────────────────────────────────────────────────────────────┐
-│                         Remote Machine                        │
-│                                                              │
-│  Gateway WebSocket ──► ws://127.0.0.1:18789 ──►              │
-│                                                              │
-└─────────────────────────────────────────────────────────────┘
-```
-
-## Quick Setup
-
-### Step 1: Add SSH Config
-
-Edit `~/.ssh/config` and add:
-
-```ssh
-Host remote-gateway
-    HostName <REMOTE_IP>          # e.g., 172.27.187.184
-    User <REMOTE_USER>            # e.g., jefferson
-    LocalForward 18789 127.0.0.1:18789
-    IdentityFile ~/.ssh/id_rsa
-```
-
-Replace `<REMOTE_IP>` and `<REMOTE_USER>` with your values.
-
-### Step 2: Copy SSH Key
-
-Copy your public key to the remote machine (enter password once):
-
-```bash
-ssh-copy-id -i ~/.ssh/id_rsa <REMOTE_USER>@<REMOTE_IP>
-```
-
-### Step 3: Set Gateway Token
-
-```bash
-launchctl setenv CLAWDIS_GATEWAY_TOKEN "<your-token>"
-```
-
-### Step 4: Start SSH Tunnel
-
-```bash
-ssh -N remote-gateway &
-```
-
-### Step 5: Restart Clawdis.app
-
-```bash
-killall Clawdis
-open /path/to/Clawdis.app
-```
-
-The app will now connect to the remote gateway through the SSH tunnel.
-
----
-
-## Auto-Start Tunnel on Login
-
-To have the SSH tunnel start automatically when you log in, create a Launch Agent.
-
-### Create the PLIST file
-
-Save this as `~/Library/LaunchAgents/com.clawdis.ssh-tunnel.plist`:
-
-```xml
-<?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>com.clawdis.ssh-tunnel</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/usr/bin/ssh</string>
-        <string>-N</string>
-        <string>remote-gateway</string>
-    </array>
-    <key>KeepAlive</key>
-    <true/>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>
-```
-
-### Load the Launch Agent
-
-```bash
-launchctl load ~/Library/LaunchAgents/com.clawdis.ssh-tunnel.plist
-```
-
-The tunnel will now:
-- Start automatically when you log in
-- Restart if it crashes
-- Keep running in the background
-
----
-
-## Troubleshooting
-
-**Check if tunnel is running:**
-
-```bash
-ps aux | grep "ssh -N remote-gateway" | grep -v grep
-lsof -i :18789
-```
-
-**Restart the tunnel:**
-
-```bash
-launchctl restart com.clawdis.ssh-tunnel
-```
-
-**Stop the tunnel:**
-
-```bash
-launchctl unload ~/Library/LaunchAgents/com.clawdis.ssh-tunnel.plist
-```
-
----
-
-## How It Works
-
-| Component | What It Does |
-|-----------|--------------|
-| `LocalForward 18789 127.0.0.1:18789` | Forwards local port 18789 to remote port 18789 |
-| `ssh -N` | SSH without executing remote commands (just port forwarding) |
-| `KeepAlive` | Automatically restarts tunnel if it crashes |
-| `RunAtLoad` | Starts tunnel when the agent loads |
-
-Clawdis.app connects to `ws://127.0.0.1:18789` on your MacBook. The SSH tunnel forwards that connection to port 18789 on the remote machine where the Gateway is running.

docs/security.md

@@ -99,12 +99,6 @@ services:
     network_mode: bridge  # Limited network
 ```
 
-### Per-session sandbox (Clawdis-native)
-
-Clawdis can also run **non-main sessions** inside per-session Docker containers
-(`agent.sandbox`). This keeps the gateway on your host while isolating agent
-tools in a hard wall container. See `docs/configuration.md` for the full config.
-
 Expose only the services your AI needs:
 - ✅ GoWA API (for WhatsApp)
 - ✅ Specific HTTP APIs

docs/session-tool.md

@@ -1,119 +0,0 @@
----
-summary: "Agent session tools for listing sessions, fetching history, and sending cross-session messages"
-read_when:
-  - Adding or modifying session tools
----
-
-# Session Tools
-
-Goal: small, hard-to-misuse tool surface so agents can list sessions, fetch history, and send to another session.
-
-## Tool Names
-- `sessions_list`
-- `sessions_history`
-- `sessions_send`
-
-## Key Model
-- Main direct chat bucket is always the literal key `"main"`.
-- Group chats use `surface:group:<id>` or `surface:channel:<id>`.
-- Cron jobs use `cron:<job.id>`.
-- Hooks use `hook:<uuid>` unless explicitly set.
-- Node bridge uses `node-<nodeId>` unless explicitly set.
-
-`global` and `unknown` are internal-only and never listed. If `session.scope = "global"`, we alias it to `main` for all tools so callers never see `global`.
-
-## sessions_list
-List sessions as an array of rows.
-
-Parameters:
-- `kinds?: string[]` filter: any of `"main" | "group" | "cron" | "hook" | "node" | "other"`
-- `limit?: number` max rows (default: server default, clamp e.g. 200)
-- `activeMinutes?: number` only sessions updated within N minutes
-- `messageLimit?: number` 0 = no messages (default 0); >0 = include last N messages
-
-Behavior:
-- `messageLimit > 0` fetches `chat.history` per session and includes the last N messages.
-- Tool results are filtered out in list output; use `sessions_history` for tool messages.
-
-Row shape (JSON):
-- `key`: session key (string)
-- `kind`: `main | group | cron | hook | node | other`
-- `provider`: `whatsapp | telegram | discord | signal | imessage | webchat | internal | unknown`
-- `displayName` (group display label if available)
-- `updatedAt` (ms)
-- `sessionId`
-- `model`, `contextTokens`, `totalTokens`
-- `thinkingLevel`, `verboseLevel`, `systemSent`, `abortedLastRun`
-- `sendPolicy` (session override if set)
-- `lastChannel`, `lastTo`
-- `transcriptPath` (best-effort path derived from store dir + sessionId)
-- `messages?` (only when `messageLimit > 0`)
-
-## sessions_history
-Fetch transcript for one session.
-
-Parameters:
-- `sessionKey` (required)
-- `limit?: number` max messages (server clamps)
-- `includeTools?: boolean` (default false)
-
-Behavior:
-- `includeTools=false` filters `role: "toolResult"` messages.
-- Returns messages array in the raw transcript format.
-
-## sessions_send
-Send a message into another session.
-
-Parameters:
-- `sessionKey` (required)
-- `message` (required)
-- `timeoutSeconds?: number` (default >0; 0 = fire-and-forget)
-
-Behavior:
-- `timeoutSeconds = 0`: enqueue and return `{ runId, status: "accepted" }`.
-- `timeoutSeconds > 0`: wait up to N seconds for completion, then return `{ runId, status: "ok", reply }`.
-- If wait times out: `{ runId, status: "timeout", error }`. Run continues; call `sessions_history` later.
-- If the run fails: `{ runId, status: "error", error }`.
-- Waits via gateway `agent.wait` (server-side) so reconnects don't drop the wait.
-- Agent-to-agent message context is injected for the primary run.
-- After the primary run completes, Clawdis runs a **reply-back loop**:
-  - Round 2+ alternates between requester and target agents.
-  - Reply exactly `REPLY_SKIP` to stop the ping‑pong.
-  - Max turns is `session.agentToAgent.maxPingPongTurns` (0–5, default 5).
-- Once the loop ends, Clawdis runs the **agent‑to‑agent announce step** (target agent only):
-  - Reply exactly `ANNOUNCE_SKIP` to stay silent.
-  - Any other reply is sent to the target channel.
-  - Announce step includes the original request + round‑1 reply + latest ping‑pong reply.
-
-## Provider Field
-- For groups, `provider` is the `surface` recorded on the session entry.
-- For direct chats, `provider` maps from `lastChannel`.
-- For cron/hook/node, `provider` is `internal`.
-- If missing, `provider` is `unknown`.
-
-## Security / Send Policy
-Policy-based blocking by surface/chat type (not per session id).
-
-```json
-{
-  "session": {
-    "sendPolicy": {
-      "rules": [
-        {
-          "match": { "surface": "discord", "chatType": "group" },
-          "action": "deny"
-        }
-      ],
-      "default": "allow"
-    }
-  }
-}
-```
-
-Runtime override (per session entry):
-- `sendPolicy: "allow" | "deny"` (unset = inherit config)
-- Settable via `sessions.patch` or owner-only `/send on|off|inherit`.
-
-Enforcement points:
-- `chat.send` / `agent` (gateway)
-- auto-reply delivery logic

docs/session.md

@@ -5,7 +5,7 @@ read_when:
 ---
 # Session Management
 
-Clawdis treats **one session as primary**. The canonical key is fixed to `main` for direct chats (or `global` when scope is global); no configuration is required. `session.mainKey` is ignored. Older/local sessions can stay on disk, but only the primary key is used for desktop/web chat and direct agent calls.
+Clawdis treats **one session as primary**. By default the canonical key is `main` for every direct chat; no configuration is required. You can rename it via `session.mainKey` if you really want, but there is still only a single primary session. Older/local sessions can stay on disk, but only the primary key is used for desktop/web chat and direct agent calls.
 
 ## Gateway is the source of truth
 All session state is **owned by the gateway** (the “master” Clawdis). UI clients (macOS app, WebChat, etc.) must query the gateway for session lists and token counts instead of reading local files.
@@ -26,38 +26,12 @@ All session state is **owned by the gateway** (the “master” Clawdis). UI cli
 - Multiple phone numbers can map to that same key; they act as transports into the same conversation.
 - Group chats isolate state with `surface:group:<id>` keys (rooms/channels use `surface:channel:<id>`); do not reuse the primary key for groups. (Discord display names show `discord:<guildSlug>#<channelSlug>`.)
   - Legacy `group:<surface>:<id>` and `group:<id>` keys are still recognized.
-- Other sources:
-  - Cron jobs: `cron:<job.id>`
-  - Webhooks: `hook:<uuid>` (unless explicitly set by the hook)
-  - Node bridge runs: `node-<nodeId>`
 
 ## Lifecyle
 - Idle expiry: `session.idleMinutes` (default 60). After the timeout a new `sessionId` is minted on the next message.
 - Reset triggers: exact `/new` or `/reset` (plus any extras in `resetTriggers`) start a fresh session id and pass the remainder of the message through. If `/new` or `/reset` is sent alone, Clawdis runs a short “hello” greeting turn to confirm the reset.
 - Manual reset: delete specific keys from the store or remove the JSONL transcript; the next message recreates them.
 
-## Send policy (optional)
-Block delivery for specific session types without listing individual ids.
-
-```json5
-{
-  session: {
-    sendPolicy: {
-      rules: [
-        { action: "deny", match: { surface: "discord", chatType: "group" } },
-        { action: "deny", match: { keyPrefix: "cron:" } }
-      ],
-      default: "allow"
-    }
-  }
-}
-```
-
-Runtime override (owner only):
-- `/send on` → allow for this session
-- `/send off` → deny for this session
-- `/send inherit` → clear override and use config rules
-
 ## Configuration (optional rename example)
 ```json5
 // ~/.clawdis/clawdis.json
@@ -67,7 +41,7 @@ Runtime override (owner only):
     idleMinutes: 120,
     resetTriggers: ["/new", "/reset"],
     store: "~/.clawdis/sessions/sessions.json",
-    // mainKey is ignored; primary key is fixed to "main"
+    mainKey: "main"           // optional rename; still a single primary
   }
 }
 ```

docs/slack.md

@@ -1,158 +0,0 @@
-# Slack (socket mode)
-
-## Setup
-1) Create a Slack app (From scratch) in https://api.slack.com/apps.
-2) **Socket Mode** → toggle on. Then go to **Basic Information** → **App-Level Tokens** → **Generate Token and Scopes** with scope `connections:write`. Copy the **App Token** (`xapp-...`).
-3) **OAuth & Permissions** → add bot token scopes (use the manifest below). Click **Install to Workspace**. Copy the **Bot User OAuth Token** (`xoxb-...`).
-4) **Event Subscriptions** → enable events and subscribe to:
-   - `message.*` (includes edits/deletes/thread broadcasts)
-   - `app_mention`
-   - `reaction_added`, `reaction_removed`
-   - `member_joined_channel`, `member_left_channel`
-   - `channel_rename`
-   - `pin_added`, `pin_removed`
-5) Invite the bot to channels you want it to read.
-6) Slash Commands → create the `/clawd` command (or your preferred name).
-7) App Home → enable the **Messages Tab** so users can DM the bot.
-
-Use the manifest below so scopes and events stay in sync.
-
-## Manifest (optional)
-Use this Slack app manifest to create the app quickly (adjust the name/command if you want).
-
-```json
-{
-  "display_information": {
-    "name": "Clawdbot",
-    "description": "Slack connector for Clawdbot"
-  },
-  "features": {
-    "bot_user": {
-      "display_name": "Clawdbot",
-      "always_online": false
-    },
-    "app_home": {
-      "messages_tab_enabled": true,
-      "messages_tab_read_only_enabled": false
-    },
-    "slash_commands": [
-      {
-        "command": "/clawd",
-        "description": "Send a message to Clawdbot",
-        "should_escape": false
-      }
-    ]
-  },
-  "oauth_config": {
-    "scopes": {
-      "bot": [
-        "chat:write",
-        "channels:history",
-        "channels:read",
-        "groups:history",
-        "im:history",
-        "mpim:history",
-        "users:read",
-        "app_mentions:read",
-        "reactions:read",
-        "reactions:write",
-        "pins:read",
-        "pins:write",
-        "emoji:read",
-        "commands",
-        "files:read",
-        "files:write"
-      ]
-    }
-  },
-  "settings": {
-    "socket_mode_enabled": true,
-    "event_subscriptions": {
-      "bot_events": [
-        "app_mention",
-        "message.channels",
-        "message.groups",
-        "message.im",
-        "message.mpim",
-        "reaction_added",
-        "reaction_removed",
-        "member_joined_channel",
-        "member_left_channel",
-        "channel_rename",
-        "pin_added",
-        "pin_removed"
-      ]
-    }
-  }
-}
-```
-
-## Config
-Slack uses Socket Mode only (no HTTP webhook server). Provide both tokens:
-
-```json
-{
-  "slack": {
-    "enabled": true,
-    "botToken": "xoxb-...",
-    "appToken": "xapp-...",
-    "dm": {
-      "enabled": true,
-      "allowFrom": ["U123", "U456", "*"],
-      "groupEnabled": false,
-      "groupChannels": ["G123"]
-    },
-    "channels": {
-      "C123": { "allow": true, "requireMention": true },
-      "#general": { "allow": true, "requireMention": false }
-    },
-    "reactionNotifications": "own",
-    "reactionAllowlist": ["U123"],
-    "actions": {
-      "reactions": true,
-      "messages": true,
-      "pins": true,
-      "memberInfo": true,
-      "emojiList": true
-    },
-    "slashCommand": {
-      "enabled": true,
-      "name": "clawd",
-      "sessionPrefix": "slack:slash",
-      "ephemeral": true
-    },
-    "textChunkLimit": 4000,
-    "mediaMaxMb": 20
-  }
-}
-```
-
-Tokens can also be supplied via env vars:
-- `SLACK_BOT_TOKEN`
-- `SLACK_APP_TOKEN`
-
-## Sessions + routing
-- DMs share the `main` session (like WhatsApp/Telegram).
-- Channels map to `slack:channel:<channelId>` sessions.
-- Slash commands use `slack:slash:<userId>` sessions.
-
-## Delivery targets
-Use these with cron/CLI sends:
-- `user:<id>` for DMs
-- `channel:<id>` for channels
-
-## Tool actions
-Slack tool actions can be gated with `slack.actions.*`:
-
-| Action group | Default | Notes |
-| --- | --- | --- |
-| reactions | enabled | React + list reactions |
-| messages | enabled | Read/send/edit/delete |
-| pins | enabled | Pin/unpin/list |
-| memberInfo | enabled | Member info |
-| emojiList | enabled | Custom emoji list |
-
-## Notes
-- Mention gating is controlled via `slack.channels` (set `requireMention` to `true`).
-- Reaction notifications follow `slack.reactionNotifications` (use `reactionAllowlist` with mode `allowlist`).
-- Attachments are downloaded to the media store when permitted and under the size limit.

docs/tailscale.md

@@ -40,7 +40,7 @@ default unless you force `gateway.auth.mode` to `password` or set
 }
 ```
 
-Open: `https://<magicdns>/` (or your configured `gateway.controlUi.basePath`)
+Open: `https://<magicdns>/ui/`
 
 ### Public internet (Funnel + shared password)
 

docs/templates/AGENTS.md

@@ -73,13 +73,6 @@ You have access to your human's stuff. That doesn't mean you *share* their stuff
 
 Skills provide your tools. When you need one, check its `SKILL.md`. Keep local notes (camera names, SSH details, voice preferences) in `TOOLS.md`.
 
-**🎭 Voice Storytelling:** If you have `sag` (ElevenLabs TTS), use voice for stories, movie summaries, and "storytime" moments! Way more engaging than walls of text. Surprise people with funny voices.
-
-**📝 Platform Formatting:**
-- **Discord/WhatsApp:** No markdown tables! Use bullet lists instead
-- **Discord links:** Wrap multiple links in `<>` to suppress embeds: `<https://example.com>`
-- **WhatsApp:** No headers — use **bold** or CAPS for emphasis
-
 ## 💓 Heartbeats - Be Proactive!
 
 When you receive a `HEARTBEAT` message, don't just reply `HEARTBEAT_OK` every time. Use heartbeats productively!

docs/thinking.md

@@ -1,7 +1,7 @@
 ---
-summary: "Directive syntax for /think + /verbose and how they affect model reasoning"
+summary: "Directive syntax for /think levels and how they affect model reasoning"
 read_when:
-  - Adjusting thinking or verbose directive parsing or defaults
+  - Adjusting thinking level parsing or defaults
 ---
 # Thinking Levels (/think directives)
 
@@ -34,9 +34,6 @@ read_when:
 - Inline directive affects only that message; session/global defaults apply otherwise.
 - When verbose is on, agents that emit structured tool results (Pi, other JSON agents) send each tool result back as its own metadata-only message, prefixed with `<emoji> <tool-name>: <arg>` when available (path/command); the tool output itself is not forwarded. These tool summaries are sent as soon as each tool finishes (separate bubbles), not as streaming deltas. If you toggle `/verbose on|off` while a run is in-flight, subsequent tool bubbles honor the new setting.
 
-## Related
-- Elevated mode docs live in `docs/elevated.md`.
-
 ## Heartbeats
 - Heartbeat probe body is `HEARTBEAT`. Inline directives in a heartbeat message apply as usual (but avoid changing session defaults from heartbeats).
 

docs/tools.md

@@ -18,11 +18,10 @@ Run shell commands in the workspace.
 
 Core parameters:
 - `command` (required)
-- `yieldMs` (auto-background after timeout, default 10000)
+- `yieldMs` (auto-background after timeout, default 20000)
 - `background` (immediate background)
 - `timeout` (seconds; kills the process if exceeded, default 1800)
-- `elevated` (bool; run on host if elevated mode is enabled/allowed)
-- Need a real TTY? Use the tmux skill.
+- `stdinMode` (`pipe` | `pty`; `pty` uses node-pty for a real TTY with fallback warning)
 
 Notes:
 - Returns `status: "running"` with a `sessionId` when backgrounded.
@@ -48,23 +47,9 @@ Core actions:
 - `act` (UI actions: click/type/press/hover/drag/select/fill/resize/wait/evaluate)
 - `navigate`, `console`, `pdf`, `upload`, `dialog`
 
-Profile management:
-- `profiles` — list all browser profiles with status
-- `create-profile` — create new profile with auto-allocated port (or `cdpUrl`)
-- `delete-profile` — stop browser, delete user data, remove from config (local only)
-- `reset-profile` — kill orphan process on profile's port (local only)
-
-Common parameters:
-- `controlUrl` (defaults from config)
-- `profile` (optional; defaults to `browser.defaultProfile`)
 Notes:
 - Requires `browser.enabled=true` in `~/.clawdis/clawdis.json`.
 - Uses `browser.controlUrl` unless `controlUrl` is passed explicitly.
-- All actions accept optional `profile` parameter for multi-instance support.
-- When `profile` is omitted, uses `browser.defaultProfile` (defaults to "clawd").
-- Profile names: lowercase alphanumeric + hyphens only (max 64 chars).
-- Port range: 18800-18899 (~100 profiles max).
-- Remote profiles are attach-only (no start/stop/reset).
 - `snapshot` defaults to `ai`; use `aria` for the accessibility tree.
 - `act` requires `ref` from `snapshot --format ai`; use `evaluate` for rare CSS selector needs.
 - Avoid `act` → `wait` by default; use it only in exceptional cases (no reliable UI state to wait on).
@@ -93,13 +78,11 @@ Core actions:
 - `pending`, `approve`, `reject` (pairing)
 - `notify` (macOS `system.notify`)
 - `camera_snap`, `camera_clip`, `screen_record`
-- `location_get`
 
 Notes:
 - Camera/screen commands require the node app to be foregrounded.
 - Images return image blocks + `MEDIA:<path>`.
 - Videos return `FILE:<path>` (mp4).
-- Location returns a JSON payload (lat/lon/accuracy/timestamp).
 
 ### `cron`
 Manage Gateway cron jobs and wakeups.
@@ -122,21 +105,6 @@ Core actions:
 Notes:
 - Use `delayMs` (defaults to 2000) to avoid interrupting an in-flight reply.
 
-### `sessions_list` / `sessions_history` / `sessions_send`
-List sessions, inspect transcript history, or send to another session.
-
-Core parameters:
-- `sessions_list`: `kinds?`, `limit?`, `activeMinutes?`, `messageLimit?` (0 = none)
-- `sessions_history`: `sessionKey`, `limit?`, `includeTools?`
-- `sessions_send`: `sessionKey`, `message`, `timeoutSeconds?` (0 = fire-and-forget)
-
-Notes:
-- `main` is the canonical direct-chat key; global/unknown are hidden.
-- `messageLimit > 0` fetches last N messages per session (tool messages filtered).
-- `sessions_send` waits for final completion when `timeoutSeconds > 0`.
-- `sessions_send` runs a reply‑back ping‑pong (reply `REPLY_SKIP` to stop; max turns via `session.agentToAgent.maxPingPongTurns`, 0–5).
-- After the ping‑pong, the target agent runs an **announce step**; reply `ANNOUNCE_SKIP` to suppress the announcement.
-
 ### `discord`
 Send Discord reactions, stickers, or polls.
 

docs/tui.md

@@ -28,7 +28,7 @@ Use SSH tunneling or Tailscale to reach the Gateway WS.
 - `--url <url>`: Gateway WebSocket URL (defaults to config `gateway.remote.url` or `ws://127.0.0.1:18789`).
 - `--token <token>`: Gateway token (if required).
 - `--password <password>`: Gateway password (if required).
-- `--session <key>`: Session key (default: `main`, or `global` when scope is global).
+- `--session <key>`: Session key (default: `session.mainKey` or `main`).
 - `--deliver`: Deliver assistant replies to the provider (default off).
 - `--thinking <level>`: Override thinking level for sends.
 - `--timeout-ms <ms>`: Agent timeout in ms (default 30000).
@@ -51,7 +51,6 @@ Use SSH tunneling or Tailscale to reach the Gateway WS.
 - `/model <provider/model>` (or `/models`)
 - `/think <off|minimal|low|medium|high>`
 - `/verbose <on|off>`
-- `/elevated <on|off>`
 - `/activation <mention|always>`
 - `/deliver <on|off>`
 - `/new` or `/reset`

docs/web.md

@@ -8,12 +8,10 @@ read_when:
 
 The Gateway serves a small **browser Control UI** (Vite + Lit) from the same port as the Gateway WebSocket:
 
-- default: `http://<host>:18789/`
-- optional prefix: set `gateway.controlUi.basePath` (e.g. `/clawdis`)
+- `http://<host>:18789/ui/`
 
 The UI talks directly to the Gateway WS and supports:
 - Chat (`chat.history`, `chat.send`, `chat.abort`)
-- Chat tool cards (agent tool events)
 - Connections (provider status, WhatsApp QR, Telegram config)
 - Instances (`system-presence`)
 - Sessions (`sessions.list`, `sessions.patch`)
@@ -36,7 +34,7 @@ You can control it via config:
 ```json5
 {
   gateway: {
-    controlUi: { enabled: true, basePath: "/clawdis" } // basePath optional
+    controlUi: { enabled: true } // set false to disable /ui/
   }
 }
 ```
@@ -63,7 +61,7 @@ clawdis gateway
 ```
 
 Open:
-- `https://<magicdns>/` (or your configured `gateway.controlUi.basePath`)
+- `https://<magicdns>/ui/`
 
 ### Tailnet bind + token (legacy)
 
@@ -84,7 +82,7 @@ clawdis gateway
 ```
 
 Open:
-- `http://<tailscale-ip>:18789/` (or your configured `gateway.controlUi.basePath`)
+- `http://<tailscale-ip>:18789/ui/`
 
 ### Public internet (Funnel)
 

docs/whatsapp.md

@@ -92,9 +92,6 @@ WhatsApp requires a real mobile number for verification. VoIP and virtual number
   - Audio sent as PTT; `audio/ogg` => `audio/ogg; codecs=opus`.
   - Caption only on first media item.
   - Media fetch supports HTTP(S) and local paths.
-  - Animated GIFs: WhatsApp expects MP4 with `gifPlayback: true` for inline looping.
-    - CLI: `clawdis send --media <mp4> --gif-playback`
-    - Gateway: `send` params include `gifPlayback: true`
 
 ## Media limits + optimization
 - Default cap: 5 MB (per media item).
@@ -126,7 +123,7 @@ WhatsApp requires a real mobile number for verification. VoIP and virtual number
 - `agent.heartbeat.model` (optional override)
 - `agent.heartbeat.target`
 - `agent.heartbeat.to`
-- `session.*` (scope, idle, store; `mainKey` is ignored)
+- `session.*` (scope, idle, store, mainKey)
 - `web.enabled` (disable provider startup when false)
 - `web.heartbeatSeconds`
 - `web.reconnect.*`