docs: update changelog for gog skill

CHANGELOG.md

@@ -2,53 +2,11 @@
 
 ## Unreleased
 
-### 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`).
-
-### 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.
-
 ### Fixes
-- Auto-reply: drop final payloads when block streaming to avoid duplicate Discord sends.
 - 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.
-- Agent: add soft block-stream chunking (800–1200 chars default) with paragraph/newline preference.
-- 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.
-- 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.
-- Onboarding: fix Control UI basePath usage when showing/opening gateway URLs.
-- 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).
-- 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.
 
 ### 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: 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.
 
 ## 2.0.0-beta5 — 2026-01-03
 
@@ -110,7 +68,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.
@@ -262,7 +219,7 @@
 - Hook mappings + Gmail Pub/Sub helper (`clawdis hooks gmail setup/run`) with auto-renew + Tailscale Funnel support.
 - Command queue modes + per-session overrides (`/queue ...`) and new `agent.maxConcurrent` cap for safe parallelism across sessions.
 - Background bash tasks: `bash` auto-yields after 20s (or on demand) with a `process` tool to list/poll/log/write/kill sessions.
-- Gateway in-process restart: `gateway` tool action triggers a SIGUSR1 restart without needing a supervisor.
+- Gateway in-process restart: `clawdis_gateway` tool action triggers a SIGUSR1 restart without needing a supervisor.
 
 ### Breaking
 - Config refactor: `inbound.*` removed; use top-level `routing` (allowlists + group rules + transcription), `messages` (prefixes/timestamps), and `session` (scoping/store/mainKey). No legacy keys read.

README.md

@@ -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.

Swabble/Package.resolved

@@ -1,15 +1,6 @@
 {
-  "originHash" : "5d29ee82825e0764775562242cfa1ff4dc79584797dd638f76c9876545454748",
+  "originHash" : "2012d083159d375d07febbc184c592c569d7ab48247045e35a762e3269d4cadc",
   "pins" : [
-    {
-      "identity" : "elevenlabskit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/steipete/ElevenLabsKit",
-      "state" : {
-        "revision" : "c8679fbd37416a8780fe43be88a497ff16209e2d",
-        "version" : "0.1.0"
-      }
-    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",

apps/android/app/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-  namespace = "com.clawdis.android"
+  namespace = "com.steipete.clawdis.node"
   compileSdk = 36
 
   sourceSets {
@@ -16,7 +16,7 @@ android {
   }
 
   defaultConfig {
-    applicationId = "com.clawdis.android"
+    applicationId = "com.steipete.clawdis.node"
     minSdk = 31
     targetSdk = 36
     versionCode = 1

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

@@ -1,197 +0,0 @@
-{
-  "version": 1,
-  "fallback": {
-    "emoji": "🧩",
-    "detailKeys": [
-      "command",
-      "path",
-      "url",
-      "targetUrl",
-      "targetId",
-      "ref",
-      "element",
-      "node",
-      "nodeId",
-      "jobId",
-      "requestId",
-      "to",
-      "channelId",
-      "guildId",
-      "userId",
-      "name",
-      "query",
-      "pattern",
-      "messageId"
-    ]
-  },
-  "tools": {
-    "bash": {
-      "emoji": "🛠️",
-      "title": "Bash",
-      "detailKeys": ["command"]
-    },
-    "process": {
-      "emoji": "🧰",
-      "title": "Process",
-      "detailKeys": ["sessionId"]
-    },
-    "read": {
-      "emoji": "📖",
-      "title": "Read",
-      "detailKeys": ["path"]
-    },
-    "write": {
-      "emoji": "✍️",
-      "title": "Write",
-      "detailKeys": ["path"]
-    },
-    "edit": {
-      "emoji": "📝",
-      "title": "Edit",
-      "detailKeys": ["path"]
-    },
-    "attach": {
-      "emoji": "📎",
-      "title": "Attach",
-      "detailKeys": ["path", "url", "fileName"]
-    },
-    "browser": {
-      "emoji": "🌐",
-      "title": "Browser",
-      "actions": {
-        "status": { "label": "status" },
-        "start": { "label": "start" },
-        "stop": { "label": "stop" },
-        "tabs": { "label": "tabs" },
-        "open": { "label": "open", "detailKeys": ["targetUrl"] },
-        "focus": { "label": "focus", "detailKeys": ["targetId"] },
-        "close": { "label": "close", "detailKeys": ["targetId"] },
-        "snapshot": {
-          "label": "snapshot",
-          "detailKeys": ["targetUrl", "targetId", "ref", "element", "format"]
-        },
-        "screenshot": {
-          "label": "screenshot",
-          "detailKeys": ["targetUrl", "targetId", "ref", "element"]
-        },
-        "navigate": {
-          "label": "navigate",
-          "detailKeys": ["targetUrl", "targetId"]
-        },
-        "console": { "label": "console", "detailKeys": ["level", "targetId"] },
-        "pdf": { "label": "pdf", "detailKeys": ["targetId"] },
-        "upload": {
-          "label": "upload",
-          "detailKeys": ["paths", "ref", "inputRef", "element", "targetId"]
-        },
-        "dialog": {
-          "label": "dialog",
-          "detailKeys": ["accept", "promptText", "targetId"]
-        },
-        "act": {
-          "label": "act",
-          "detailKeys": ["request.kind", "request.ref", "request.selector", "request.text", "request.value"]
-        }
-      }
-    },
-    "canvas": {
-      "emoji": "🖼️",
-      "title": "Canvas",
-      "actions": {
-        "present": { "label": "present", "detailKeys": ["target", "node", "nodeId"] },
-        "hide": { "label": "hide", "detailKeys": ["node", "nodeId"] },
-        "navigate": { "label": "navigate", "detailKeys": ["url", "node", "nodeId"] },
-        "eval": { "label": "eval", "detailKeys": ["javaScript", "node", "nodeId"] },
-        "snapshot": { "label": "snapshot", "detailKeys": ["format", "node", "nodeId"] },
-        "a2ui_push": { "label": "A2UI push", "detailKeys": ["jsonlPath", "node", "nodeId"] },
-        "a2ui_reset": { "label": "A2UI reset", "detailKeys": ["node", "nodeId"] }
-      }
-    },
-    "nodes": {
-      "emoji": "📱",
-      "title": "Nodes",
-      "actions": {
-        "status": { "label": "status" },
-        "describe": { "label": "describe", "detailKeys": ["node", "nodeId"] },
-        "pending": { "label": "pending" },
-        "approve": { "label": "approve", "detailKeys": ["requestId"] },
-        "reject": { "label": "reject", "detailKeys": ["requestId"] },
-        "notify": { "label": "notify", "detailKeys": ["node", "nodeId", "title", "body"] },
-        "camera_snap": { "label": "camera snap", "detailKeys": ["node", "nodeId", "facing", "deviceId"] },
-        "camera_list": { "label": "camera list", "detailKeys": ["node", "nodeId"] },
-        "camera_clip": { "label": "camera clip", "detailKeys": ["node", "nodeId", "facing", "duration", "durationMs"] },
-        "screen_record": {
-          "label": "screen record",
-          "detailKeys": ["node", "nodeId", "duration", "durationMs", "fps", "screenIndex"]
-        }
-      }
-    },
-    "cron": {
-      "emoji": "⏰",
-      "title": "Cron",
-      "actions": {
-        "status": { "label": "status" },
-        "list": { "label": "list" },
-        "add": {
-          "label": "add",
-          "detailKeys": ["job.name", "job.id", "job.schedule", "job.cron"]
-        },
-        "update": { "label": "update", "detailKeys": ["jobId"] },
-        "remove": { "label": "remove", "detailKeys": ["jobId"] },
-        "run": { "label": "run", "detailKeys": ["jobId"] },
-        "runs": { "label": "runs", "detailKeys": ["jobId"] },
-        "wake": { "label": "wake", "detailKeys": ["text", "mode"] }
-      }
-    },
-    "gateway": {
-      "emoji": "🔌",
-      "title": "Gateway",
-      "actions": {
-        "restart": { "label": "restart", "detailKeys": ["reason", "delayMs"] }
-      }
-    },
-    "whatsapp_login": {
-      "emoji": "🟢",
-      "title": "WhatsApp Login",
-      "actions": {
-        "start": { "label": "start" },
-        "wait": { "label": "wait" }
-      }
-    },
-    "discord": {
-      "emoji": "💬",
-      "title": "Discord",
-      "actions": {
-        "react": { "label": "react", "detailKeys": ["channelId", "messageId", "emoji"] },
-        "reactions": { "label": "reactions", "detailKeys": ["channelId", "messageId"] },
-        "sticker": { "label": "sticker", "detailKeys": ["to", "stickerIds"] },
-        "poll": { "label": "poll", "detailKeys": ["question", "to"] },
-        "permissions": { "label": "permissions", "detailKeys": ["channelId"] },
-        "readMessages": { "label": "read messages", "detailKeys": ["channelId", "limit"] },
-        "sendMessage": { "label": "send", "detailKeys": ["to", "content"] },
-        "editMessage": { "label": "edit", "detailKeys": ["channelId", "messageId"] },
-        "deleteMessage": { "label": "delete", "detailKeys": ["channelId", "messageId"] },
-        "threadCreate": { "label": "thread create", "detailKeys": ["channelId", "name"] },
-        "threadList": { "label": "thread list", "detailKeys": ["guildId", "channelId"] },
-        "threadReply": { "label": "thread reply", "detailKeys": ["channelId", "content"] },
-        "pinMessage": { "label": "pin", "detailKeys": ["channelId", "messageId"] },
-        "unpinMessage": { "label": "unpin", "detailKeys": ["channelId", "messageId"] },
-        "listPins": { "label": "list pins", "detailKeys": ["channelId"] },
-        "searchMessages": { "label": "search", "detailKeys": ["guildId", "content"] },
-        "memberInfo": { "label": "member", "detailKeys": ["guildId", "userId"] },
-        "roleInfo": { "label": "roles", "detailKeys": ["guildId"] },
-        "emojiList": { "label": "emoji list", "detailKeys": ["guildId"] },
-        "roleAdd": { "label": "role add", "detailKeys": ["guildId", "userId", "roleId"] },
-        "roleRemove": { "label": "role remove", "detailKeys": ["guildId", "userId", "roleId"] },
-        "channelInfo": { "label": "channel", "detailKeys": ["channelId"] },
-        "channelList": { "label": "channels", "detailKeys": ["guildId"] },
-        "voiceStatus": { "label": "voice", "detailKeys": ["guildId", "userId"] },
-        "eventList": { "label": "events", "detailKeys": ["guildId"] },
-        "eventCreate": { "label": "event create", "detailKeys": ["guildId", "name"] },
-        "timeout": { "label": "timeout", "detailKeys": ["guildId", "userId"] },
-        "kick": { "label": "kick", "detailKeys": ["guildId", "userId"] },
-        "ban": { "label": "ban", "detailKeys": ["guildId", "userId"] }
-      }
-    }
-  }
-}

apps/android/app/src/main/java/com/clawdis/android/tools/ToolDisplay.kt

@@ -1,222 +0,0 @@
-package com.clawdis.android.tools
-
-import android.content.Context
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.contentOrNull
-
-@Serializable
-private data class ToolDisplayActionSpec(
-  val label: String? = null,
-  val detailKeys: List<String>? = null,
-)
-
-@Serializable
-private data class ToolDisplaySpec(
-  val emoji: String? = null,
-  val title: String? = null,
-  val label: String? = null,
-  val detailKeys: List<String>? = null,
-  val actions: Map<String, ToolDisplayActionSpec>? = null,
-)
-
-@Serializable
-private data class ToolDisplayConfig(
-  val version: Int? = null,
-  val fallback: ToolDisplaySpec? = null,
-  val tools: Map<String, ToolDisplaySpec>? = null,
-)
-
-data class ToolDisplaySummary(
-  val name: String,
-  val emoji: String,
-  val title: String,
-  val label: String,
-  val verb: String?,
-  val detail: String?,
-) {
-  val detailLine: String?
-    get() {
-      val parts = mutableListOf<String>()
-      if (!verb.isNullOrBlank()) parts.add(verb)
-      if (!detail.isNullOrBlank()) parts.add(detail)
-      return if (parts.isEmpty()) null else parts.joinToString(" · ")
-    }
-
-  val summaryLine: String
-    get() = if (detailLine != null) "${emoji} ${label}: ${detailLine}" else "${emoji} ${label}"
-}
-
-object ToolDisplayRegistry {
-  private const val CONFIG_ASSET = "tool-display.json"
-
-  private val json = Json { ignoreUnknownKeys = true }
-  @Volatile private var cachedConfig: ToolDisplayConfig? = null
-
-  fun resolve(
-    context: Context,
-    name: String?,
-    args: JsonObject?,
-    meta: String? = null,
-  ): ToolDisplaySummary {
-    val trimmedName = name?.trim().orEmpty().ifEmpty { "tool" }
-    val key = trimmedName.lowercase()
-    val config = loadConfig(context)
-    val spec = config.tools?.get(key)
-    val fallback = config.fallback
-
-    val emoji = spec?.emoji ?: fallback?.emoji ?: "🧩"
-    val title = spec?.title ?: titleFromName(trimmedName)
-    val label = spec?.label ?: trimmedName
-
-    val actionRaw = args?.get("action")?.asStringOrNull()?.trim()
-    val action = actionRaw?.takeIf { it.isNotEmpty() }
-    val actionSpec = action?.let { spec?.actions?.get(it) }
-    val verb = normalizeVerb(actionSpec?.label ?: action)
-
-    var detail: String? = null
-    if (key == "read") {
-      detail = readDetail(args)
-    } else if (key == "write" || key == "edit" || key == "attach") {
-      detail = pathDetail(args)
-    }
-
-    val detailKeys = actionSpec?.detailKeys ?: spec?.detailKeys ?: fallback?.detailKeys ?: emptyList()
-    if (detail == null) {
-      detail = firstValue(args, detailKeys)
-    }
-
-    if (detail == null) {
-      detail = meta
-    }
-
-    if (detail != null) {
-      detail = shortenHomeInString(detail)
-    }
-
-    return ToolDisplaySummary(
-      name = trimmedName,
-      emoji = emoji,
-      title = title,
-      label = label,
-      verb = verb,
-      detail = detail,
-    )
-  }
-
-  private fun loadConfig(context: Context): ToolDisplayConfig {
-    val existing = cachedConfig
-    if (existing != null) return existing
-    return try {
-      val jsonString = context.assets.open(CONFIG_ASSET).bufferedReader().use { it.readText() }
-      val decoded = json.decodeFromString(ToolDisplayConfig.serializer(), jsonString)
-      cachedConfig = decoded
-      decoded
-    } catch (_: Throwable) {
-      val fallback = ToolDisplayConfig()
-      cachedConfig = fallback
-      fallback
-    }
-  }
-
-  private fun titleFromName(name: String): String {
-    val cleaned = name.replace("_", " ").trim()
-    if (cleaned.isEmpty()) return "Tool"
-    return cleaned
-      .split(Regex("\\s+"))
-      .joinToString(" ") { part ->
-        val upper = part.uppercase()
-        if (part.length <= 2 && part == upper) part
-        else upper.firstOrNull()?.toString().orEmpty() + part.lowercase().drop(1)
-      }
-  }
-
-  private fun normalizeVerb(value: String?): String? {
-    val trimmed = value?.trim().orEmpty()
-    if (trimmed.isEmpty()) return null
-    return trimmed.replace("_", " ")
-  }
-
-  private fun readDetail(args: JsonObject?): String? {
-    val path = args?.get("path")?.asStringOrNull() ?: return null
-    val offset = args["offset"].asNumberOrNull()
-    val limit = args["limit"].asNumberOrNull()
-    return if (offset != null && limit != null) {
-      val end = offset + limit
-      "${path}:${offset.toInt()}-${end.toInt()}"
-    } else {
-      path
-    }
-  }
-
-  private fun pathDetail(args: JsonObject?): String? {
-    return args?.get("path")?.asStringOrNull()
-  }
-
-  private fun firstValue(args: JsonObject?, keys: List<String>): String? {
-    for (key in keys) {
-      val value = valueForPath(args, key)
-      val rendered = renderValue(value)
-      if (!rendered.isNullOrBlank()) return rendered
-    }
-    return null
-  }
-
-  private fun valueForPath(args: JsonObject?, path: String): JsonElement? {
-    var current: JsonElement? = args
-    for (segment in path.split(".")) {
-      if (segment.isBlank()) return null
-      val obj = current as? JsonObject ?: return null
-      current = obj[segment]
-    }
-    return current
-  }
-
-  private fun renderValue(value: JsonElement?): String? {
-    if (value == null) return null
-    if (value is JsonPrimitive) {
-      if (value.isString) {
-        val trimmed = value.contentOrNull?.trim().orEmpty()
-        if (trimmed.isEmpty()) return null
-        val firstLine = trimmed.lineSequence().firstOrNull()?.trim().orEmpty()
-        if (firstLine.isEmpty()) return null
-        return if (firstLine.length > 160) "${firstLine.take(157)}…" else firstLine
-      }
-      val raw = value.contentOrNull?.trim().orEmpty()
-      raw.toBooleanStrictOrNull()?.let { return it.toString() }
-      raw.toLongOrNull()?.let { return it.toString() }
-      raw.toDoubleOrNull()?.let { return it.toString() }
-    }
-    if (value is JsonArray) {
-      val items = value.mapNotNull { renderValue(it) }
-      if (items.isEmpty()) return null
-      val preview = items.take(3).joinToString(", ")
-      return if (items.size > 3) "${preview}…" else preview
-    }
-    return null
-  }
-
-  private fun shortenHomeInString(value: String): String {
-    val home = System.getProperty("user.home")?.takeIf { it.isNotBlank() }
-      ?: System.getenv("HOME")?.takeIf { it.isNotBlank() }
-    if (home.isNullOrEmpty()) return value
-    return value.replace(home, "~")
-      .replace(Regex("/Users/[^/]+"), "~")
-      .replace(Regex("/home/[^/]+"), "~")
-  }
-
-  private fun JsonElement?.asStringOrNull(): String? {
-    val primitive = this as? JsonPrimitive ?: return null
-    return if (primitive.isString) primitive.contentOrNull else primitive.toString()
-  }
-
-  private fun JsonElement?.asNumberOrNull(): Double? {
-    val primitive = this as? JsonPrimitive ?: return null
-    val raw = primitive.contentOrNull ?: return null
-    return raw.toDoubleOrNull()
-  }
-}

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 enum class CameraHudKind {
   Photo,

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.content.Context
 import android.os.Build

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.Manifest
 import android.content.pm.ApplicationInfo
@@ -18,8 +18,8 @@ import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import com.clawdis.android.ui.RootScreen
+import com.steipete.clawdis.node.ui.RootScreen
-import com.clawdis.android.ui.ClawdisTheme
+import com.steipete.clawdis.node.ui.ClawdisTheme
 import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {

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

@@ -1,12 +1,12 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
-import com.clawdis.android.bridge.BridgeEndpoint
+import com.steipete.clawdis.node.bridge.BridgeEndpoint
-import com.clawdis.android.chat.OutgoingAttachment
+import com.steipete.clawdis.node.chat.OutgoingAttachment
-import com.clawdis.android.node.CameraCaptureManager
+import com.steipete.clawdis.node.node.CameraCaptureManager
-import com.clawdis.android.node.CanvasController
+import com.steipete.clawdis.node.node.CanvasController
-import com.clawdis.android.node.ScreenRecordManager
+import com.steipete.clawdis.node.node.ScreenRecordManager
 import kotlinx.coroutines.flow.StateFlow
 
 class MainViewModel(app: Application) : AndroidViewModel(app) {

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.app.Application
 

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -146,7 +146,7 @@ class NodeForegroundService : Service() {
     private const val CHANNEL_ID = "connection"
     private const val NOTIFICATION_ID = 1
 
-    private const val ACTION_STOP = "com.clawdis.android.action.STOP"
+    private const val ACTION_STOP = "com.steipete.clawdis.node.action.STOP"
 
     fun start(context: Context) {
       val intent = Intent(context, NodeForegroundService::class.java)

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.Manifest
 import android.content.Context
@@ -6,27 +6,27 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.os.SystemClock
 import androidx.core.content.ContextCompat
-import com.clawdis.android.chat.ChatController
+import com.steipete.clawdis.node.chat.ChatController
-import com.clawdis.android.chat.ChatMessage
+import com.steipete.clawdis.node.chat.ChatMessage
-import com.clawdis.android.chat.ChatPendingToolCall
+import com.steipete.clawdis.node.chat.ChatPendingToolCall
-import com.clawdis.android.chat.ChatSessionEntry
+import com.steipete.clawdis.node.chat.ChatSessionEntry
-import com.clawdis.android.chat.OutgoingAttachment
+import com.steipete.clawdis.node.chat.OutgoingAttachment
-import com.clawdis.android.bridge.BridgeDiscovery
+import com.steipete.clawdis.node.bridge.BridgeDiscovery
-import com.clawdis.android.bridge.BridgeEndpoint
+import com.steipete.clawdis.node.bridge.BridgeEndpoint
-import com.clawdis.android.bridge.BridgePairingClient
+import com.steipete.clawdis.node.bridge.BridgePairingClient
-import com.clawdis.android.bridge.BridgeSession
+import com.steipete.clawdis.node.bridge.BridgeSession
-import com.clawdis.android.node.CameraCaptureManager
+import com.steipete.clawdis.node.node.CameraCaptureManager
-import com.clawdis.android.BuildConfig
+import com.steipete.clawdis.node.BuildConfig
-import com.clawdis.android.node.CanvasController
+import com.steipete.clawdis.node.node.CanvasController
-import com.clawdis.android.node.ScreenRecordManager
+import com.steipete.clawdis.node.node.ScreenRecordManager
-import com.clawdis.android.protocol.ClawdisCapability
+import com.steipete.clawdis.node.protocol.ClawdisCapability
-import com.clawdis.android.protocol.ClawdisCameraCommand
+import com.steipete.clawdis.node.protocol.ClawdisCameraCommand
-import com.clawdis.android.protocol.ClawdisCanvasA2UIAction
+import com.steipete.clawdis.node.protocol.ClawdisCanvasA2UIAction
-import com.clawdis.android.protocol.ClawdisCanvasA2UICommand
+import com.steipete.clawdis.node.protocol.ClawdisCanvasA2UICommand
-import com.clawdis.android.protocol.ClawdisCanvasCommand
+import com.steipete.clawdis.node.protocol.ClawdisCanvasCommand
-import com.clawdis.android.protocol.ClawdisScreenCommand
+import com.steipete.clawdis.node.protocol.ClawdisScreenCommand
-import com.clawdis.android.voice.TalkModeManager
+import com.steipete.clawdis.node.voice.TalkModeManager
-import com.clawdis.android.voice.VoiceWakeManager
+import com.steipete.clawdis.node.voice.VoiceWakeManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.content.pm.PackageManager
 import android.content.Intent

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.app.Activity
 import android.content.Context

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

@@ -1,6 +1,6 @@
 @file:Suppress("DEPRECATION")
 
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import android.content.Context
 import androidx.core.content.edit

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 enum class VoiceWakeMode(val rawValue: String) {
   Off("off"),

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 object WakeWords {
   const val maxWords: Int = 32

apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BonjourEscapes.kt

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

apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeDiscovery.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 import android.content.Context
 import android.net.ConnectivityManager

apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeEndpoint.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 data class BridgeEndpoint(
   val stableId: String,

apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgePairingClient.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
@@ -11,7 +11,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import com.clawdis.android.BuildConfig
+import com.steipete.clawdis.node.BuildConfig
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject

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

@@ -1,6 +1,6 @@
-package com.clawdis.android.chat
+package com.steipete.clawdis.node.chat
 
-import com.clawdis.android.bridge.BridgeSession
+import com.steipete.clawdis.node.bridge.BridgeSession
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
@@ -361,12 +361,10 @@ class ChatController(
 
         val ts = payload["ts"].asLongOrNull() ?: System.currentTimeMillis()
         if (phase == "start") {
-          val args = data?.get("args").asObjectOrNull()
           pendingToolCallsById[toolCallId] =
             ChatPendingToolCall(
               toolCallId = toolCallId,
               name = name,
-              args = args,
               startedAtMs = ts,
               isError = null,
             )

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.chat
+package com.steipete.clawdis.node.chat
 
 data class ChatMessage(
   val id: String,
@@ -18,7 +18,6 @@ data class ChatMessageContent(
 data class ChatPendingToolCall(
   val toolCallId: String,
   val name: String,
-  val args: kotlinx.serialization.json.JsonObject? = null,
   val startedAtMs: Long,
   val isError: Boolean? = null,
 )

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.node
+package com.steipete.clawdis.node.node
 
 import android.Manifest
 import android.content.Context
@@ -20,7 +20,7 @@ import androidx.camera.video.VideoRecordEvent
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.checkSelfPermission
 import androidx.core.graphics.scale
-import com.clawdis.android.PermissionRequester
+import com.steipete.clawdis.node.PermissionRequester
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeout

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.node
+package com.steipete.clawdis.node.node
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -17,7 +17,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
-import com.clawdis.android.BuildConfig
+import com.steipete.clawdis.node.BuildConfig
 import kotlin.coroutines.resume
 
 class CanvasController {

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.node
+package com.steipete.clawdis.node.node
 
 import kotlin.math.max
 import kotlin.math.min

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

@@ -1,11 +1,11 @@
-package com.clawdis.android.node
+package com.steipete.clawdis.node.node
 
 import android.content.Context
 import android.hardware.display.DisplayManager
 import android.media.MediaRecorder
 import android.media.projection.MediaProjectionManager
 import android.util.Base64
-import com.clawdis.android.ScreenCaptureRequester
+import com.steipete.clawdis.node.ScreenCaptureRequester
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
@@ -16,13 +16,13 @@ class ScreenRecordManager(private val context: Context) {
   data class Payload(val payloadJson: String)
 
   @Volatile private var screenCaptureRequester: ScreenCaptureRequester? = null
-  @Volatile private var permissionRequester: com.clawdis.android.PermissionRequester? = null
+  @Volatile private var permissionRequester: com.steipete.clawdis.node.PermissionRequester? = null
 
   fun attachScreenCaptureRequester(requester: ScreenCaptureRequester) {
     screenCaptureRequester = requester
   }
 
-  fun attachPermissionRequester(requester: com.clawdis.android.PermissionRequester) {
+  fun attachPermissionRequester(requester: com.steipete.clawdis.node.PermissionRequester) {
     permissionRequester = requester
   }
 

apps/android/app/src/main/java/com/steipete/clawdis/node/protocol/ClawdisCanvasA2UIAction.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.protocol
+package com.steipete.clawdis.node.protocol
 
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.protocol
+package com.steipete.clawdis.node.protocol
 
 enum class ClawdisCapability(val rawValue: String) {
   Canvas("canvas"),

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui
+package com.steipete.clawdis.node.ui
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

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

@@ -1,8 +1,8 @@
-package com.clawdis.android.ui
+package com.steipete.clawdis.node.ui
 
 import androidx.compose.runtime.Composable
-import com.clawdis.android.MainViewModel
+import com.steipete.clawdis.node.MainViewModel
-import com.clawdis.android.ui.chat.ChatSheetContent
+import com.steipete.clawdis.node.ui.chat.ChatSheetContent
 
 @Composable
 fun ChatSheet(viewModel: MainViewModel) {

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui
+package com.steipete.clawdis.node.ui
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui
+package com.steipete.clawdis.node.ui
 
 import android.annotation.SuppressLint
 import android.Manifest
@@ -65,8 +65,8 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties
 import androidx.core.content.ContextCompat
-import com.clawdis.android.CameraHudKind
+import com.steipete.clawdis.node.CameraHudKind
-import com.clawdis.android.MainViewModel
+import com.steipete.clawdis.node.MainViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui
+package com.steipete.clawdis.node.ui
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -47,10 +47,10 @@ 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.steipete.clawdis.node.BuildConfig
-import com.clawdis.android.MainViewModel
+import com.steipete.clawdis.node.MainViewModel
-import com.clawdis.android.NodeForegroundService
+import com.steipete.clawdis.node.NodeForegroundService
-import com.clawdis.android.VoiceWakeMode
+import com.steipete.clawdis.node.VoiceWakeMode
 
 @Composable
 fun SettingsSheet(viewModel: MainViewModel) {
@@ -381,7 +381,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
       Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
         Button(
           onClick = {
-            val parsed = com.clawdis.android.WakeWords.parseCommaSeparated(wakeWordsText)
+            val parsed = com.steipete.clawdis.node.WakeWords.parseCommaSeparated(wakeWordsText)
             viewModel.setWakeWords(parsed)
           },
           enabled = isConnected,

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui
+package com.steipete.clawdis.node.ui
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui
+package com.steipete.clawdis.node.ui
 
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.RepeatMode

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -38,7 +38,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.clawdis.android.chat.ChatSessionEntry
+import com.steipete.clawdis.node.chat.ChatSessionEntry
 
 @Composable
 fun ChatComposer(

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
 import android.graphics.BitmapFactory
 import android.util.Base64

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -20,8 +20,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.unit.dp
-import com.clawdis.android.chat.ChatMessage
+import com.steipete.clawdis.node.chat.ChatMessage
-import com.clawdis.android.chat.ChatPendingToolCall
+import com.steipete.clawdis.node.chat.ChatPendingToolCall
 
 @Composable
 fun ChatMessageListCard(

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
 import android.graphics.BitmapFactory
 import android.util.Base64
@@ -31,13 +31,11 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import androidx.compose.foundation.Image
-import com.clawdis.android.chat.ChatMessage
+import com.steipete.clawdis.node.chat.ChatMessage
-import com.clawdis.android.chat.ChatMessageContent
+import com.steipete.clawdis.node.chat.ChatMessageContent
-import com.clawdis.android.chat.ChatPendingToolCall
+import com.steipete.clawdis.node.chat.ChatPendingToolCall
-import com.clawdis.android.tools.ToolDisplayRegistry
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import androidx.compose.ui.platform.LocalContext
 
 @Composable
 fun ChatMessageBubble(message: ChatMessage) {
@@ -106,42 +104,18 @@ fun ChatTypingIndicatorBubble() {
 
 @Composable
 fun ChatPendingToolsBubble(toolCalls: List<ChatPendingToolCall>) {
-  val context = LocalContext.current
-  val displays =
-    remember(toolCalls, context) {
-      toolCalls.map { ToolDisplayRegistry.resolve(context, it.name, it.args) }
-    }
   Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Start) {
     Surface(
       shape = RoundedCornerShape(16.dp),
       color = MaterialTheme.colorScheme.surfaceContainer,
     ) {
       Column(modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
-        Text("Running tools…", style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.onSurface)
+        Text("Tools", style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.onSurface)
-        for (display in displays.take(6)) {
+        for (t in toolCalls.take(6)) {
-          Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+          Text("· ${t.name}", style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
-            Text(
-              "${display.emoji} ${display.label}",
-              style = MaterialTheme.typography.bodyMedium,
-              color = MaterialTheme.colorScheme.onSurfaceVariant,
-              fontFamily = FontFamily.Monospace,
-            )
-            display.detailLine?.let { detail ->
-              Text(
-                detail,
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                fontFamily = FontFamily.Monospace,
-              )
-            }
-          }
         }
         if (toolCalls.size > 6) {
-          Text(
+          Text("… +${toolCalls.size - 6} more", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-            "… +${toolCalls.size - 6} more",
-            style = MaterialTheme.typography.bodySmall,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-          )
         }
       }
     }

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.clawdis.android.chat.ChatSessionEntry
+import com.steipete.clawdis.node.chat.ChatSessionEntry
 
 @Composable
 fun ChatSessionsDialog(

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
 import android.content.ContentResolver
 import android.net.Uri
@@ -19,8 +19,8 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import com.clawdis.android.MainViewModel
+import com.steipete.clawdis.node.MainViewModel
-import com.clawdis.android.chat.OutgoingAttachment
+import com.steipete.clawdis.node.chat.OutgoingAttachment
 import java.io.ByteArrayOutputStream
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

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

@@ -1,6 +1,6 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
-import com.clawdis.android.chat.ChatSessionEntry
+import com.steipete.clawdis.node.chat.ChatSessionEntry
 
 private const val MAIN_SESSION_KEY = "main"
 private const val RECENT_WINDOW_MS = 24 * 60 * 60 * 1000L

apps/android/app/src/main/java/com/steipete/clawdis/node/voice/StreamingMediaDataSource.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.voice
+package com.steipete.clawdis.node.voice
 
 import android.media.MediaDataSource
 import kotlin.math.min

apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.voice
+package com.steipete.clawdis.node.voice
 
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement

apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.voice
+package com.steipete.clawdis.node.voice
 
 import android.Manifest
 import android.content.Context
@@ -20,7 +20,7 @@ import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
 import android.util.Log
 import androidx.core.content.ContextCompat
-import com.clawdis.android.bridge.BridgeSession
+import com.steipete.clawdis.node.bridge.BridgeSession
 import java.net.HttpURLConnection
 import java.net.URL
 import java.util.UUID

apps/android/app/src/main/java/com/steipete/clawdis/node/voice/VoiceWakeCommandExtractor.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.voice
+package com.steipete.clawdis.node.voice
 
 object VoiceWakeCommandExtractor {
   fun extractCommand(text: String, triggerWords: List<String>): String? {

apps/android/app/src/main/java/com/steipete/clawdis/node/voice/VoiceWakeManager.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.voice
+package com.steipete.clawdis.node.voice
 
 import android.content.Context
 import android.content.Intent

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

@@ -1,4 +1,4 @@
-package com.clawdis.android
+package com.steipete.clawdis.node
 
 import org.junit.Assert.assertEquals
 import org.junit.Test

apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BonjourEscapesTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 import org.junit.Assert.assertEquals
 import org.junit.Test

apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BridgeEndpointKotestTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe

apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BridgePairingClientTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async

apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BridgeSessionTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.bridge
+package com.steipete.clawdis.node.bridge
 
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.node
+package com.steipete.clawdis.node.node
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull

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

@@ -1,4 +1,4 @@
-package com.clawdis.android.node
+package com.steipete.clawdis.node.node
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue

apps/android/app/src/test/java/com/steipete/clawdis/node/protocol/ClawdisCanvasA2UIActionTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.protocol
+package com.steipete.clawdis.node.protocol
 
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject

apps/android/app/src/test/java/com/steipete/clawdis/node/protocol/ClawdisProtocolConstantsTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.protocol
+package com.steipete.clawdis.node.protocol
 
 import org.junit.Assert.assertEquals
 import org.junit.Test

apps/android/app/src/test/java/com/steipete/clawdis/node/ui/chat/SessionFiltersTest.kt

@@ -1,6 +1,6 @@
-package com.clawdis.android.ui.chat
+package com.steipete.clawdis.node.ui.chat
 
-import com.clawdis.android.chat.ChatSessionEntry
+import com.steipete.clawdis.node.chat.ChatSessionEntry
 import org.junit.Assert.assertEquals
 import org.junit.Test
 

apps/android/app/src/test/java/com/steipete/clawdis/node/voice/TalkDirectiveParserTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.voice
+package com.steipete.clawdis.node.voice
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull

apps/android/app/src/test/java/com/steipete/clawdis/node/voice/VoiceWakeCommandExtractorTest.kt

@@ -1,4 +1,4 @@
-package com.clawdis.android.voice
+package com.steipete.clawdis.node.voice
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull

apps/ios/Sources/Bridge/BridgeClient.swift

@@ -14,7 +14,7 @@ actor BridgeClient {
     {
         self.lineBuffer = Data()
         let connection = NWConnection(to: endpoint, using: .tcp)
-        let queue = DispatchQueue(label: "com.clawdis.ios.bridge-client")
+        let queue = DispatchQueue(label: "com.steipete.clawdis.ios.bridge-client")
         defer { connection.cancel() }
         try await self.withTimeout(seconds: 8, purpose: "connect") {
             try await self.startAndWaitForReady(connection, queue: queue)

apps/ios/Sources/Bridge/BridgeConnectionController.swift

@@ -99,7 +99,7 @@ final class BridgeConnectionController {
         guard !instanceId.isEmpty else { return }
 
         let token = KeychainStore.loadString(
-            service: "com.clawdis.bridge",
+            service: "com.steipete.clawdis.bridge",
             account: self.keychainAccount(instanceId: instanceId))?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         guard !token.isEmpty else { return }
@@ -189,7 +189,7 @@ final class BridgeConnectionController {
                 if !refreshed.isEmpty, refreshed != token {
                     _ = KeychainStore.saveString(
                         refreshed,
-                        service: "com.clawdis.bridge",
+                        service: "com.steipete.clawdis.bridge",
                         account: self.keychainAccount(instanceId: instanceId))
                 }
                 appModel.connectToBridge(endpoint: endpoint, hello: self.makeHello(token: resolvedToken))

apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift

@@ -102,7 +102,7 @@ final class BridgeDiscoveryModel {
             }
 
             self.browsers[domain] = browser
-            browser.start(queue: DispatchQueue(label: "com.clawdis.ios.bridge-discovery.\(domain)"))
+            browser.start(queue: DispatchQueue(label: "com.steipete.clawdis.ios.bridge-discovery.\(domain)"))
         }
     }
 

apps/ios/Sources/Bridge/BridgeSession.swift

@@ -78,7 +78,7 @@ actor BridgeSession {
         let params = NWParameters.tcp
         params.includePeerToPeer = true
         let connection = NWConnection(to: endpoint, using: params)
-        let queue = DispatchQueue(label: "com.clawdis.ios.bridge-session")
+        let queue = DispatchQueue(label: "com.steipete.clawdis.ios.bridge-session")
         self.connection = connection
         self.queue = queue
 

apps/ios/Sources/Bridge/BridgeSettingsStore.swift

@@ -1,8 +1,8 @@
 import Foundation
 
 enum BridgeSettingsStore {
-    private static let bridgeService = "com.clawdis.bridge"
+    private static let bridgeService = "com.steipete.clawdis.bridge"
-    private static let nodeService = "com.clawdis.node"
+    private static let nodeService = "com.steipete.clawdis.node"
 
     private static let instanceIdDefaultsKey = "node.instanceId"
     private static let preferredBridgeStableIDDefaultsKey = "bridge.preferredStableID"

apps/ios/Sources/Screen/ScreenRecordService.swift

@@ -68,7 +68,7 @@ final class ScreenRecordService: @unchecked Sendable {
         try? FileManager.default.removeItem(at: outURL)
 
         let state = CaptureState()
-        let recordQueue = DispatchQueue(label: "com.clawdis.screenrecord")
+        let recordQueue = DispatchQueue(label: "com.steipete.clawdis.screenrecord")
 
         try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
             let handler: @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void = { sample, type, error in

apps/ios/Sources/Settings/SettingsTab.swift

@@ -353,7 +353,7 @@ struct SettingsTab: View {
         do {
             let statusStore = self.connectStatus
             let existing = KeychainStore.loadString(
-                service: "com.clawdis.bridge",
+                service: "com.steipete.clawdis.bridge",
                 account: self.keychainAccount())
             let existingToken = (existing?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false) ?
                 existing :
@@ -381,7 +381,7 @@ struct SettingsTab: View {
             if !token.isEmpty, token != existingToken {
                 _ = KeychainStore.saveString(
                     token,
-                    service: "com.clawdis.bridge",
+                    service: "com.steipete.clawdis.bridge",
                     account: self.keychainAccount())
             }
 
@@ -427,7 +427,7 @@ struct SettingsTab: View {
         do {
             let statusStore = self.connectStatus
             let existing = KeychainStore.loadString(
-                service: "com.clawdis.bridge",
+                service: "com.steipete.clawdis.bridge",
                 account: self.keychainAccount())
             let existingToken = (existing?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false) ?
                 existing :
@@ -455,7 +455,7 @@ struct SettingsTab: View {
             if !token.isEmpty, token != existingToken {
                 _ = KeychainStore.saveString(
                     token,
-                    service: "com.clawdis.bridge",
+                    service: "com.steipete.clawdis.bridge",
                     account: self.keychainAccount())
             }
 

apps/ios/Sources/Voice/TalkModeManager.swift

@@ -47,7 +47,7 @@ final class TalkModeManager: NSObject {
 
     private var chatSubscribedSessionKeys = Set<String>()
 
-    private let logger = Logger(subsystem: "com.clawdis", category: "TalkMode")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "TalkMode")
 
     func attachBridge(_ bridge: BridgeSession) {
         self.bridge = bridge

apps/ios/Tests/BridgeClientTests.swift

@@ -6,7 +6,7 @@ import Testing
 
 @Suite struct BridgeClientTests {
     private final class LineServer: @unchecked Sendable {
-        private let queue = DispatchQueue(label: "com.clawdis.tests.bridge-client-server")
+        private let queue = DispatchQueue(label: "com.steipete.clawdis.tests.bridge-client-server")
         private let listener: NWListener
         private var connection: NWConnection?
         private var buffer = Data()

apps/ios/Tests/BridgeConnectionControllerTests.swift

@@ -10,8 +10,8 @@ private struct KeychainEntry: Hashable {
     let account: String
 }
 
-private let bridgeService = "com.clawdis.bridge"
+private let bridgeService = "com.steipete.clawdis.bridge"
-private let nodeService = "com.clawdis.node"
+private let nodeService = "com.steipete.clawdis.node"
 private let instanceIdEntry = KeychainEntry(service: nodeService, account: "instanceId")
 private let preferredBridgeEntry = KeychainEntry(service: bridgeService, account: "preferredStableID")
 private let lastBridgeEntry = KeychainEntry(service: bridgeService, account: "lastDiscoveredStableID")

apps/ios/Tests/BridgeSettingsStoreTests.swift

@@ -7,8 +7,8 @@ private struct KeychainEntry: Hashable {
     let account: String
 }
 
-private let bridgeService = "com.clawdis.bridge"
+private let bridgeService = "com.steipete.clawdis.bridge"
-private let nodeService = "com.clawdis.node"
+private let nodeService = "com.steipete.clawdis.node"
 private let instanceIdEntry = KeychainEntry(service: nodeService, account: "instanceId")
 private let preferredBridgeEntry = KeychainEntry(service: bridgeService, account: "preferredStableID")
 private let lastBridgeEntry = KeychainEntry(service: bridgeService, account: "lastDiscoveredStableID")

apps/ios/Tests/KeychainStoreTests.swift

@@ -4,7 +4,7 @@ import Testing
 
 @Suite struct KeychainStoreTests {
     @Test func saveLoadUpdateDeleteRoundTrip() {
-        let service = "com.clawdis.tests.\(UUID().uuidString)"
+        let service = "com.steipete.clawdis.tests.\(UUID().uuidString)"
         let account = "value"
 
         #expect(KeychainStore.delete(service: service, account: account))

apps/ios/fastlane/Appfile

@@ -1,4 +1,4 @@
-app_identifier("com.clawdis.ios")
+app_identifier("com.steipete.clawdis.ios")
 
 # Auth is expected via App Store Connect API key.
 # Provide either:

apps/ios/project.yml

@@ -1,6 +1,6 @@
 name: Clawdis
 options:
-  bundleIdPrefix: com.clawdis
+  bundleIdPrefix: com.steipete.clawdis
   deploymentTarget:
     iOS: "17.0"
   xcodeVersion: "16.0"
@@ -65,8 +65,8 @@ targets:
         CODE_SIGN_IDENTITY: "Apple Development"
         CODE_SIGN_STYLE: Manual
         DEVELOPMENT_TEAM: Y5PE65HELJ
-        PRODUCT_BUNDLE_IDENTIFIER: com.clawdis.ios
+        PRODUCT_BUNDLE_IDENTIFIER: com.steipete.clawdis.ios
-        PROVISIONING_PROFILE_SPECIFIER: "com.clawdis.ios Development"
+        PROVISIONING_PROFILE_SPECIFIER: "com.steipete.clawdis.ios Development"
         SWIFT_VERSION: "6.0"
     info:
       path: Sources/Info.plist
@@ -98,7 +98,7 @@ targets:
         product: SwabbleKit
     settings:
       base:
-        PRODUCT_BUNDLE_IDENTIFIER: com.clawdis.ios.tests
+        PRODUCT_BUNDLE_IDENTIFIER: com.steipete.clawdis.ios.tests
         SWIFT_VERSION: "6.0"
         TEST_HOST: "$(BUILT_PRODUCTS_DIR)/Clawdis.app/Clawdis"
         BUNDLE_LOADER: "$(TEST_HOST)"

apps/macos/Sources/Clawdis/AgentWorkspace.swift

@@ -2,7 +2,7 @@ import Foundation
 import OSLog
 
 enum AgentWorkspace {
-    private static let logger = Logger(subsystem: "com.clawdis", category: "workspace")
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "workspace")
     static let agentsFilename = "AGENTS.md"
     static let soulFilename = "SOUL.md"
     static let identityFilename = "IDENTITY.md"

apps/macos/Sources/Clawdis/AnthropicOAuth.swift

@@ -58,7 +58,7 @@ enum AnthropicAuthResolver {
 }
 
 enum AnthropicOAuth {
-    private static let logger = Logger(subsystem: "com.clawdis", category: "anthropic-oauth")
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "anthropic-oauth")
 
     private static let clientId = "9d1c250a-e61b-44d9-88ed-5944d1962f5e"
     private static let authorizeURL = URL(string: "https://claude.ai/oauth/authorize")!

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

@@ -19,7 +19,7 @@ actor BridgeConnectionHandler {
     private let logger: Logger
     private let decoder = JSONDecoder()
     private let encoder = JSONEncoder()
-    private let queue = DispatchQueue(label: "com.clawdis.bridge.connection")
+    private let queue = DispatchQueue(label: "com.steipete.clawdis.bridge.connection")
 
     private var buffer = Data()
     private var isAuthenticated = false

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

@@ -8,7 +8,7 @@ import OSLog
 actor BridgeServer {
     static let shared = BridgeServer()
 
-    private let logger = Logger(subsystem: "com.clawdis", category: "bridge")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "bridge")
     private var listener: NWListener?
     private var isRunning = false
     private var store: PairedNodesStore?
@@ -42,7 +42,7 @@ actor BridgeServer {
                 Task { await self.handleListenerState(state) }
             }
 
-            listener.start(queue: DispatchQueue(label: "com.clawdis.bridge"))
+            listener.start(queue: DispatchQueue(label: "com.steipete.clawdis.bridge"))
             self.listener = listener
         } catch {
             self.logger.error("bridge start failed: \(error.localizedDescription, privacy: .public)")

apps/macos/Sources/Clawdis/CameraCaptureService.swift

@@ -36,7 +36,7 @@ actor CameraCaptureService {
         }
     }
 
-    private let logger = Logger(subsystem: "com.clawdis", category: "camera")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "camera")
 
     func listDevices() -> [CameraDeviceInfo] {
         Self.availableCameras().map { device in

apps/macos/Sources/Clawdis/CanvasFileWatcher.swift

@@ -10,7 +10,7 @@ final class CanvasFileWatcher: @unchecked Sendable {
 
     init(url: URL, onChange: @escaping () -> Void) {
         self.url = url
-        self.queue = DispatchQueue(label: "com.clawdis.canvaswatcher")
+        self.queue = DispatchQueue(label: "com.steipete.clawdis.canvaswatcher")
         self.onChange = onChange
     }
 

apps/macos/Sources/Clawdis/CanvasManager.swift

@@ -7,7 +7,7 @@ import OSLog
 final class CanvasManager {
     static let shared = CanvasManager()
 
-    private static let logger = Logger(subsystem: "com.clawdis", category: "CanvasManager")
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "CanvasManager")
 
     private var panelController: CanvasWindowController?
     private var panelSessionKey: String?

apps/macos/Sources/Clawdis/CanvasSchemeHandler.swift

@@ -3,7 +3,7 @@ import Foundation
 import OSLog
 import WebKit
 
-private let canvasLogger = Logger(subsystem: "com.clawdis", category: "Canvas")
+private let canvasLogger = Logger(subsystem: "com.steipete.clawdis", category: "Canvas")
 
 final class CanvasSchemeHandler: NSObject, WKURLSchemeHandler {
     private let root: URL

apps/macos/Sources/Clawdis/CanvasWindow.swift

@@ -1,6 +1,6 @@
 import AppKit
 
-let canvasWindowLogger = Logger(subsystem: "com.clawdis", category: "Canvas")
+let canvasWindowLogger = Logger(subsystem: "com.steipete.clawdis", category: "Canvas")
 
 enum CanvasLayout {
     static let panelSize = NSSize(width: 520, height: 680)

apps/macos/Sources/Clawdis/ClawdisConfigFile.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 enum ClawdisConfigFile {
-    private static let logger = Logger(subsystem: "com.clawdis", category: "config")
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "config")
 
     static func url() -> URL {
         ClawdisPaths.configURL
@@ -106,20 +106,4 @@ enum ClawdisConfigFile {
         return remote["password"] as? String
     }
 
-    static func gatewayPort() -> Int? {
-        let root = self.loadDict()
-        guard let gateway = root["gateway"] as? [String: Any] else { return nil }
-        if let port = gateway["port"] as? Int, port > 0 { return port }
-        if let number = gateway["port"] as? NSNumber, number.intValue > 0 {
-            return number.intValue
-        }
-        if let raw = gateway["port"] as? String,
-           let parsed = Int(raw.trimmingCharacters(in: .whitespacesAndNewlines)),
-           parsed > 0
-        {
-            return parsed
-        }
-        return nil
-    }
-
 }

apps/macos/Sources/Clawdis/ConnectionModeCoordinator.swift

@@ -5,7 +5,7 @@ import OSLog
 final class ConnectionModeCoordinator {
     static let shared = ConnectionModeCoordinator()
 
-    private let logger = Logger(subsystem: "com.clawdis", category: "connection")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "connection")
 
     /// Apply the requested connection mode by starting/stopping local gateway,
     /// managing the control-channel SSH tunnel, and cleaning up chat windows/panels.

apps/macos/Sources/Clawdis/ConnectionsSettings.swift

@@ -2,7 +2,7 @@ import AppKit
 import SwiftUI
 
 struct ConnectionsSettings: View {
-    private enum ConnectionProvider: String, CaseIterable, Identifiable, Hashable {
+    private enum ConnectionProvider: String, CaseIterable, Identifiable {
         case whatsapp
         case telegram
         case discord
@@ -20,40 +20,9 @@ struct ConnectionsSettings: View {
             case .imessage: 4
             }
         }
-
-        var title: String {
-            switch self {
-            case .whatsapp: "WhatsApp"
-            case .telegram: "Telegram"
-            case .discord: "Discord"
-            case .signal: "Signal"
-            case .imessage: "iMessage"
-            }
-        }
-
-        var detailTitle: String {
-            switch self {
-            case .whatsapp: "WhatsApp Web"
-            case .telegram: "Telegram Bot"
-            case .discord: "Discord Bot"
-            case .signal: "Signal REST"
-            case .imessage: "iMessage (imsg)"
-            }
-        }
-
-        var systemImage: String {
-            switch self {
-            case .whatsapp: "message"
-            case .telegram: "paperplane"
-            case .discord: "bubble.left.and.bubble.right"
-            case .signal: "antenna.radiowaves.left.and.right"
-            case .imessage: "message.fill"
-            }
-        }
     }
 
     @Bindable var store: ConnectionsStore
-    @State private var selectedProvider: ConnectionProvider? = nil
     @State private var showTelegramToken = false
     @State private var showDiscordToken = false
 
@@ -62,189 +31,47 @@ struct ConnectionsSettings: View {
     }
 
     var body: some View {
-        NavigationSplitView {
-            self.sidebar
-        } detail: {
-            self.detail
-        }
-        .onAppear {
-            self.store.start()
-            self.ensureSelection()
-        }
-        .onChange(of: self.orderedProviders) { _, _ in
-            self.ensureSelection()
-        }
-        .onDisappear { self.store.stop() }
-    }
-
-    private var sidebar: some View {
-        List(selection: self.$selectedProvider) {
-            if !self.enabledProviders.isEmpty {
-                Section("Configured") {
-                    ForEach(self.enabledProviders) { provider in
-                        self.sidebarRow(provider)
-                            .tag(provider)
-                    }
-                }
-            }
-
-            if !self.availableProviders.isEmpty {
-                Section("Available") {
-                    ForEach(self.availableProviders) { provider in
-                        self.sidebarRow(provider)
-                            .tag(provider)
-                    }
-                }
-            }
-        }
-        .listStyle(.sidebar)
-        .frame(minWidth: 210, idealWidth: 230, maxWidth: 260)
-    }
-
-    private var detail: some View {
-        Group {
-            if let provider = self.selectedProvider {
-                self.providerDetail(provider)
-            } else {
-                self.emptyDetail
-            }
-        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
-    }
-
-    private var emptyDetail: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Text("Connections")
-                .font(.title3.weight(.semibold))
-            Text("Select a provider to view status and settings.")
-                .font(.callout)
-                .foregroundStyle(.secondary)
-        }
-        .padding(.horizontal, 24)
-        .padding(.vertical, 18)
-    }
-
-    private func providerDetail(_ provider: ConnectionProvider) -> some View {
         ScrollView(.vertical) {
-            VStack(alignment: .leading, spacing: 16) {
+            VStack(alignment: .leading, spacing: 14) {
-                self.detailHeader(for: provider)
+                self.header
-                Divider()
+                ForEach(self.orderedProviders) { provider in
-                self.providerSection(provider)
+                    self.providerSection(provider)
+                }
                 Spacer(minLength: 0)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
             .padding(.horizontal, 24)
             .padding(.vertical, 18)
         }
+        .onAppear { self.store.start() }
+        .onDisappear { self.store.stop() }
     }
 
-    private func sidebarRow(_ provider: ConnectionProvider) -> some View {
+    private var header: some View {
-        HStack(spacing: 8) {
+        VStack(alignment: .leading, spacing: 6) {
-            Circle()
+            Text("Connections")
-                .fill(self.providerTint(provider))
+                .font(.title3.weight(.semibold))
-                .frame(width: 8, height: 8)
+            Text("Link and monitor messaging providers.")
-            VStack(alignment: .leading, spacing: 2) {
+                .font(.callout)
-                Text(provider.title)
+                .foregroundStyle(.secondary)
-                Text(self.providerSummary(provider))
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-            }
         }
-        .padding(.vertical, 4)
-    }
-
-    private func detailHeader(for provider: ConnectionProvider) -> some View {
-        VStack(alignment: .leading, spacing: 8) {
-            HStack(alignment: .firstTextBaseline, spacing: 10) {
-                Label(provider.detailTitle, systemImage: provider.systemImage)
-                    .font(.title3.weight(.semibold))
-                self.statusBadge(
-                    self.providerSummary(provider),
-                    color: self.providerTint(provider))
-                Spacer()
-                self.providerHeaderActions(provider)
-            }
-
-            HStack(spacing: 10) {
-                Text("Last check \(self.providerLastCheckText(provider))")
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                if self.providerHasError(provider) {
-                    Text("Error")
-                        .font(.caption2.weight(.semibold))
-                        .padding(.horizontal, 6)
-                        .padding(.vertical, 2)
-                        .background(Color.red.opacity(0.15))
-                        .foregroundStyle(.red)
-                        .clipShape(Capsule())
-                }
-            }
-
-            if let details = self.providerDetails(provider) {
-                Text(details)
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                    .fixedSize(horizontal: false, vertical: true)
-            }
-        }
-    }
-
-    private func statusBadge(_ text: String, color: Color) -> some View {
-        Text(text)
-            .font(.caption2.weight(.semibold))
-            .padding(.horizontal, 8)
-            .padding(.vertical, 3)
-            .background(color.opacity(0.16))
-            .foregroundStyle(color)
-            .clipShape(Capsule())
-    }
-
-    private func formSection(_ title: String, @ViewBuilder content: () -> some View) -> some View {
-        GroupBox(title) {
-            VStack(alignment: .leading, spacing: 10) {
-                content()
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-
-    @ViewBuilder
-    private func providerHeaderActions(_ provider: ConnectionProvider) -> some View {
-        HStack(spacing: 8) {
-            if provider == .whatsapp {
-                Button("Logout") {
-                    Task { await self.store.logoutWhatsApp() }
-                }
-                .buttonStyle(.bordered)
-                .disabled(self.store.whatsappBusy)
-            }
-
-            if provider == .telegram {
-                Button("Logout") {
-                    Task { await self.store.logoutTelegram() }
-                }
-                .buttonStyle(.bordered)
-                .disabled(self.store.telegramBusy)
-            }
-
-            Button {
-                Task { await self.store.refresh(probe: true) }
-            } label: {
-                if self.store.isRefreshing {
-                    ProgressView().controlSize(.small)
-                } else {
-                    Text("Refresh")
-                }
-            }
-            .buttonStyle(.bordered)
-            .disabled(self.store.isRefreshing)
-        }
-        .controlSize(.small)
     }
 
     private var whatsAppSection: some View {
-        VStack(alignment: .leading, spacing: 16) {
+        GroupBox("WhatsApp") {
-            self.formSection("Linking") {
+            VStack(alignment: .leading, spacing: 10) {
+                self.providerHeader(
+                    title: "WhatsApp Web",
+                    color: self.whatsAppTint,
+                    subtitle: self.whatsAppSummary)
+
+                if let details = self.whatsAppDetails {
+                    Text(details)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
                 if let message = self.store.whatsappLoginMessage {
                     Text(message)
                         .font(.caption)
@@ -278,16 +105,52 @@ struct ConnectionsSettings: View {
                     }
                     .buttonStyle(.bordered)
                     .disabled(self.store.whatsappBusy)
+
+                    Spacer()
+
+                    Button("Logout") {
+                        Task { await self.store.logoutWhatsApp() }
+                    }
+                    .buttonStyle(.bordered)
+                    .disabled(self.store.whatsappBusy)
+
+                    Button("Refresh") {
+                        Task { await self.store.refresh(probe: true) }
+                    }
+                    .buttonStyle(.bordered)
+                    .disabled(self.store.isRefreshing)
                 }
                 .font(.caption)
             }
+            .frame(maxWidth: .infinity, alignment: .leading)
         }
     }
 
     private var telegramSection: some View {
-        VStack(alignment: .leading, spacing: 16) {
+        GroupBox("Telegram") {
-            self.formSection("Authentication") {
+            VStack(alignment: .leading, spacing: 10) {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+                self.providerHeader(
+                    title: "Telegram Bot",
+                    color: self.telegramTint,
+                    subtitle: self.telegramSummary)
+
+                if let details = self.telegramDetails {
+                    Text(details)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                if let status = self.store.configStatus {
+                    Text(status)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                Divider().padding(.vertical, 2)
+
+                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
                     GridRow {
                         self.gridLabel("Bot token")
                         if self.showTelegramToken {
@@ -303,11 +166,6 @@ struct ConnectionsSettings: View {
                             .toggleStyle(.switch)
                             .disabled(self.isTelegramTokenLocked)
                     }
-                }
-            }
-
-            self.formSection("Access") {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
                     GridRow {
                         self.gridLabel("Require mention")
                         Toggle("", isOn: self.$store.telegramRequireMention)
@@ -319,11 +177,11 @@ struct ConnectionsSettings: View {
                         TextField("123456789, @team", text: self.$store.telegramAllowFrom)
                             .textFieldStyle(.roundedBorder)
                     }
-                }
+                    GridRow {
-            }
+                        self.gridLabel("Proxy")
-
+                        TextField("socks5://localhost:9050", text: self.$store.telegramProxy)
-            self.formSection("Webhook") {
+                            .textFieldStyle(.roundedBorder)
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+                    }
                     GridRow {
                         self.gridLabel("Webhook URL")
                         TextField("https://example.com/telegram-webhook", text: self.$store.telegramWebhookUrl)
@@ -340,49 +198,71 @@ struct ConnectionsSettings: View {
                             .textFieldStyle(.roundedBorder)
                     }
                 }
-            }
 
-            self.formSection("Network") {
+                if self.isTelegramTokenLocked {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+                    Text("Token set via TELEGRAM_BOT_TOKEN env; config edits won’t override it.")
-                    GridRow {
+                        .font(.caption)
-                        self.gridLabel("Proxy")
+                        .foregroundStyle(.secondary)
-                        TextField("socks5://localhost:9050", text: self.$store.telegramProxy)
-                            .textFieldStyle(.roundedBorder)
-                    }
                 }
-            }
 
-            if self.isTelegramTokenLocked {
+                HStack(spacing: 12) {
-                Text("Token set via TELEGRAM_BOT_TOKEN env; config edits won’t override it.")
+                    Button {
-                    .font(.caption)
+                        Task { await self.store.saveTelegramConfig() }
-                    .foregroundStyle(.secondary)
+                    } label: {
-            }
+                        if self.store.isSavingConfig {
-
+                            ProgressView().controlSize(.small)
-            self.configStatusMessage
+                        } else {
-
+                            Text("Save")
-            HStack(spacing: 12) {
+                        }
-                Button {
-                    Task { await self.store.saveTelegramConfig() }
-                } label: {
-                    if self.store.isSavingConfig {
-                        ProgressView().controlSize(.small)
-                    } else {
-                        Text("Save")
                     }
-                }
+                    .buttonStyle(.borderedProminent)
-                .buttonStyle(.borderedProminent)
+                    .disabled(self.store.isSavingConfig)
-                .disabled(self.store.isSavingConfig)
 
-                Spacer()
+                    Spacer()
+
+                    Button("Logout") {
+                        Task { await self.store.logoutTelegram() }
+                    }
+                    .buttonStyle(.bordered)
+                    .disabled(self.store.telegramBusy)
+
+                    Button("Refresh") {
+                        Task { await self.store.refresh(probe: true) }
+                    }
+                    .buttonStyle(.bordered)
+                    .disabled(self.store.isRefreshing)
+                }
+                .font(.caption)
             }
-            .font(.caption)
+            .frame(maxWidth: .infinity, alignment: .leading)
         }
     }
 
     private var discordSection: some View {
-        VStack(alignment: .leading, spacing: 16) {
+        GroupBox("Discord") {
-            self.formSection("Authentication") {
+            VStack(alignment: .leading, spacing: 10) {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+                self.providerHeader(
+                    title: "Discord Bot",
+                    color: self.discordTint,
+                    subtitle: self.discordSummary)
+
+                if let details = self.discordDetails {
+                    Text(details)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                if let status = self.store.configStatus {
+                    Text(status)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                Divider().padding(.vertical, 2)
+
+                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
                     GridRow {
                         self.gridLabel("Enabled")
                         Toggle("", isOn: self.$store.discordEnabled)
@@ -404,11 +284,6 @@ struct ConnectionsSettings: View {
                             .toggleStyle(.switch)
                             .disabled(self.isDiscordTokenLocked)
                     }
-                }
-            }
-
-            self.formSection("Messages") {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
                     GridRow {
                         self.gridLabel("Allow DMs from")
                         TextField("123456789, username#1234", text: self.$store.discordAllowFrom)
@@ -431,20 +306,6 @@ struct ConnectionsSettings: View {
                         TextField("channelId1, channelId2", text: self.$store.discordGroupChannels)
                             .textFieldStyle(.roundedBorder)
                     }
-                    GridRow {
-                        self.gridLabel("Reply to mode")
-                        Picker("", selection: self.$store.discordReplyToMode) {
-                            Text("off").tag("off")
-                            Text("first").tag("first")
-                            Text("all").tag("all")
-                        }
-                        .labelsHidden()
-                    }
-                }
-            }
-
-            self.formSection("Limits") {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
                     GridRow {
                         self.gridLabel("Media max MB")
                         TextField("8", text: self.$store.discordMediaMaxMb)
@@ -460,13 +321,17 @@ struct ConnectionsSettings: View {
                         TextField("2000", text: self.$store.discordTextChunkLimit)
                             .textFieldStyle(.roundedBorder)
                     }
-                }
-            }
-
-            self.formSection("Slash command") {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
                     GridRow {
-                        self.gridLabel("Enabled")
+                        self.gridLabel("Reply to mode")
+                        Picker("", selection: self.$store.discordReplyToMode) {
+                            Text("off").tag("off")
+                            Text("first").tag("first")
+                            Text("all").tag("all")
+                        }
+                        .labelsHidden()
+                    }
+                    GridRow {
+                        self.gridLabel("Slash command")
                         Toggle("", isOn: self.$store.discordSlashEnabled)
                             .labelsHidden()
                             .toggleStyle(.checkbox)
@@ -477,20 +342,24 @@ struct ConnectionsSettings: View {
                             .textFieldStyle(.roundedBorder)
                     }
                     GridRow {
-                        self.gridLabel("Session prefix")
+                        self.gridLabel("Slash session prefix")
                         TextField("discord:slash", text: self.$store.discordSlashSessionPrefix)
                             .textFieldStyle(.roundedBorder)
                     }
                     GridRow {
-                        self.gridLabel("Ephemeral")
+                        self.gridLabel("Slash ephemeral")
                         Toggle("", isOn: self.$store.discordSlashEphemeral)
                             .labelsHidden()
                             .toggleStyle(.checkbox)
                     }
                 }
-            }
 
-            GroupBox("Guilds") {
+                Divider().padding(.vertical, 2)
+
+                Text("Guilds")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+
                 VStack(alignment: .leading, spacing: 12) {
                     ForEach($store.discordGuilds) { $guild in
                         VStack(alignment: .leading, spacing: 10) {
@@ -503,7 +372,7 @@ struct ConnectionsSettings: View {
                                 .buttonStyle(.bordered)
                             }
 
-                            Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+                            Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
                                 GridRow {
                                     self.gridLabel("Slug")
                                     TextField("optional slug", text: $guild.slug)
@@ -515,17 +384,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)
@@ -568,11 +426,14 @@ struct ConnectionsSettings: View {
                     }
                     .buttonStyle(.bordered)
                 }
-                .frame(maxWidth: .infinity, alignment: .leading)
-            }
 
-            GroupBox("Tool actions") {
+                Divider().padding(.vertical, 2)
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+
+                Text("Tool actions")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+
+                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
                     GridRow {
                         self.gridLabel("Reactions")
                         Toggle("", isOn: self.$store.discordActionReactions)
@@ -664,40 +525,65 @@ struct ConnectionsSettings: View {
                             .toggleStyle(.checkbox)
                     }
                 }
-                .frame(maxWidth: .infinity, alignment: .leading)
-            }
 
-            if self.isDiscordTokenLocked {
+                if self.isDiscordTokenLocked {
-                Text("Token set via DISCORD_BOT_TOKEN env; config edits won’t override it.")
+                    Text("Token set via DISCORD_BOT_TOKEN env; config edits won’t override it.")
-                    .font(.caption)
+                        .font(.caption)
-                    .foregroundStyle(.secondary)
+                        .foregroundStyle(.secondary)
-            }
-
-            self.configStatusMessage
-
-            HStack(spacing: 12) {
-                Button {
-                    Task { await self.store.saveDiscordConfig() }
-                } label: {
-                    if self.store.isSavingConfig {
-                        ProgressView().controlSize(.small)
-                    } else {
-                        Text("Save")
-                    }
                 }
-                .buttonStyle(.borderedProminent)
-                .disabled(self.store.isSavingConfig)
 
-                Spacer()
+                HStack(spacing: 12) {
+                    Button {
+                        Task { await self.store.saveDiscordConfig() }
+                    } label: {
+                        if self.store.isSavingConfig {
+                            ProgressView().controlSize(.small)
+                        } else {
+                            Text("Save")
+                        }
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .disabled(self.store.isSavingConfig)
+
+                    Spacer()
+
+                    Button("Refresh") {
+                        Task { await self.store.refresh(probe: true) }
+                    }
+                    .buttonStyle(.bordered)
+                    .disabled(self.store.isRefreshing)
+                }
+                .font(.caption)
             }
-            .font(.caption)
+            .frame(maxWidth: .infinity, alignment: .leading)
         }
     }
 
     private var signalSection: some View {
-        VStack(alignment: .leading, spacing: 16) {
+        GroupBox("Signal") {
-            self.formSection("Connection") {
+            VStack(alignment: .leading, spacing: 10) {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+                self.providerHeader(
+                    title: "Signal REST",
+                    color: self.signalTint,
+                    subtitle: self.signalSummary)
+
+                if let details = self.signalDetails {
+                    Text(details)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                if let status = self.store.configStatus {
+                    Text(status)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                Divider().padding(.vertical, 2)
+
+                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
                     GridRow {
                         self.gridLabel("Enabled")
                         Toggle("", isOn: self.$store.signalEnabled)
@@ -729,11 +615,6 @@ struct ConnectionsSettings: View {
                         TextField("signal-cli", text: self.$store.signalCliPath)
                             .textFieldStyle(.roundedBorder)
                     }
-                }
-            }
-
-            self.formSection("Behavior") {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
                     GridRow {
                         self.gridLabel("Auto start")
                         Toggle("", isOn: self.$store.signalAutoStart)
@@ -768,11 +649,6 @@ struct ConnectionsSettings: View {
                             .labelsHidden()
                             .toggleStyle(.checkbox)
                     }
-                }
-            }
-
-            self.formSection("Access & limits") {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
                     GridRow {
                         self.gridLabel("Allow from")
                         TextField("12345, +1555", text: self.$store.signalAllowFrom)
@@ -784,33 +660,59 @@ struct ConnectionsSettings: View {
                             .textFieldStyle(.roundedBorder)
                     }
                 }
-            }
 
-            self.configStatusMessage
+                HStack(spacing: 12) {
-
+                    Button {
-            HStack(spacing: 12) {
+                        Task { await self.store.saveSignalConfig() }
-                Button {
+                    } label: {
-                    Task { await self.store.saveSignalConfig() }
+                        if self.store.isSavingConfig {
-                } label: {
+                            ProgressView().controlSize(.small)
-                    if self.store.isSavingConfig {
+                        } else {
-                        ProgressView().controlSize(.small)
+                            Text("Save")
-                    } else {
+                        }
-                        Text("Save")
                     }
-                }
+                    .buttonStyle(.borderedProminent)
-                .buttonStyle(.borderedProminent)
+                    .disabled(self.store.isSavingConfig)
-                .disabled(self.store.isSavingConfig)
 
-                Spacer()
+                    Spacer()
+
+                    Button("Refresh") {
+                        Task { await self.store.refresh(probe: true) }
+                    }
+                    .buttonStyle(.bordered)
+                    .disabled(self.store.isRefreshing)
+                }
+                .font(.caption)
             }
-            .font(.caption)
+            .frame(maxWidth: .infinity, alignment: .leading)
         }
     }
 
     private var imessageSection: some View {
-        VStack(alignment: .leading, spacing: 16) {
+        GroupBox("iMessage") {
-            self.formSection("Connection") {
+            VStack(alignment: .leading, spacing: 10) {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
+                self.providerHeader(
+                    title: "iMessage (imsg)",
+                    color: self.imessageTint,
+                    subtitle: self.imessageSummary)
+
+                if let details = self.imessageDetails {
+                    Text(details)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                if let status = self.store.configStatus {
+                    Text(status)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                Divider().padding(.vertical, 2)
+
+                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
                     GridRow {
                         self.gridLabel("Enabled")
                         Toggle("", isOn: self.$store.imessageEnabled)
@@ -837,11 +739,6 @@ struct ConnectionsSettings: View {
                         .labelsHidden()
                         .pickerStyle(.menu)
                     }
-                }
-            }
-
-            self.formSection("Behavior") {
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 8) {
                     GridRow {
                         self.gridLabel("Region")
                         TextField("US", text: self.$store.imessageRegion)
@@ -864,26 +761,31 @@ struct ConnectionsSettings: View {
                             .textFieldStyle(.roundedBorder)
                     }
                 }
-            }
 
-            self.configStatusMessage
+                HStack(spacing: 12) {
-
+                    Button {
-            HStack(spacing: 12) {
+                        Task { await self.store.saveIMessageConfig() }
-                Button {
+                    } label: {
-                    Task { await self.store.saveIMessageConfig() }
+                        if self.store.isSavingConfig {
-                } label: {
+                            ProgressView().controlSize(.small)
-                    if self.store.isSavingConfig {
+                        } else {
-                        ProgressView().controlSize(.small)
+                            Text("Save")
-                    } else {
+                        }
-                        Text("Save")
                     }
-                }
+                    .buttonStyle(.borderedProminent)
-                .buttonStyle(.borderedProminent)
+                    .disabled(self.store.isSavingConfig)
-                .disabled(self.store.isSavingConfig)
 
-                Spacer()
+                    Spacer()
+
+                    Button("Refresh") {
+                        Task { await self.store.refresh(probe: true) }
+                    }
+                    .buttonStyle(.bordered)
+                    .disabled(self.store.isRefreshing)
+                }
+                .font(.caption)
             }
-            .font(.caption)
+            .frame(maxWidth: .infinity, alignment: .leading)
         }
     }
 
@@ -1123,24 +1025,6 @@ struct ConnectionsSettings: View {
         }
     }
 
-    private var enabledProviders: [ConnectionProvider] {
-        self.orderedProviders.filter { self.providerEnabled($0) }
-    }
-
-    private var availableProviders: [ConnectionProvider] {
-        self.orderedProviders.filter { !self.providerEnabled($0) }
-    }
-
-    private func ensureSelection() {
-        guard let selected = self.selectedProvider else {
-            self.selectedProvider = self.orderedProviders.first
-            return
-        }
-        if !self.orderedProviders.contains(selected) {
-            self.selectedProvider = self.orderedProviders.first
-        }
-    }
-
     private func providerEnabled(_ provider: ConnectionProvider) -> Bool {
         switch provider {
         case .whatsapp:
@@ -1177,106 +1061,26 @@ struct ConnectionsSettings: View {
         }
     }
 
-    @ViewBuilder
+    private func providerHeader(title: String, color: Color, subtitle: String) -> some View {
-    private var configStatusMessage: some View {
+        HStack(spacing: 10) {
-        if let status = self.store.configStatus {
+            Circle()
-            Text(status)
+                .fill(color)
-                .font(.caption)
+                .frame(width: 10, height: 10)
-                .foregroundStyle(.secondary)
+            VStack(alignment: .leading, spacing: 2) {
-                .fixedSize(horizontal: false, vertical: true)
+                Text(title)
-        }
+                    .font(.headline)
-    }
+                Text(subtitle)
-
+                    .font(.caption)
-    private func providerTint(_ provider: ConnectionProvider) -> Color {
+                    .foregroundStyle(color)
-        switch provider {
+            }
-        case .whatsapp:
+            Spacer()
-            self.whatsAppTint
-        case .telegram:
-            self.telegramTint
-        case .discord:
-            self.discordTint
-        case .signal:
-            self.signalTint
-        case .imessage:
-            self.imessageTint
-        }
-    }
-
-    private func providerSummary(_ provider: ConnectionProvider) -> String {
-        switch provider {
-        case .whatsapp:
-            self.whatsAppSummary
-        case .telegram:
-            self.telegramSummary
-        case .discord:
-            self.discordSummary
-        case .signal:
-            self.signalSummary
-        case .imessage:
-            self.imessageSummary
-        }
-    }
-
-    private func providerDetails(_ provider: ConnectionProvider) -> String? {
-        switch provider {
-        case .whatsapp:
-            self.whatsAppDetails
-        case .telegram:
-            self.telegramDetails
-        case .discord:
-            self.discordDetails
-        case .signal:
-            self.signalDetails
-        case .imessage:
-            self.imessageDetails
-        }
-    }
-
-    private func providerLastCheckText(_ provider: ConnectionProvider) -> String {
-        guard let date = self.providerLastCheck(provider) else { return "never" }
-        return relativeAge(from: date)
-    }
-
-    private func providerLastCheck(_ provider: ConnectionProvider) -> Date? {
-        switch provider {
-        case .whatsapp:
-            guard let status = self.store.snapshot?.whatsapp else { return nil }
-            return self.date(fromMs: status.lastEventAt ?? status.lastMessageAt ?? status.lastConnectedAt)
-        case .telegram:
-            return self.date(fromMs: self.store.snapshot?.telegram.lastProbeAt)
-        case .discord:
-            return self.date(fromMs: self.store.snapshot?.discord?.lastProbeAt)
-        case .signal:
-            return self.date(fromMs: self.store.snapshot?.signal?.lastProbeAt)
-        case .imessage:
-            return self.date(fromMs: self.store.snapshot?.imessage?.lastProbeAt)
-        }
-    }
-
-    private func providerHasError(_ provider: ConnectionProvider) -> Bool {
-        switch provider {
-        case .whatsapp:
-            guard let status = self.store.snapshot?.whatsapp else { return false }
-            return status.lastError?.isEmpty == false || status.lastDisconnect?.loggedOut == true
-        case .telegram:
-            guard let status = self.store.snapshot?.telegram else { return false }
-            return status.lastError?.isEmpty == false || status.probe?.ok == false
-        case .discord:
-            guard let status = self.store.snapshot?.discord else { return false }
-            return status.lastError?.isEmpty == false || status.probe?.ok == false
-        case .signal:
-            guard let status = self.store.snapshot?.signal else { return false }
-            return status.lastError?.isEmpty == false || status.probe?.ok == false
-        case .imessage:
-            guard let status = self.store.snapshot?.imessage else { return false }
-            return status.lastError?.isEmpty == false || status.probe?.ok == false
         }
     }
 
     private func gridLabel(_ text: String) -> some View {
         Text(text)
             .font(.callout.weight(.semibold))
-            .frame(width: 140, alignment: .leading)
+            .frame(width: 120, alignment: .leading)
     }
 
     private func date(fromMs ms: Double?) -> Date? {

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

@@ -1,7 +1,7 @@
 import Foundation
 
-let launchdLabel = "com.clawdis.mac"
+let launchdLabel = "com.steipete.clawdis"
-let gatewayLaunchdLabel = "com.clawdis.gateway"
+let gatewayLaunchdLabel = "com.steipete.clawdis.gateway"
 let onboardingVersionKey = "clawdis.onboardingVersion"
 let currentOnboardingVersion = 7
 let pauseDefaultsKey = "clawdis.pauseEnabled"

apps/macos/Sources/Clawdis/ControlChannel.swift

@@ -73,7 +73,7 @@ final class ControlChannel {
     }
     private(set) var lastPingMs: Double?
 
-    private let logger = Logger(subsystem: "com.clawdis", category: "control")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "control")
 
     private var eventTask: Task<Void, Never>?
     private var recoveryTask: Task<Void, Never>?
@@ -185,7 +185,7 @@ final class ControlChannel {
                 "Reason: \(reason)"
         }
 
-        // Common misfire: we connected to the configured localhost port but it is occupied
+        // Common misfire: we connected to localhost:18789 but the port is occupied
         // by some other process (e.g. a local dev gateway or a stuck SSH forward).
         // The gateway handshake returns something we can't parse, which currently
         // surfaces as "hello failed (unexpected response)". Give the user a pointer

apps/macos/Sources/Clawdis/CronJobsStore.swift

@@ -21,7 +21,7 @@ final class CronJobsStore {
     var lastError: String?
     var statusMessage: String?
 
-    private let logger = Logger(subsystem: "com.clawdis", category: "cron.ui")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "cron.ui")
     private var refreshTask: Task<Void, Never>?
     private var runsTask: Task<Void, Never>?
     private var eventTask: Task<Void, Never>?

apps/macos/Sources/Clawdis/DebugSettings.swift

@@ -306,7 +306,7 @@ struct DebugSettings: View {
                 }
 
                 if self.portReports.isEmpty, !self.portCheckInFlight {
-                    Text("Check which process owns \(GatewayEnvironment.gatewayPort()) and suggest fixes.")
+                    Text("Check which process owns 18789 and suggest fixes.")
                         .font(.caption2)
                         .foregroundStyle(.secondary)
                 } else {
@@ -946,7 +946,7 @@ extension DebugSettings {
         view.portCheckInFlight = true
         view.portReports = [
             DebugActions.PortReport(
-                port: GatewayEnvironment.gatewayPort(),
+                port: 18789,
                 expected: "Gateway websocket (node/tsx)",
                 status: .missing("Missing"),
                 listeners: []),

apps/macos/Sources/Clawdis/DeepLinks.swift

@@ -4,7 +4,7 @@ import Foundation
 import OSLog
 import Security
 
-private let deepLinkLogger = Logger(subsystem: "com.clawdis", category: "DeepLink")
+private let deepLinkLogger = Logger(subsystem: "com.steipete.clawdis", category: "DeepLink")
 
 @MainActor
 final class DeepLinkHandler {

apps/macos/Sources/Clawdis/DockIconManager.swift

@@ -6,7 +6,7 @@ final class DockIconManager: NSObject, @unchecked Sendable {
     static let shared = DockIconManager()
 
     private var windowsObservation: NSKeyValueObservation?
-    private let logger = Logger(subsystem: "com.clawdis", category: "DockIconManager")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "DockIconManager")
 
     override private init() {
         super.init()

apps/macos/Sources/Clawdis/GatewayChannel.swift

@@ -58,7 +58,7 @@ struct WebSocketSessionBox: @unchecked Sendable {
 private typealias ProtoAnyCodable = ClawdisProtocol.AnyCodable
 
 actor GatewayChannelActor {
-    private let logger = Logger(subsystem: "com.clawdis", category: "gateway")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "gateway")
     private var task: WebSocketTaskBox?
     private var pending: [String: CheckedContinuation<GatewayFrame, Error>] = [:]
     private var connected = false

apps/macos/Sources/Clawdis/GatewayConnection.swift

@@ -3,7 +3,7 @@ import ClawdisProtocol
 import Foundation
 import OSLog
 
-private let gatewayConnectionLogger = Logger(subsystem: "com.clawdis", category: "gateway.connection")
+private let gatewayConnectionLogger = Logger(subsystem: "com.steipete.clawdis", category: "gateway.connection")
 
 enum GatewayAgentChannel: String, Codable, CaseIterable, Sendable {
     case last
@@ -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"

apps/macos/Sources/Clawdis/GatewayDiscoveryModel.swift

@@ -34,7 +34,7 @@ final class GatewayDiscoveryModel {
     private var localIdentity: LocalIdentity
     private var resolvedTXTByID: [String: [String: String]] = [:]
     private var pendingTXTResolvers: [String: GatewayTXTResolver] = [:]
-    private let logger = Logger(subsystem: "com.clawdis", category: "gateway-discovery")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "gateway-discovery")
 
     init() {
         self.localIdentity = Self.buildLocalIdentityFast()
@@ -69,7 +69,7 @@ final class GatewayDiscoveryModel {
             }
 
             self.browsers[domain] = browser
-            browser.start(queue: DispatchQueue(label: "com.clawdis.macos.gateway-discovery.\(domain)"))
+            browser.start(queue: DispatchQueue(label: "com.steipete.clawdis.macos.gateway-discovery.\(domain)"))
         }
     }
 

apps/macos/Sources/Clawdis/GatewayEndpointStore.swift

@@ -72,7 +72,7 @@ actor GatewayEndpointStore {
     }
 
     private let deps: Deps
-    private let logger = Logger(subsystem: "com.clawdis", category: "gateway-endpoint")
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "gateway-endpoint")
 
     private var state: GatewayEndpointState
     private var subscribers: [UUID: AsyncStream<GatewayEndpointState>.Continuation] = [:]

apps/macos/Sources/Clawdis/GatewayEnvironment.swift

@@ -62,7 +62,7 @@ struct GatewayCommandResolution {
 }
 
 enum GatewayEnvironment {
-    private static let logger = Logger(subsystem: "com.clawdis", category: "gateway.env")
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "gateway.env")
     private static let supportedBindModes: Set<String> = ["loopback", "tailnet", "lan", "auto"]
 
     static func bundledGatewayExecutable() -> String? {
@@ -72,13 +72,6 @@ enum GatewayEnvironment {
     }
 
     static func gatewayPort() -> Int {
-        if let raw = ProcessInfo.processInfo.environment["CLAWDIS_GATEWAY_PORT"] {
-            let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-            if let parsed = Int(trimmed), parsed > 0 { return parsed }
-        }
-        if let configPort = ClawdisConfigFile.gatewayPort(), configPort > 0 {
-            return configPort
-        }
         let stored = UserDefaults.standard.integer(forKey: "gatewayPort")
         return stored > 0 ? stored : 18789
     }