docs: update changelog for #166

Prepares the macOS app for Swift 6 strict concurrency mode by:

1. Adding Sendable conformance to WizardNextResult, WizardStartResult,
   and WizardStatusResult in GatewayModels.swift

2. Adding AnyCodable bridging helpers in OnboardingWizard.swift to
   handle type conflicts between ClawdisProtocol and local module

3. Making CLLocationManagerDelegate methods nonisolated in:
   - MacNodeLocationService.swift
   - PermissionManager.swift (LocationPermissionRequester)

   Using Task { @MainActor in } pattern to safely access MainActor
   state from nonisolated protocol requirements.

These changes are forward-compatible and don't affect behavior on
current Swift versions.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

CHANGELOG.md

@@ -23,14 +23,13 @@
 - Sessions: add agent‑to‑agent post step with `ANNOUNCE_SKIP` to suppress channel announcements.
 
 ### Fixes
-- Gateway/macOS: keep node presence fresh with periodic beacons + show presence status in Instances (#168) — thanks @mbelinky.
+- macOS: improve Swift 6 strict concurrency compatibility (#166) — thanks @Nachx639.
 - CI: fix lint ordering after merge cleanup (#156) — thanks @steipete.
 - CI: consolidate checks to avoid redundant installs (#144) — thanks @thewilloftheshadow.
 - WhatsApp: support `gifPlayback` for MP4 GIF sends via CLI/gateway.
 - Sessions: prevent `sessions_send` timeouts by running nested agent turns on a separate lane.
 - Sessions: use per-send run IDs for gateway agent calls to avoid wait collisions.
 - Auto-reply: drop final payloads when block streaming to avoid duplicate Discord sends.
-- Auto-reply: default elevated to off when not allowed (#183) — thanks @cash-echo-bot.
 - Auto-reply: fix typing TTL to 2 minutes and log TTL with s/m units.
 - Bash tool: default auto-background delay to 10s.
 - Telegram: chunk block-stream replies to avoid “message is too long” errors (#124) — thanks @mukhtharcm.

CONTRIBUTING.md

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

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

@@ -14,13 +14,9 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
-    <uses-feature
-        android:name="android.hardware.telephony"
-        android:required="false" />
 
     <application
         android:name=".NodeApp"

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

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

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

@@ -7,7 +7,6 @@ import com.clawdis.android.chat.OutgoingAttachment
 import com.clawdis.android.node.CameraCaptureManager
 import com.clawdis.android.node.CanvasController
 import com.clawdis.android.node.ScreenRecordManager
-import com.clawdis.android.node.SmsManager
 import kotlinx.coroutines.flow.StateFlow
 
 class MainViewModel(app: Application) : AndroidViewModel(app) {
@@ -16,7 +15,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val canvas: CanvasController = runtime.canvas
   val camera: CameraCaptureManager = runtime.camera
   val screenRecorder: ScreenRecordManager = runtime.screenRecorder
-  val sms: SmsManager = runtime.sms
 
   val bridges: StateFlow<List<BridgeEndpoint>> = runtime.bridges
   val discoveryStatusText: StateFlow<String> = runtime.discoveryStatusText
@@ -118,10 +116,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     runtime.setTalkEnabled(enabled)
   }
 
-  fun refreshBridgeHello() {
-    runtime.refreshBridgeHello()
-  }
-
   fun connect(endpoint: BridgeEndpoint) {
     runtime.connect(endpoint)
   }

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

@@ -21,15 +21,13 @@ import com.clawdis.android.node.LocationCaptureManager
 import com.clawdis.android.BuildConfig
 import com.clawdis.android.node.CanvasController
 import com.clawdis.android.node.ScreenRecordManager
-import com.clawdis.android.node.SmsManager
 import com.clawdis.android.protocol.ClawdisCapability
 import com.clawdis.android.protocol.ClawdisCameraCommand
 import com.clawdis.android.protocol.ClawdisCanvasA2UIAction
 import com.clawdis.android.protocol.ClawdisCanvasA2UICommand
 import com.clawdis.android.protocol.ClawdisCanvasCommand
-import com.clawdis.android.protocol.ClawdisScreenCommand
 import com.clawdis.android.protocol.ClawdisLocationCommand
-import com.clawdis.android.protocol.ClawdisSmsCommand
+import com.clawdis.android.protocol.ClawdisScreenCommand
 import com.clawdis.android.voice.TalkModeManager
 import com.clawdis.android.voice.VoiceWakeManager
 import kotlinx.coroutines.CoroutineScope
@@ -63,7 +61,6 @@ class NodeRuntime(context: Context) {
   val camera = CameraCaptureManager(appContext)
   val location = LocationCaptureManager(appContext)
   val screenRecorder = ScreenRecordManager(appContext)
-  val sms = SmsManager(appContext)
   private val json = Json { ignoreUnknownKeys = true }
 
   private val externalAudioCaptureActive = MutableStateFlow(false)
@@ -367,112 +364,69 @@ class NodeRuntime(context: Context) {
     prefs.setTalkEnabled(value)
   }
 
-  private fun buildInvokeCommands(): List<String> =
-    buildList {
-      add(ClawdisCanvasCommand.Present.rawValue)
-      add(ClawdisCanvasCommand.Hide.rawValue)
-      add(ClawdisCanvasCommand.Navigate.rawValue)
-      add(ClawdisCanvasCommand.Eval.rawValue)
-      add(ClawdisCanvasCommand.Snapshot.rawValue)
-      add(ClawdisCanvasA2UICommand.Push.rawValue)
-      add(ClawdisCanvasA2UICommand.PushJSONL.rawValue)
-      add(ClawdisCanvasA2UICommand.Reset.rawValue)
-      add(ClawdisScreenCommand.Record.rawValue)
-      if (cameraEnabled.value) {
-        add(ClawdisCameraCommand.Snap.rawValue)
-        add(ClawdisCameraCommand.Clip.rawValue)
-      }
-      if (locationMode.value != LocationMode.Off) {
-        add(ClawdisLocationCommand.Get.rawValue)
-      }
-      if (sms.canSendSms()) {
-        add(ClawdisSmsCommand.Send.rawValue)
-      }
-    }
-
-  private fun buildCapabilities(): List<String> =
-    buildList {
-      add(ClawdisCapability.Canvas.rawValue)
-      add(ClawdisCapability.Screen.rawValue)
-      if (cameraEnabled.value) add(ClawdisCapability.Camera.rawValue)
-      if (sms.canSendSms()) add(ClawdisCapability.Sms.rawValue)
-      if (voiceWakeMode.value != VoiceWakeMode.Off && hasRecordAudioPermission()) {
-        add(ClawdisCapability.VoiceWake.rawValue)
-      }
-      if (locationMode.value != LocationMode.Off) {
-        add(ClawdisCapability.Location.rawValue)
-      }
-    }
-
-  private fun buildPairingHello(token: String?): BridgePairingClient.Hello {
-    val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
-      .joinToString(" ")
-      .trim()
-      .ifEmpty { null }
-    val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
-    val advertisedVersion =
-      if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
-        "$versionName-dev"
-      } else {
-        versionName
-      }
-    return BridgePairingClient.Hello(
-      nodeId = instanceId.value,
-      displayName = displayName.value,
-      token = token,
-      platform = "Android",
-      version = advertisedVersion,
-      deviceFamily = "Android",
-      modelIdentifier = modelIdentifier,
-      caps = buildCapabilities(),
-      commands = buildInvokeCommands(),
-    )
-  }
-
-  private fun buildSessionHello(token: String?): BridgeSession.Hello {
-    val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
-      .joinToString(" ")
-      .trim()
-      .ifEmpty { null }
-    val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
-    val advertisedVersion =
-      if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
-        "$versionName-dev"
-      } else {
-        versionName
-      }
-    return BridgeSession.Hello(
-      nodeId = instanceId.value,
-      displayName = displayName.value,
-      token = token,
-      platform = "Android",
-      version = advertisedVersion,
-      deviceFamily = "Android",
-      modelIdentifier = modelIdentifier,
-      caps = buildCapabilities(),
-      commands = buildInvokeCommands(),
-    )
-  }
-
-  fun refreshBridgeHello() {
-    scope.launch {
-      if (!_isConnected.value) return@launch
-      val token = prefs.loadBridgeToken()
-      if (token.isNullOrBlank()) return@launch
-      session.updateHello(buildSessionHello(token))
-    }
-  }
-
   fun connect(endpoint: BridgeEndpoint) {
     scope.launch {
       _statusText.value = "Connecting…"
       val storedToken = prefs.loadBridgeToken()
+      val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
+        .joinToString(" ")
+        .trim()
+        .ifEmpty { null }
+
+      val invokeCommands =
+        buildList {
+          add(ClawdisCanvasCommand.Present.rawValue)
+          add(ClawdisCanvasCommand.Hide.rawValue)
+          add(ClawdisCanvasCommand.Navigate.rawValue)
+          add(ClawdisCanvasCommand.Eval.rawValue)
+          add(ClawdisCanvasCommand.Snapshot.rawValue)
+          add(ClawdisCanvasA2UICommand.Push.rawValue)
+          add(ClawdisCanvasA2UICommand.PushJSONL.rawValue)
+          add(ClawdisCanvasA2UICommand.Reset.rawValue)
+          add(ClawdisScreenCommand.Record.rawValue)
+          if (cameraEnabled.value) {
+            add(ClawdisCameraCommand.Snap.rawValue)
+            add(ClawdisCameraCommand.Clip.rawValue)
+          }
+          if (locationMode.value != LocationMode.Off) {
+            add(ClawdisLocationCommand.Get.rawValue)
+          }
+        }
       val resolved =
         if (storedToken.isNullOrBlank()) {
           _statusText.value = "Pairing…"
+          val caps = buildList {
+            add(ClawdisCapability.Canvas.rawValue)
+            add(ClawdisCapability.Screen.rawValue)
+            if (cameraEnabled.value) add(ClawdisCapability.Camera.rawValue)
+            if (voiceWakeMode.value != VoiceWakeMode.Off && hasRecordAudioPermission()) {
+              add(ClawdisCapability.VoiceWake.rawValue)
+            }
+            if (locationMode.value != LocationMode.Off) {
+              add(ClawdisCapability.Location.rawValue)
+            }
+          }
+          val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
+          val advertisedVersion =
+            if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
+              "$versionName-dev"
+            } else {
+              versionName
+            }
           BridgePairingClient().pairAndHello(
             endpoint = endpoint,
-            hello = buildPairingHello(token = null),
+            hello =
+              BridgePairingClient.Hello(
+                nodeId = instanceId.value,
+                displayName = displayName.value,
+                token = null,
+                platform = "Android",
+                version = advertisedVersion,
+                deviceFamily = "Android",
+                modelIdentifier = modelIdentifier,
+                caps = caps,
+                commands = invokeCommands,
+              ),
           )
         } else {
           BridgePairingClient.PairResult(ok = true, token = storedToken.trim())
@@ -486,9 +440,38 @@ class NodeRuntime(context: Context) {
 
       val authToken = requireNotNull(resolved.token).trim()
       prefs.saveBridgeToken(authToken)
+      val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
+      val advertisedVersion =
+        if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
+          "$versionName-dev"
+        } else {
+          versionName
+        }
       session.connect(
         endpoint = endpoint,
-        hello = buildSessionHello(token = authToken),
+        hello =
+          BridgeSession.Hello(
+            nodeId = instanceId.value,
+            displayName = displayName.value,
+            token = authToken,
+            platform = "Android",
+            version = advertisedVersion,
+            deviceFamily = "Android",
+            modelIdentifier = modelIdentifier,
+            caps =
+              buildList {
+                add(ClawdisCapability.Canvas.rawValue)
+                add(ClawdisCapability.Screen.rawValue)
+                if (cameraEnabled.value) add(ClawdisCapability.Camera.rawValue)
+                if (voiceWakeMode.value != VoiceWakeMode.Off && hasRecordAudioPermission()) {
+                  add(ClawdisCapability.VoiceWake.rawValue)
+                }
+                if (locationMode.value != LocationMode.Off) {
+                  add(ClawdisCapability.Location.rawValue)
+                }
+              },
+            commands = invokeCommands,
+          ),
       )
     }
   }
@@ -928,17 +911,6 @@ class NodeRuntime(context: Context) {
           _screenRecordActive.value = false
         }
       }
-      ClawdisSmsCommand.Send.rawValue -> {
-        val res = sms.send(paramsJson)
-        if (res.ok) {
-          BridgeSession.InvokeResult.ok(res.payloadJson)
-        } else {
-          val error = res.error ?: "SMS_SEND_FAILED"
-          val idx = error.indexOf(':')
-          val code = if (idx > 0) error.substring(0, idx).trim() else "SMS_SEND_FAILED"
-          BridgeSession.InvokeResult.error(code = code, message = error)
-        }
-      }
       else ->
         BridgeSession.InvokeResult.error(
           code = "INVALID_REQUEST",

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

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

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

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

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

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

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

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

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

@@ -149,23 +149,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
       // Status text is handled by NodeRuntime.
     }
 
-  val smsPermissionAvailable =
-    remember {
-      context.packageManager?.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) == true
-    }
-  var smsPermissionGranted by
-    remember {
-      mutableStateOf(
-        ContextCompat.checkSelfPermission(context, Manifest.permission.SEND_SMS) ==
-          PackageManager.PERMISSION_GRANTED,
-      )
-    }
-  val smsPermissionLauncher =
-    rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
-      smsPermissionGranted = granted
-      viewModel.refreshBridgeHello()
-    }
-
   fun setCameraEnabledChecked(checked: Boolean) {
     if (!checked) {
       viewModel.setCameraEnabled(false)
@@ -250,7 +233,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
     contentPadding = PaddingValues(16.dp),
     verticalArrangement = Arrangement.spacedBy(6.dp),
   ) {
-    // Order parity: Node → Bridge → Voice → Camera → Messaging → Location → Screen.
+    // Order parity: Node → Bridge → Voice → Camera → Location → Screen.
     item { Text("Node", style = MaterialTheme.typography.titleSmall) }
     item {
       OutlinedTextField(
@@ -524,46 +507,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
 
     item { HorizontalDivider() }
 
-    // Messaging
-    item { Text("Messaging", style = MaterialTheme.typography.titleSmall) }
-    item {
-      val buttonLabel =
-        when {
-          !smsPermissionAvailable -> "Unavailable"
-          smsPermissionGranted -> "Manage"
-          else -> "Grant"
-        }
-      ListItem(
-        headlineContent = { Text("SMS Permission") },
-        supportingContent = {
-          Text(
-            if (smsPermissionAvailable) {
-              "Allow the bridge to send SMS from this device."
-            } else {
-              "SMS requires a device with telephony hardware."
-            },
-          )
-        },
-        trailingContent = {
-          Button(
-            onClick = {
-              if (!smsPermissionAvailable) return@Button
-              if (smsPermissionGranted) {
-                openAppSettings(context)
-              } else {
-                smsPermissionLauncher.launch(Manifest.permission.SEND_SMS)
-              }
-            },
-            enabled = smsPermissionAvailable,
-          ) {
-            Text(buttonLabel)
-          }
-        },
-      )
-    }
-
-    item { HorizontalDivider() }
-
     // Location
     item { Text("Location", style = MaterialTheme.typography.titleSmall) }
     item {

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

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

apps/macos/Sources/Clawdis/InstancesSettings.swift

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

apps/macos/Sources/ClawdisProtocol/GatewayModels.swift

@@ -646,7 +646,6 @@ public struct SessionsPatchParams: Codable {
     public let key: String
     public let thinkinglevel: AnyCodable?
     public let verboselevel: AnyCodable?
-    public let elevatedlevel: AnyCodable?
     public let model: AnyCodable?
     public let sendpolicy: AnyCodable?
     public let groupactivation: AnyCodable?
@@ -655,7 +654,6 @@ public struct SessionsPatchParams: Codable {
         key: String,
         thinkinglevel: AnyCodable?,
         verboselevel: AnyCodable?,
-        elevatedlevel: AnyCodable?,
         model: AnyCodable?,
         sendpolicy: AnyCodable?,
         groupactivation: AnyCodable?
@@ -663,7 +661,6 @@ public struct SessionsPatchParams: Codable {
         self.key = key
         self.thinkinglevel = thinkinglevel
         self.verboselevel = verboselevel
-        self.elevatedlevel = elevatedlevel
         self.model = model
         self.sendpolicy = sendpolicy
         self.groupactivation = groupactivation
@@ -672,7 +669,6 @@ public struct SessionsPatchParams: Codable {
         case key
         case thinkinglevel = "thinkingLevel"
         case verboselevel = "verboseLevel"
-        case elevatedlevel = "elevatedLevel"
         case model
         case sendpolicy = "sendPolicy"
         case groupactivation = "groupActivation"
@@ -875,7 +871,7 @@ public struct WizardStep: Codable {
     }
 }
 
-public struct WizardNextResult: Codable {
+public struct WizardNextResult: Codable, Sendable {
     public let done: Bool
     public let step: [String: AnyCodable]?
     public let status: AnyCodable?
@@ -900,7 +896,7 @@ public struct WizardNextResult: Codable {
     }
 }
 
-public struct WizardStartResult: Codable {
+public struct WizardStartResult: Codable, Sendable {
     public let sessionid: String
     public let done: Bool
     public let step: [String: AnyCodable]?
@@ -929,7 +925,7 @@ public struct WizardStartResult: Codable {
     }
 }
 
-public struct WizardStatusResult: Codable {
+public struct WizardStatusResult: Codable, Sendable {
     public let status: AnyCodable
     public let error: String?
 

docs/background-process.md

@@ -16,7 +16,6 @@ Key parameters:
 - `yieldMs` (default 10000): auto‑background after this delay
 - `background` (bool): background immediately
 - `timeout` (seconds, default 1800): kill the process after this timeout
-- `elevated` (bool): run on host if elevated mode is enabled/allowed
 - Need a real TTY? Use the tmux skill.
 - `workdir`, `env`
 

docs/bash.md

@@ -15,7 +15,6 @@ Run shell commands in the workspace. Supports foreground + background execution
 - `yieldMs` (default 10000): auto-background after delay
 - `background` (bool): background immediately
 - `timeout` (seconds, default 1800): kill on expiry
-- `elevated` (bool): run on host if elevated mode is enabled/allowed
 - Need a real TTY? Use the tmux skill.
 
 ## Examples

docs/browser.md

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

docs/configuration.md

@@ -292,63 +292,6 @@ Reaction notification modes:
 - `all`: all reactions on all messages.
 - `allowlist`: reactions from `guilds.<id>.users` on all messages (empty list disables).
 
-### `slack` (socket mode)
-
-Slack runs in Socket Mode and requires both a bot token and app token:
-
-```json5
-{
-  slack: {
-    enabled: true,
-    botToken: "xoxb-...",
-    appToken: "xapp-...",
-    dm: {
-      enabled: true,
-      allowFrom: ["U123", "U456", "*"],
-      groupEnabled: false,
-      groupChannels: ["G123"]
-    },
-    channels: {
-      C123: { allow: true, requireMention: true },
-      "#general": { allow: true, requireMention: false }
-    },
-    reactionNotifications: "own", // off | own | all | allowlist
-    reactionAllowlist: ["U123"],
-    actions: {
-      reactions: true,
-      messages: true,
-      pins: true,
-      memberInfo: true,
-      emojiList: true
-    },
-    slashCommand: {
-      enabled: true,
-      name: "clawd",
-      sessionPrefix: "slack:slash",
-      ephemeral: true
-    },
-    textChunkLimit: 4000,
-    mediaMaxMb: 20
-  }
-}
-```
-
-Clawdis starts Slack when the provider is enabled and both tokens are set (via config or `SLACK_BOT_TOKEN` + `SLACK_APP_TOKEN`). Use `user:<id>` (DM) or `channel:<id>` when specifying delivery targets for cron/CLI commands.
-
-Reaction notification modes:
-- `off`: no reaction events.
-- `own`: reactions on the bot's own messages (default).
-- `all`: all reactions on all messages.
-- `allowlist`: reactions from `slack.reactionAllowlist` on all messages (empty list disables).
-
-Slack action groups (gate `slack` tool actions):
-| Action group | Default | Notes |
-| --- | --- | --- |
-| reactions | enabled | React + list reactions |
-| messages | enabled | Read/send/edit/delete |
-| pins | enabled | Pin/unpin/list |
-| memberInfo | enabled | Member info |
-| emojiList | enabled | Custom emoji list |
 ### `imessage` (imsg CLI)
 
 Clawdis spawns `imsg rpc` (JSON-RPC over stdio). No daemon or port required.
@@ -445,7 +388,6 @@ Controls the embedded agent runtime (model/thinking/verbose/timeouts).
     },
     thinkingDefault: "low",
     verboseDefault: "off",
-    elevatedDefault: "on",
     timeoutSeconds: 600,
     mediaMaxMb: 5,
     heartbeat: {
@@ -497,31 +439,6 @@ Z.AI models are available as `zai/<model>` (e.g. `zai/glm-4.7`) and require
 - `timeoutSec`: auto-kill after this runtime (seconds, default 1800)
 - `cleanupMs`: how long to keep finished sessions in memory (ms, default 1800000)
 
-`agent.elevated` controls elevated (host) bash access:
-- `enabled`: allow elevated mode (default true)
-- `allowFrom`: per-surface allowlists (empty = disabled)
-  - `whatsapp`: E.164 numbers
-  - `telegram`: chat ids or usernames
-  - `discord`: user ids or usernames (falls back to `discord.dm.allowFrom` if omitted)
-  - `signal`: E.164 numbers
-  - `imessage`: handles/chat ids
-  - `webchat`: session ids or usernames
-
-Example:
-```json5
-{
-  agent: {
-    elevated: {
-      enabled: true,
-      allowFrom: {
-        whatsapp: ["+15555550123"],
-        discord: ["steipete", "1234567890123"]
-      }
-    }
-  }
-}
-```
-
 `agent.maxConcurrent` sets the maximum number of embedded agent runs that can
 execute in parallel across sessions. Each session is still serialized (one run
 per session key at a time). Default: 1.
@@ -704,10 +621,6 @@ Controls session scoping, idle expiry, reset triggers, and where the session sto
     resetTriggers: ["/new", "/reset"],
     store: "~/.clawdis/sessions/sessions.json",
     // mainKey is ignored; primary key is fixed to "main"
-    agentToAgent: {
-      // Max ping-pong reply turns between requester/target (0–5).
-      maxPingPongTurns: 5
-    },
     sendPolicy: {
       rules: [
         { action: "deny", match: { surface: "discord", chatType: "group" } }
@@ -719,7 +632,6 @@ Controls session scoping, idle expiry, reset triggers, and where the session sto
 ```
 
 Fields:
-- `agentToAgent.maxPingPongTurns`: max reply-back turns between requester/target (0–5, default 5).
 - `sendPolicy.default`: `allow` or `deny` fallback when no rule matches.
 - `sendPolicy.rules[]`: match by `surface` (provider), `chatType` (`direct|group|room`), or `keyPrefix` (e.g. `cron:`). First deny wins; otherwise allow.
 
@@ -775,16 +687,11 @@ Example:
 ### `browser` (clawd-managed Chrome)
 
 Clawdis can start a **dedicated, isolated** Chrome/Chromium instance for clawd and expose a small loopback control server.
-Profiles can point at a **remote** Chrome via `profiles.<name>.cdpUrl`. Remote
-profiles are attach-only (start/stop/reset are disabled).
-
-`browser.cdpUrl` remains for legacy single-profile configs and as the base
-scheme/host for profiles that only set `cdpPort`.
 
 Defaults:
 - enabled: `true`
 - control URL: `http://127.0.0.1:18791` (CDP uses `18792`)
-- CDP URL: `http://127.0.0.1:18792` (control URL + 1, legacy single-profile)
+- CDP URL: `http://127.0.0.1:18792` (control URL + 1)
 - profile color: `#FF4500` (lobster-orange)
 - Note: the control server is started by the running gateway (Clawdis.app menubar, or `clawdis gateway`).
 
@@ -793,13 +700,7 @@ Defaults:
   browser: {
     enabled: true,
     controlUrl: "http://127.0.0.1:18791",
-    // cdpUrl: "http://127.0.0.1:18792", // legacy single-profile override
-    defaultProfile: "clawd",
-    profiles: {
-      clawd: { cdpPort: 18800, color: "#FF4500" },
-      work: { cdpPort: 18801, color: "#0066CC" },
-      remote: { cdpUrl: "http://10.0.0.42:9222", color: "#00AA00" }
-    },
+    // cdpUrl: "http://127.0.0.1:18792", // override for remote CDP
     color: "#FF4500",
     // Advanced:
     // headless: false,

docs/elevated.md

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

docs/faq.md

@@ -494,7 +494,6 @@ Quick reference (send these in chat):
 | `/new` or `/reset` | Reset the session |
 | `/think <level>` | Set thinking level (off\|minimal\|low\|medium\|high) |
 | `/verbose on\|off` | Toggle verbose mode |
-| `/elevated on\|off` | Toggle elevated bash mode (approved senders only) |
 | `/activation mention\|always` | Group activation (owner-only) |
 | `/model <name>` | Switch AI model (see below) |
 | `/queue instant\|batch\|serial` | Message queuing mode |

docs/ios/connect.md

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

docs/nodes.md

@@ -110,20 +110,6 @@ Notes:
 - “Always” requires system permission; background fetch is best-effort.
 - The response includes lat/lon, accuracy (meters), and timestamp.
 
-## SMS (Android nodes)
-
-Android nodes can expose `sms.send` when the user grants **SMS** permission and the device supports telephony.
-
-Low-level invoke:
-
-```bash
-clawdis nodes invoke --node <idOrNameOrIp> --command sms.send --params '{"to":"+15555550123","message":"Hello from Clawdis"}'
-```
-
-Notes:
-- The permission prompt must be accepted on the Android device before the capability is advertised.
-- Wi-Fi-only devices without telephony will not advertise `sms.send`.
-
 ## System commands (mac node)
 
 The macOS node exposes `system.run` and `system.notify`.

docs/presence.md

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

docs/remote-gateway-readme.md

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

docs/session-tool.md

@@ -76,14 +76,11 @@ Behavior:
 - If the run fails: `{ runId, status: "error", error }`.
 - Waits via gateway `agent.wait` (server-side) so reconnects don't drop the wait.
 - Agent-to-agent message context is injected for the primary run.
-- After the primary run completes, Clawdis runs a **reply-back loop**:
-  - Round 2+ alternates between requester and target agents.
-  - Reply exactly `REPLY_SKIP` to stop the ping‑pong.
-  - Max turns is `session.agentToAgent.maxPingPongTurns` (0–5, default 5).
-- Once the loop ends, Clawdis runs the **agent‑to‑agent announce step** (target agent only):
-  - Reply exactly `ANNOUNCE_SKIP` to stay silent.
+- After the primary run completes, Clawdis starts an **agent-to-agent post step**:
+  - The agent can reply with the announcement to post to the target session.
+  - To stay silent, reply exactly `ANNOUNCE_SKIP`.
   - Any other reply is sent to the target channel.
-  - Announce step includes the original request + round‑1 reply + latest ping‑pong reply.
+  - The post step includes the original request and round‑1 reply in context.
 
 ## Provider Field
 - For groups, `provider` is the `surface` recorded on the session entry.

docs/slack.md

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

docs/thinking.md

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

docs/tools.md

@@ -21,7 +21,6 @@ Core parameters:
 - `yieldMs` (auto-background after timeout, default 10000)
 - `background` (immediate background)
 - `timeout` (seconds; kills the process if exceeded, default 1800)
-- `elevated` (bool; run on host if elevated mode is enabled/allowed)
 - Need a real TTY? Use the tmux skill.
 
 Notes:
@@ -48,23 +47,9 @@ Core actions:
 - `act` (UI actions: click/type/press/hover/drag/select/fill/resize/wait/evaluate)
 - `navigate`, `console`, `pdf`, `upload`, `dialog`
 
-Profile management:
-- `profiles` — list all browser profiles with status
-- `create-profile` — create new profile with auto-allocated port (or `cdpUrl`)
-- `delete-profile` — stop browser, delete user data, remove from config (local only)
-- `reset-profile` — kill orphan process on profile's port (local only)
-
-Common parameters:
-- `controlUrl` (defaults from config)
-- `profile` (optional; defaults to `browser.defaultProfile`)
 Notes:
 - Requires `browser.enabled=true` in `~/.clawdis/clawdis.json`.
 - Uses `browser.controlUrl` unless `controlUrl` is passed explicitly.
-- All actions accept optional `profile` parameter for multi-instance support.
-- When `profile` is omitted, uses `browser.defaultProfile` (defaults to "clawd").
-- Profile names: lowercase alphanumeric + hyphens only (max 64 chars).
-- Port range: 18800-18899 (~100 profiles max).
-- Remote profiles are attach-only (no start/stop/reset).
 - `snapshot` defaults to `ai`; use `aria` for the accessibility tree.
 - `act` requires `ref` from `snapshot --format ai`; use `evaluate` for rare CSS selector needs.
 - Avoid `act` → `wait` by default; use it only in exceptional cases (no reliable UI state to wait on).
@@ -134,8 +119,7 @@ Notes:
 - `main` is the canonical direct-chat key; global/unknown are hidden.
 - `messageLimit > 0` fetches last N messages per session (tool messages filtered).
 - `sessions_send` waits for final completion when `timeoutSeconds > 0`.
-- `sessions_send` runs a reply‑back ping‑pong (reply `REPLY_SKIP` to stop; max turns via `session.agentToAgent.maxPingPongTurns`, 0–5).
-- After the ping‑pong, the target agent runs an **announce step**; reply `ANNOUNCE_SKIP` to suppress the announcement.
+- `sessions_send` always runs a follow‑up **agent‑to‑agent post step**; reply `ANNOUNCE_SKIP` to suppress the announcement.
 
 ### `discord`
 Send Discord reactions, stickers, or polls.

docs/tui.md

@@ -51,7 +51,6 @@ Use SSH tunneling or Tailscale to reach the Gateway WS.
 - `/model <provider/model>` (or `/models`)
 - `/think <off|minimal|low|medium|high>`
 - `/verbose <on|off>`
-- `/elevated <on|off>`
 - `/activation <mention|always>`
 - `/deliver <on|off>`
 - `/new` or `/reset`

package.json

@@ -79,8 +79,6 @@
     "@mariozechner/pi-ai": "^0.32.3",
     "@mariozechner/pi-coding-agent": "^0.32.3",
     "@mariozechner/pi-tui": "^0.32.3",
-    "@slack/bolt": "^4.5.0",
-    "@slack/web-api": "^7.11.1",
     "@sinclair/typebox": "0.34.46",
     "@whiskeysockets/baileys": "7.0.0-rc.9",
     "ajv": "^8.17.1",
@@ -140,7 +138,8 @@
       "@sinclair/typebox": "0.34.46"
     },
     "patchedDependencies": {
-      "@mariozechner/pi-ai": "patches/@mariozechner__pi-ai.patch"
+      "@mariozechner/pi-ai": "patches/@mariozechner__pi-ai.patch",
+      "@mariozechner/pi-coding-agent@0.32.3": "patches/@mariozechner__pi-coding-agent@0.32.3.patch"
     }
   },
   "vitest": {

patches/@mariozechner__pi-ai.patch

@@ -1,39 +1,8 @@
 diff --git a/dist/providers/google-shared.js b/dist/providers/google-shared.js
-index 7bc0a9f5d6241f191cd607ecb37b3acac8d58267..76166a34784cbc0718d4b9bd1fa6336a6dd394ec 100644
+index ff9cbcfebfac6b4370d85dc838f5cacf2a60ed64..42096c82aec925b412258348a36ba4a7025b283b 100644
 --- a/dist/providers/google-shared.js
 +++ b/dist/providers/google-shared.js
-@@ -51,9 +51,19 @@ export function convertMessages(model, context) {
-                     parts.push({ text: sanitizeSurrogates(block.text) });
-                 }
-                 else if (block.type === "thinking") {
--                    // Thinking blocks require signatures for Claude via Antigravity.
--                    // If signature is missing (e.g. from GPT-OSS), convert to regular text with delimiters.
--                    if (block.thinkingSignature) {
-+                    // Thinking blocks handling varies by model:
-+                    // - Claude via Antigravity: requires thinkingSignature
-+                    // - Gemini: skip entirely (doesn't understand thoughtSignature, and mimics <thinking> tags)
-+                    // - Other models: convert to text with delimiters
-+                    const isGemini = model.id.toLowerCase().includes("gemini");
-+                    const isClaude = model.id.toLowerCase().includes("claude");
-+                    if (isGemini) {
-+                        // Skip thinking blocks entirely for Gemini - it doesn't support them
-+                        // and will mimic <thinking> tags if we convert to text
-+                        continue;
-+                    }
-+                    else if (block.thinkingSignature && isClaude) {
-+                        // Claude via Antigravity requires the signature
-                         parts.push({
-                             thought: true,
-                             text: sanitizeSurrogates(block.thinking),
-@@ -61,6 +71,7 @@ export function convertMessages(model, context) {
-                         });
-                     }
-                     else {
-+                        // Other models: convert to text with delimiters
-                         parts.push({
-                             text: `<thinking>\n${sanitizeSurrogates(block.thinking)}\n</thinking>`,
-                         });
-@@ -146,6 +157,77 @@ export function convertMessages(model, context) {
+@@ -140,6 +140,72 @@ export function convertMessages(model, context) {
      }
      return contents;
  }
@@ -101,17 +70,12 @@ index 7bc0a9f5d6241f191cd607ecb37b3acac8d58267..76166a34784cbc0718d4b9bd1fa6336a
 +            sanitized[key] = value;
 +        }
 +    }
-+    // Ensure type: "object" is present when properties or required exist
-+    // Google API requires type to be set when these fields are present
-+    if (('properties' in sanitized || 'required' in sanitized) && !('type' in sanitized)) {
-+        sanitized.type = 'object';
-+    }
 +    return sanitized;
 +}
  /**
   * Convert tools to Gemini function declarations format.
   */
-@@ -157,7 +239,7 @@ export function convertTools(tools) {
+@@ -151,7 +216,7 @@ export function convertTools(tools) {
              functionDeclarations: tools.map((tool) => ({
                  name: tool.name,
                  description: tool.description,

pnpm-lock.yaml

@@ -9,8 +9,11 @@ overrides:
 
 patchedDependencies:
   '@mariozechner/pi-ai':
-    hash: 628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5
+    hash: 969db6f3f4cc91fec48124e1f5e515b386b1f1bed807769d0a80c28abadbaaae
     path: patches/@mariozechner__pi-ai.patch
+  '@mariozechner/pi-coding-agent@0.32.3':
+    hash: d0d5ffa1bfda8a0f9d14a5e73a074014346d3edbdb2ffc91444d3be5119f5745
+    path: patches/@mariozechner__pi-coding-agent@0.32.3.patch
 
 importers:
 
@@ -30,22 +33,16 @@ importers:
         version: 0.32.3(ws@8.18.3)(zod@4.3.4)
       '@mariozechner/pi-ai':
         specifier: ^0.32.3
-        version: 0.32.3(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.18.3)(zod@4.3.4)
+        version: 0.32.3(patch_hash=969db6f3f4cc91fec48124e1f5e515b386b1f1bed807769d0a80c28abadbaaae)(ws@8.18.3)(zod@4.3.4)
       '@mariozechner/pi-coding-agent':
         specifier: ^0.32.3
-        version: 0.32.3(ws@8.18.3)(zod@4.3.4)
+        version: 0.32.3(patch_hash=d0d5ffa1bfda8a0f9d14a5e73a074014346d3edbdb2ffc91444d3be5119f5745)(ws@8.18.3)(zod@4.3.4)
       '@mariozechner/pi-tui':
         specifier: ^0.32.3
         version: 0.32.3
       '@sinclair/typebox':
         specifier: 0.34.46
         version: 0.34.46
-      '@slack/bolt':
-        specifier: ^4.5.0
-        version: 4.6.0(@types/express@5.0.6)
-      '@slack/web-api':
-        specifier: ^7.11.1
-        version: 7.13.0
       '@whiskeysockets/baileys':
         specifier: 7.0.0-rc.9
         version: 7.0.0-rc.9(audio-decode@2.2.3)(sharp@0.34.5)
@@ -1101,32 +1098,6 @@ packages:
   '@sinclair/typebox@0.34.46':
     resolution: {integrity: sha512-kiW7CtS/NkdvTUjkjUJo7d5JsFfbJ14YjdhDk9KoEgK6nFjKNXZPrX0jfLA8ZlET4cFLHxOZ/0vFKOP+bOxIOQ==}
 
-  '@slack/bolt@4.6.0':
-    resolution: {integrity: sha512-xPgfUs2+OXSugz54Ky07pA890+Qydk22SYToi8uGpXeHSt1JWwFJkRyd/9Vlg5I1AdfdpGXExDpwnbuN9Q/2dQ==}
-    engines: {node: '>=18', npm: '>=8.6.0'}
-    peerDependencies:
-      '@types/express': ^5.0.0
-
-  '@slack/logger@4.0.0':
-    resolution: {integrity: sha512-Wz7QYfPAlG/DR+DfABddUZeNgoeY7d1J39OCR2jR+v7VBsB8ezulDK5szTnDDPDwLH5IWhLvXIHlCFZV7MSKgA==}
-    engines: {node: '>= 18', npm: '>= 8.6.0'}
-
-  '@slack/oauth@3.0.4':
-    resolution: {integrity: sha512-+8H0g7mbrHndEUbYCP7uYyBCbwqmm3E6Mo3nfsDvZZW74zKk1ochfH/fWSvGInYNCVvaBUbg3RZBbTp0j8yJCg==}
-    engines: {node: '>=18', npm: '>=8.6.0'}
-
-  '@slack/socket-mode@2.0.5':
-    resolution: {integrity: sha512-VaapvmrAifeFLAFaDPfGhEwwunTKsI6bQhYzxRXw7BSujZUae5sANO76WqlVsLXuhVtCVrBWPiS2snAQR2RHJQ==}
-    engines: {node: '>= 18', npm: '>= 8.6.0'}
-
-  '@slack/types@2.19.0':
-    resolution: {integrity: sha512-7+QZ38HGcNh/b/7MpvPG6jnw7mliV6UmrquJLqgdxkzJgQEYUcEztvFWRU49z0x4vthF0ixL5lTK601AXrS8IA==}
-    engines: {node: '>= 12.13.0', npm: '>= 6.12.0'}
-
-  '@slack/web-api@7.13.0':
-    resolution: {integrity: sha512-ERcExbWrnkDN8ovoWWe6Wgt/usanj1dWUd18dJLpctUI4mlPS0nKt81Joh8VI+OPbNnY1lIilVt9gdMBD9U2ig==}
-    engines: {node: '>= 18', npm: '>= 8.6.0'}
-
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
@@ -1185,9 +1156,6 @@ packages:
   '@types/http-errors@2.0.5':
     resolution: {integrity: sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==}
 
-  '@types/jsonwebtoken@9.0.10':
-    resolution: {integrity: sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==}
-
   '@types/linkify-it@5.0.0':
     resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
 
@@ -1203,9 +1171,6 @@ packages:
   '@types/mime-types@2.1.4':
     resolution: {integrity: sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==}
 
-  '@types/ms@2.1.0':
-    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
-
   '@types/node@10.17.60':
     resolution: {integrity: sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==}
 
@@ -1221,9 +1186,6 @@ packages:
   '@types/range-parser@1.2.7':
     resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
 
-  '@types/retry@0.12.0':
-    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
-
   '@types/send@1.2.1':
     resolution: {integrity: sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==}
 
@@ -1398,9 +1360,6 @@ packages:
   async-mutex@0.5.0:
     resolution: {integrity: sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==}
 
-  asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
   atomic-sleep@1.0.0:
     resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
     engines: {node: '>=8.0.0'}
@@ -1415,9 +1374,6 @@ packages:
     resolution: {integrity: sha512-En9AY6EG1qYqEy5L/quryzbA4akBpJrnBZNxeKTqGHC2xT9Qc4aZ8b7CcbOMFTTc/MGdoNyp+SN4zInZNKxMYA==}
     engines: {node: '>=14'}
 
-  axios@1.13.2:
-    resolution: {integrity: sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==}
-
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
@@ -1533,10 +1489,6 @@ packages:
   color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
-  combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-
   commander@14.0.2:
     resolution: {integrity: sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==}
     engines: {node: '>=20'}
@@ -1591,10 +1543,6 @@ packages:
       supports-color:
         optional: true
 
-  delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-
   depd@2.0.0:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
@@ -1673,10 +1621,6 @@ packages:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
     engines: {node: '>= 0.4'}
 
-  es-set-tostringtag@2.1.0:
-    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
-    engines: {node: '>= 0.4'}
-
   esbuild@0.27.2:
     resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==}
     engines: {node: '>=18'}
@@ -1700,9 +1644,6 @@ packages:
     resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
     engines: {node: '>=6'}
 
-  eventemitter3@4.0.7:
-    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
-
   eventemitter3@5.0.1:
     resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
 
@@ -1759,23 +1700,10 @@ packages:
     resolution: {integrity: sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==}
     engines: {node: '>= 18.0.0'}
 
-  follow-redirects@1.15.11:
-    resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-
   foreground-child@3.3.1:
     resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
     engines: {node: '>=14'}
 
-  form-data@4.0.5:
-    resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
-    engines: {node: '>= 6'}
-
   formdata-polyfill@4.0.10:
     resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
     engines: {node: '>=12.20.0'}
@@ -1872,10 +1800,6 @@ packages:
     resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
     engines: {node: '>= 0.4'}
 
-  has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
-    engines: {node: '>= 0.4'}
-
   hashery@1.4.0:
     resolution: {integrity: sha512-Wn2i1In6XFxl8Az55kkgnFRiAlIAushzh26PTjL2AKtQcEfXrcLa7Hn5QOWGZEf3LU057P9TwwZjFyxfS1VuvQ==}
     engines: {node: '>=20'}
@@ -1929,9 +1853,6 @@ packages:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
 
-  is-electron@2.2.2:
-    resolution: {integrity: sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg==}
-
   is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -1951,10 +1872,6 @@ packages:
   is-promise@4.0.0:
     resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
 
-  is-stream@2.0.1:
-    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: '>=8'}
-
   is-url@1.2.4:
     resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
 
@@ -2018,10 +1935,6 @@ packages:
   jsonc-parser@3.3.1:
     resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==}
 
-  jsonwebtoken@9.0.3:
-    resolution: {integrity: sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==}
-    engines: {node: '>=12', npm: '>=6'}
-
   jszip@3.10.1:
     resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
 
@@ -2123,27 +2036,6 @@ packages:
   lit@3.3.2:
     resolution: {integrity: sha512-NF9zbsP79l4ao2SNrH3NkfmFgN/hBYSQo90saIVI1o5GpjAdCPVstVzO1MrLOakHoEhYkrtRjPK6Ob521aoYWQ==}
 
-  lodash.includes@4.3.0:
-    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
-
-  lodash.isboolean@3.0.3:
-    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
-
-  lodash.isinteger@4.0.4:
-    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
-
-  lodash.isnumber@3.0.3:
-    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
-
-  lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-
-  lodash.isstring@4.0.1:
-    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
-
-  lodash.once@4.1.1:
-    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
-
   lodash.snakecase@4.1.1:
     resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
 
@@ -2223,18 +2115,10 @@ packages:
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
 
-  mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
-
   mime-db@1.54.0:
     resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
     engines: {node: '>= 0.6'}
 
-  mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
-
   mime-types@3.0.2:
     resolution: {integrity: sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==}
     engines: {node: '>=18'}
@@ -2280,6 +2164,9 @@ packages:
     resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
     engines: {node: '>= 0.6'}
 
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
   node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
@@ -2363,26 +2250,10 @@ packages:
       oxlint-tsgolint:
         optional: true
 
-  p-finally@1.0.0:
-    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
-    engines: {node: '>=4'}
-
-  p-queue@6.6.2:
-    resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
-    engines: {node: '>=8'}
-
   p-queue@9.0.1:
     resolution: {integrity: sha512-RhBdVhSwJb7Ocn3e8ULk4NMwBEuOxe+1zcgphUy9c2e5aR/xbEsdVXxHJ3lynw6Qiqu7OINEyHlZkiblEpaq7w==}
     engines: {node: '>=20'}
 
-  p-retry@4.6.2:
-    resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}
-    engines: {node: '>=8'}
-
-  p-timeout@3.2.0:
-    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
-    engines: {node: '>=8'}
-
   p-timeout@7.0.1:
     resolution: {integrity: sha512-AxTM2wDGORHGEkPCt8yqxOTMgpfbEHqF51f/5fJCmwFC3C/zNcGT63SymH2ttOAaiIws2zVg4+izQCjrakcwHg==}
     engines: {node: '>=20'}
@@ -2506,9 +2377,6 @@ packages:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
 
-  proxy-from-env@1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-
   punycode.js@2.3.1:
     resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
     engines: {node: '>=6'}
@@ -2582,10 +2450,6 @@ packages:
     resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
     engines: {node: '>= 4'}
 
-  retry@0.13.1:
-    resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==}
-    engines: {node: '>= 4'}
-
   reusify@1.1.0:
     resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
@@ -2833,10 +2697,6 @@ packages:
     resolution: {integrity: sha512-XuELoRpMR+sq8fuWwX7P0bcj+PRNiicOKDEb3fGNURhxWVyykCi9BNq7c4uVz7h7P0sj8qgBsr5SWS6yBClq3g==}
     engines: {node: '>=16'}
 
-  tsscmp@1.0.6:
-    resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
-    engines: {node: '>=0.6.x'}
-
   tsx@4.21.0:
     resolution: {integrity: sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==}
     engines: {node: '>=18.0.0'}
@@ -3487,7 +3347,7 @@ snapshots:
 
   '@mariozechner/pi-agent-core@0.32.3(ws@8.18.3)(zod@4.3.4)':
     dependencies:
-      '@mariozechner/pi-ai': 0.32.3(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.18.3)(zod@4.3.4)
+      '@mariozechner/pi-ai': 0.32.3(patch_hash=969db6f3f4cc91fec48124e1f5e515b386b1f1bed807769d0a80c28abadbaaae)(ws@8.18.3)(zod@4.3.4)
       '@mariozechner/pi-tui': 0.32.3
     transitivePeerDependencies:
       - '@modelcontextprotocol/sdk'
@@ -3497,7 +3357,7 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-ai@0.32.3(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.18.3)(zod@4.3.4)':
+  '@mariozechner/pi-ai@0.32.3(patch_hash=969db6f3f4cc91fec48124e1f5e515b386b1f1bed807769d0a80c28abadbaaae)(ws@8.18.3)(zod@4.3.4)':
     dependencies:
       '@anthropic-ai/sdk': 0.71.2(zod@4.3.4)
       '@google/genai': 1.34.0
@@ -3517,10 +3377,10 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-coding-agent@0.32.3(ws@8.18.3)(zod@4.3.4)':
+  '@mariozechner/pi-coding-agent@0.32.3(patch_hash=d0d5ffa1bfda8a0f9d14a5e73a074014346d3edbdb2ffc91444d3be5119f5745)(ws@8.18.3)(zod@4.3.4)':
     dependencies:
       '@mariozechner/pi-agent-core': 0.32.3(ws@8.18.3)(zod@4.3.4)
-      '@mariozechner/pi-ai': 0.32.3(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.18.3)(zod@4.3.4)
+      '@mariozechner/pi-ai': 0.32.3(patch_hash=969db6f3f4cc91fec48124e1f5e515b386b1f1bed807769d0a80c28abadbaaae)(ws@8.18.3)(zod@4.3.4)
       '@mariozechner/pi-tui': 0.32.3
       chalk: 5.6.2
       cli-highlight: 2.1.11
@@ -3766,71 +3626,6 @@ snapshots:
 
   '@sinclair/typebox@0.34.46': {}
 
-  '@slack/bolt@4.6.0(@types/express@5.0.6)':
-    dependencies:
-      '@slack/logger': 4.0.0
-      '@slack/oauth': 3.0.4
-      '@slack/socket-mode': 2.0.5
-      '@slack/types': 2.19.0
-      '@slack/web-api': 7.13.0
-      '@types/express': 5.0.6
-      axios: 1.13.2
-      express: 5.2.1
-      path-to-regexp: 8.3.0
-      raw-body: 3.0.2
-      tsscmp: 1.0.6
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - supports-color
-      - utf-8-validate
-
-  '@slack/logger@4.0.0':
-    dependencies:
-      '@types/node': 25.0.3
-
-  '@slack/oauth@3.0.4':
-    dependencies:
-      '@slack/logger': 4.0.0
-      '@slack/web-api': 7.13.0
-      '@types/jsonwebtoken': 9.0.10
-      '@types/node': 25.0.3
-      jsonwebtoken: 9.0.3
-    transitivePeerDependencies:
-      - debug
-
-  '@slack/socket-mode@2.0.5':
-    dependencies:
-      '@slack/logger': 4.0.0
-      '@slack/web-api': 7.13.0
-      '@types/node': 25.0.3
-      '@types/ws': 8.18.1
-      eventemitter3: 5.0.1
-      ws: 8.18.3
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - utf-8-validate
-
-  '@slack/types@2.19.0': {}
-
-  '@slack/web-api@7.13.0':
-    dependencies:
-      '@slack/logger': 4.0.0
-      '@slack/types': 2.19.0
-      '@types/node': 25.0.3
-      '@types/retry': 0.12.0
-      axios: 1.13.2
-      eventemitter3: 5.0.1
-      form-data: 4.0.5
-      is-electron: 2.2.2
-      is-stream: 2.0.1
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      retry: 0.13.1
-    transitivePeerDependencies:
-      - debug
-
   '@standard-schema/spec@1.1.0': {}
 
   '@testing-library/dom@10.4.1':
@@ -3908,11 +3703,6 @@ snapshots:
 
   '@types/http-errors@2.0.5': {}
 
-  '@types/jsonwebtoken@9.0.10':
-    dependencies:
-      '@types/ms': 2.1.0
-      '@types/node': 25.0.3
-
   '@types/linkify-it@5.0.0': {}
 
   '@types/long@4.0.2': {}
@@ -3926,8 +3716,6 @@ snapshots:
 
   '@types/mime-types@2.1.4': {}
 
-  '@types/ms@2.1.0': {}
-
   '@types/node@10.17.60': {}
 
   '@types/node@25.0.3':
@@ -3940,8 +3728,6 @@ snapshots:
 
   '@types/range-parser@1.2.7': {}
 
-  '@types/retry@0.12.0': {}
-
   '@types/send@1.2.1':
     dependencies:
       '@types/node': 25.0.3
@@ -4175,8 +3961,6 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  asynckit@0.4.0: {}
-
   atomic-sleep@1.0.0: {}
 
   audio-buffer@5.0.0:
@@ -4197,14 +3981,6 @@ snapshots:
   audio-type@2.2.1:
     optional: true
 
-  axios@1.13.2:
-    dependencies:
-      follow-redirects: 1.15.11
-      form-data: 4.0.5
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-
   balanced-match@1.0.2: {}
 
   balanced-match@3.0.1: {}
@@ -4337,10 +4113,6 @@ snapshots:
 
   color-name@1.1.4: {}
 
-  combined-stream@1.0.8:
-    dependencies:
-      delayed-stream: 1.0.0
-
   commander@14.0.2: {}
 
   commander@8.3.0: {}
@@ -4377,8 +4149,6 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
-  delayed-stream@1.0.0: {}
-
   depd@2.0.0: {}
 
   dequal@2.0.3:
@@ -4452,13 +4222,6 @@ snapshots:
     dependencies:
       es-errors: 1.3.0
 
-  es-set-tostringtag@2.1.0:
-    dependencies:
-      es-errors: 1.3.0
-      get-intrinsic: 1.3.0
-      has-tostringtag: 1.0.2
-      hasown: 2.0.2
-
   esbuild@0.27.2:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.27.2
@@ -4500,8 +4263,6 @@ snapshots:
 
   event-target-shim@5.0.1: {}
 
-  eventemitter3@4.0.7: {}
-
   eventemitter3@5.0.1: {}
 
   events@3.3.0: {}
@@ -4592,21 +4353,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  follow-redirects@1.15.11: {}
-
   foreground-child@3.3.1:
     dependencies:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
-  form-data@4.0.5:
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      es-set-tostringtag: 2.1.0
-      hasown: 2.0.2
-      mime-types: 2.1.35
-
   formdata-polyfill@4.0.10:
     dependencies:
       fetch-blob: 3.2.0
@@ -4727,10 +4478,6 @@ snapshots:
 
   has-symbols@1.1.0: {}
 
-  has-tostringtag@1.0.2:
-    dependencies:
-      has-symbols: 1.1.0
-
   hashery@1.4.0:
     dependencies:
       hookified: 1.14.0
@@ -4780,8 +4527,6 @@ snapshots:
     dependencies:
       binary-extensions: 2.3.0
 
-  is-electron@2.2.2: {}
-
   is-extglob@2.1.1: {}
 
   is-fullwidth-code-point@3.0.0: {}
@@ -4794,8 +4539,6 @@ snapshots:
 
   is-promise@4.0.0: {}
 
-  is-stream@2.0.1: {}
-
   is-url@1.2.4: {}
 
   isarray@1.0.0: {}
@@ -4857,19 +4600,6 @@ snapshots:
 
   jsonc-parser@3.3.1: {}
 
-  jsonwebtoken@9.0.3:
-    dependencies:
-      jws: 4.0.1
-      lodash.includes: 4.3.0
-      lodash.isboolean: 3.0.3
-      lodash.isinteger: 4.0.4
-      lodash.isnumber: 3.0.3
-      lodash.isplainobject: 4.0.6
-      lodash.isstring: 4.0.1
-      lodash.once: 4.1.1
-      ms: 2.1.3
-      semver: 7.7.3
-
   jszip@3.10.1:
     dependencies:
       lie: 3.3.0
@@ -4970,20 +4700,6 @@ snapshots:
       lit-element: 4.2.2
       lit-html: 3.3.2
 
-  lodash.includes@4.3.0: {}
-
-  lodash.isboolean@3.0.3: {}
-
-  lodash.isinteger@4.0.4: {}
-
-  lodash.isnumber@3.0.3: {}
-
-  lodash.isplainobject@4.0.6: {}
-
-  lodash.isstring@4.0.1: {}
-
-  lodash.once@4.1.1: {}
-
   lodash.snakecase@4.1.1: {}
 
   lodash@4.17.21: {}
@@ -5047,14 +4763,8 @@ snapshots:
       braces: 3.0.3
       picomatch: 2.3.1
 
-  mime-db@1.52.0: {}
-
   mime-db@1.54.0: {}
 
-  mime-types@2.1.35:
-    dependencies:
-      mime-db: 1.52.0
-
   mime-types@3.0.2:
     dependencies:
       mime-db: 1.54.0
@@ -5104,6 +4814,8 @@ snapshots:
 
   negotiator@1.0.0: {}
 
+  node-addon-api@7.1.1: {}
+
   node-domexception@1.0.0: {}
 
   node-fetch@2.7.0:
@@ -5180,27 +4892,11 @@ snapshots:
       '@oxlint/win32-x64': 1.36.0
       oxlint-tsgolint: 0.10.1
 
-  p-finally@1.0.0: {}
-
-  p-queue@6.6.2:
-    dependencies:
-      eventemitter3: 4.0.7
-      p-timeout: 3.2.0
-
   p-queue@9.0.1:
     dependencies:
       eventemitter3: 5.0.1
       p-timeout: 7.0.1
 
-  p-retry@4.6.2:
-    dependencies:
-      '@types/retry': 0.12.0
-      retry: 0.13.1
-
-  p-timeout@3.2.0:
-    dependencies:
-      p-finally: 1.0.0
-
   p-timeout@7.0.1: {}
 
   package-json-from-dist@1.0.1: {}
@@ -5340,8 +5036,6 @@ snapshots:
       forwarded: 0.2.0
       ipaddr.js: 1.9.1
 
-  proxy-from-env@1.1.0: {}
-
   punycode.js@2.3.1: {}
 
   qified@0.5.3:
@@ -5428,8 +5122,6 @@ snapshots:
 
   retry@0.12.0: {}
 
-  retry@0.13.1: {}
-
   reusify@1.1.0: {}
 
   rimraf@5.0.10:
@@ -5740,8 +5432,6 @@ snapshots:
 
   tslog@4.10.2: {}
 
-  tsscmp@1.0.6: {}
-
   tsx@4.21.0:
     dependencies:
       esbuild: 0.27.2

scripts/sandbox-browser-entrypoint.sh

@@ -2,9 +2,6 @@
 set -euo pipefail
 
 export DISPLAY=:1
-export HOME=/tmp/clawdis-home
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_CACHE_HOME="${HOME}/.cache"
 
 CDP_PORT="${CLAWDIS_BROWSER_CDP_PORT:-9222}"
 VNC_PORT="${CLAWDIS_BROWSER_VNC_PORT:-5900}"
@@ -12,7 +9,7 @@ NOVNC_PORT="${CLAWDIS_BROWSER_NOVNC_PORT:-6080}"
 ENABLE_NOVNC="${CLAWDIS_BROWSER_ENABLE_NOVNC:-1}"
 HEADLESS="${CLAWDIS_BROWSER_HEADLESS:-0}"
 
-mkdir -p "${HOME}" "${HOME}/.chrome" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}"
+mkdir -p /workspace/.chrome
 
 Xvfb :1 -screen 0 1280x800x24 -ac -nolisten tcp &
 
@@ -28,14 +25,12 @@ fi
 CHROME_ARGS+=(
   "--remote-debugging-address=0.0.0.0"
   "--remote-debugging-port=${CDP_PORT}"
-  "--user-data-dir=${HOME}/.chrome"
+  "--user-data-dir=/workspace/.chrome"
   "--no-first-run"
   "--no-default-browser-check"
   "--disable-dev-shm-usage"
   "--disable-background-networking"
   "--disable-features=TranslateUI"
-  "--disable-breakpad"
-  "--disable-crash-reporter"
   "--metrics-recording-only"
   "--no-sandbox"
 )

scripts/sandbox-common-setup.sh

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-BASE_IMAGE="${BASE_IMAGE:-clawdis-sandbox:bookworm-slim}"
-TARGET_IMAGE="${TARGET_IMAGE:-clawdis-sandbox-common:bookworm-slim}"
-PACKAGES="${PACKAGES:-curl wget jq coreutils grep nodejs npm python3 git ca-certificates golang-go rustc cargo unzip pkg-config libasound2-dev build-essential file}"
-INSTALL_PNPM="${INSTALL_PNPM:-1}"
-INSTALL_BUN="${INSTALL_BUN:-1}"
-BUN_INSTALL_DIR="${BUN_INSTALL_DIR:-/opt/bun}"
-INSTALL_BREW="${INSTALL_BREW:-1}"
-BREW_INSTALL_DIR="${BREW_INSTALL_DIR:-/home/linuxbrew/.linuxbrew}"
-
-if ! docker image inspect "${BASE_IMAGE}" >/dev/null 2>&1; then
-  echo "Base image missing: ${BASE_IMAGE}"
-  echo "Building base image via scripts/sandbox-setup.sh..."
-  scripts/sandbox-setup.sh
-fi
-
-echo "Building ${TARGET_IMAGE} with: ${PACKAGES}"
-
-docker build \
-  -t "${TARGET_IMAGE}" \
-  --build-arg INSTALL_PNPM="${INSTALL_PNPM}" \
-  --build-arg INSTALL_BUN="${INSTALL_BUN}" \
-  --build-arg BUN_INSTALL_DIR="${BUN_INSTALL_DIR}" \
-  --build-arg INSTALL_BREW="${INSTALL_BREW}" \
-  --build-arg BREW_INSTALL_DIR="${BREW_INSTALL_DIR}" \
-  - <<EOF
-FROM ${BASE_IMAGE}
-ENV DEBIAN_FRONTEND=noninteractive
-ARG INSTALL_PNPM=1
-ARG INSTALL_BUN=1
-ARG BUN_INSTALL_DIR=/opt/bun
-ARG INSTALL_BREW=1
-ARG BREW_INSTALL_DIR=/home/linuxbrew/.linuxbrew
-ENV BUN_INSTALL=\${BUN_INSTALL_DIR}
-ENV HOMEBREW_PREFIX="\${BREW_INSTALL_DIR}"
-ENV HOMEBREW_CELLAR="\${BREW_INSTALL_DIR}/Cellar"
-ENV HOMEBREW_REPOSITORY="\${BREW_INSTALL_DIR}/Homebrew"
-ENV PATH="\${BUN_INSTALL_DIR}/bin:\${BREW_INSTALL_DIR}/bin:\${BREW_INSTALL_DIR}/sbin:\${PATH}"
-RUN apt-get update \\
-  && apt-get install -y --no-install-recommends ${PACKAGES} \\
-  && rm -rf /var/lib/apt/lists/*
-RUN if [ "\${INSTALL_PNPM}" = "1" ]; then npm install -g pnpm; fi
-RUN if [ "\${INSTALL_BUN}" = "1" ]; then \\
-  curl -fsSL https://bun.sh/install | bash; \\
-  ln -sf "\${BUN_INSTALL_DIR}/bin/bun" /usr/local/bin/bun; \\
-fi
-RUN if [ "\${INSTALL_BREW}" = "1" ]; then \\
-  if ! id -u linuxbrew >/dev/null 2>&1; then useradd -m -s /bin/bash linuxbrew; fi; \\
-  mkdir -p "\${BREW_INSTALL_DIR}"; \\
-  chown -R linuxbrew:linuxbrew "\$(dirname "\${BREW_INSTALL_DIR}")"; \\
-  su - linuxbrew -c "NONINTERACTIVE=1 CI=1 /bin/bash -c '\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)'"; \\
-  if [ ! -e "\${BREW_INSTALL_DIR}/Library" ]; then ln -s "\${BREW_INSTALL_DIR}/Homebrew/Library" "\${BREW_INSTALL_DIR}/Library"; fi; \\
-  if [ ! -x "\${BREW_INSTALL_DIR}/bin/brew" ]; then echo "brew install failed"; exit 1; fi; \\
-  ln -sf "\${BREW_INSTALL_DIR}/bin/brew" /usr/local/bin/brew; \\
-fi
-EOF
-
-cat <<NOTE
-Built ${TARGET_IMAGE}.
-To use it, set agent.sandbox.docker.image to "${TARGET_IMAGE}" and restart.
-If you want a clean re-create, remove old sandbox containers:
-  docker rm -f \$(docker ps -aq --filter label=clawdis.sandbox=1)
-NOTE

skills/clawdhub/SKILL.md

@@ -1,53 +0,0 @@
----
-name: clawdhub
-description: Use the ClawdHub CLI to search, install, update, and publish agent skills from clawdhub.com. Use when you need to fetch new skills on the fly, sync installed skills to latest or a specific version, or publish new/updated skill folders with the npm-installed clawdhub CLI.
-metadata: {"clawdis":{"requires":{"bins":["clawdhub"]},"install":[{"id":"node","kind":"node","package":"clawdhub","bins":["clawdhub"],"label":"Install ClawdHub CLI (npm)"}]}}
----
-
-# ClawdHub CLI
-
-Install
-```bash
-npm i -g clawdhub
-```
-
-Auth (publish)
-```bash
-clawdhub login
-clawdhub whoami
-```
-
-Search
-```bash
-clawdhub search "postgres backups"
-```
-
-Install
-```bash
-clawdhub install my-skill
-clawdhub install my-skill --version 1.2.3
-```
-
-Update (hash-based match + upgrade)
-```bash
-clawdhub update my-skill
-clawdhub update my-skill --version 1.2.3
-clawdhub update --all
-clawdhub update my-skill --force
-clawdhub update --all --no-input --force
-```
-
-List
-```bash
-clawdhub list
-```
-
-Publish
-```bash
-clawdhub publish ./my-skill --slug my-skill --name "My Skill" --version 1.2.0 --changelog "Fixes + docs"
-```
-
-Notes
-- Default registry: https://clawdhub.com (override with CLAWDHUB_REGISTRY or --registry)
-- Default workdir: cwd; install dir: ./skills (override with --workdir / --dir)
-- Update command hashes local files, resolves matching version, and upgrades to latest unless --version is set

skills/coding-agent/SKILL.md

@@ -205,71 +205,3 @@ git worktree remove /tmp/issue-99
 6. **Parallel is OK** — run many Codex processes at once for batch work
 7. **NEVER start Codex in ~/clawd/** — it'll read your soul docs and get weird ideas about the org chart! Use the target project dir or /tmp for blank slate chats
 8. **NEVER checkout branches in ~/Projects/clawdis/** — that's the LIVE Clawdis instance! Clone to /tmp or use git worktree for PR reviews
-
----
-
-## PR Template (The Razor Standard)
-
-When submitting PRs to external repos, use this format for quality & maintainer-friendliness:
-
-````markdown
-## Original Prompt
-[Exact request/problem statement]
-
-## What this does
-[High-level description]
-
-**Features:**
-- [Key feature 1]
-- [Key feature 2]
-
-**Example usage:**
-```bash
-# Example
-command example
-```
-````
-
-## Feature intent (maintainer-friendly)
-[Why useful, how it fits, workflows it enables]
-
-## Prompt history (timestamped)
-- YYYY-MM-DD HH:MM UTC: [Step 1]
-- YYYY-MM-DD HH:MM UTC: [Step 2]
-
-## How I tested
-**Manual verification:**
-1. [Test step] - Output: `[result]`
-2. [Test step] - Result: [result]
-
-**Files tested:**
-- [Detail]
-- [Edge cases]
-
-## Session logs (implementation)
-- [What was researched]
-- [What was discovered]
-- [Time spent]
-
-## Implementation details
-**New files:**
-- `path/file.ts` - [description]
-
-**Modified files:**
-- `path/file.ts` - [change]
-
-**Technical notes:**
-- [Detail 1]
-- [Detail 2]
-
----
-*Submitted by Razor 🥷 - Mariano's AI agent*
-```
-
-**Key principles:**
-1. Human-written description (no AI slop)
-2. Feature intent for maintainers
-3. Timestamped prompt history
-4. Session logs if using Codex/agent
-
-**Example:** https://github.com/steipete/bird/pull/22

skills/discord/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: discord
-description: Use when you need to control Discord from Clawdis via the discord tool: send messages, react, post or upload stickers, upload emojis, run polls, manage threads/pins/search, fetch permissions or member/role/channel info, or handle moderation actions in Discord DMs or channels.
+description: Use when you need to control Discord from Clawdis via the discord tool: send messages, react, post stickers, run polls, manage threads/pins/search, fetch permissions or member/role/channel info, or handle moderation actions in Discord DMs or channels.
 ---
 
 # Discord Actions
@@ -15,8 +15,6 @@ Use `discord` to manage messages, reactions, threads, polls, and moderation. You
 - For stickers/polls/sendMessage: a `to` target (`channel:<id>` or `user:<id>`). Optional `content` text.
 - Polls also need a `question` plus 2–10 `answers`.
 - For media: `mediaUrl` with `file:///path` for local files or `https://...` for remote.
-- For emoji uploads: `guildId`, `name`, `mediaUrl`, optional `roleIds` (limit 256KB, PNG/JPG/GIF).
-- For sticker uploads: `guildId`, `name`, `description`, `tags`, `mediaUrl` (limit 512KB, PNG/APNG/Lottie JSON).
 
 Message context lines include `discord message id` and `channel` fields you can reuse directly.
 
@@ -60,37 +58,6 @@ Message context lines include `discord message id` and `channel` fields you can
 - Up to 3 sticker IDs per message.
 - `to` can be `user:<id>` for DMs.
 
-### Upload a custom emoji
-
-```json
-{
-  "action": "emojiUpload",
-  "guildId": "999",
-  "name": "party_blob",
-  "mediaUrl": "file:///tmp/party.png",
-  "roleIds": ["222"]
-}
-```
-
-- Emoji images must be PNG/JPG/GIF and <= 256KB.
-- `roleIds` is optional; omit to make the emoji available to everyone.
-
-### Upload a sticker
-
-```json
-{
-  "action": "stickerUpload",
-  "guildId": "999",
-  "name": "clawdis_wave",
-  "description": "Clawdis waving hello",
-  "tags": "👋",
-  "mediaUrl": "file:///tmp/wave.png"
-}
-```
-
-- Stickers require `name`, `description`, and `tags`.
-- Uploads must be PNG/APNG/Lottie JSON and <= 512KB.
-
 ### Create a poll
 
 ```json
@@ -121,7 +88,6 @@ Message context lines include `discord message id` and `channel` fields you can
 - React with ✅/⚠️ to mark status updates.
 - Post a quick poll for release decisions or meeting times.
 - Send celebratory stickers after successful deploys.
-- Upload new emojis/stickers for release moments.
 - Run weekly “priority check” polls in team channels.
 - DM stickers as acknowledgements when a user’s request is completed.
 
@@ -130,7 +96,6 @@ Message context lines include `discord message id` and `channel` fields you can
 Use `discord.actions.*` to disable action groups:
 - `reactions` (react + reactions list + emojiList)
 - `stickers`, `polls`, `permissions`, `messages`, `threads`, `pins`, `search`
-- `emojiUploads`, `stickerUploads`
 - `memberInfo`, `roleInfo`, `channelInfo`, `voiceStatus`, `events`
 - `roles` (role add/remove, default `false`)
 - `moderation` (timeout/kick/ban, default `false`)

skills/mcporter/SKILL.md

@@ -1,38 +1,27 @@
 ---
 name: mcporter
-description: Use the mcporter CLI to list, configure, auth, and call MCP servers/tools directly (HTTP or stdio), including ad-hoc servers, config edits, and CLI/type generation.
+description: Manage and call MCP servers (list, call, auth, daemon).
 homepage: http://mcporter.dev
 metadata: {"clawdis":{"emoji":"📦","requires":{"bins":["mcporter"]},"install":[{"id":"node","kind":"node","package":"mcporter","bins":["mcporter"],"label":"Install mcporter (node)"}]}}
 ---
 
 # mcporter
 
-Use `mcporter` to work with MCP servers directly.
+Use `mcporter` to list MCP servers and call tools.
 
 Quick start
 - `mcporter list`
 - `mcporter list <server> --schema`
-- `mcporter call <server.tool> key=value`
+- `mcporter call <server.tool> arg=value`
 
-Call tools
-- Selector: `mcporter call linear.list_issues team=ENG limit:5`
-- Function syntax: `mcporter call "linear.create_issue(title: \"Bug\")"`
-- Full URL: `mcporter call https://api.example.com/mcp.fetch url:https://example.com`
-- Stdio: `mcporter call --stdio "bun run ./server.ts" scrape url=https://example.com`
-- JSON payload: `mcporter call <server.tool> --args '{"limit":5}'`
+Auth + lifecycle
+- OAuth: `mcporter auth <server>`
+- Daemon: `mcporter daemon status|start|stop`
 
-Auth + config
-- OAuth: `mcporter auth <server | url> [--reset]`
-- Config: `mcporter config list|get|add|remove|import|login|logout`
-
-Daemon
-- `mcporter daemon start|status|stop|restart`
-
-Codegen
-- CLI: `mcporter generate-cli --server <name>` or `--command <url>`
-- Inspect: `mcporter inspect-cli <path> [--json]`
-- TS: `mcporter emit-ts <server> --mode client|types`
+Ad-hoc servers
+- HTTP: `mcporter list --http-url https://host/mcp --name <name>`
+- STDIO: `mcporter call --stdio "bun run ./server.ts" --name <name>`
 
 Notes
-- Config default: `./config/mcporter.json` (override with `--config`).
-- Prefer `--output json` for machine-readable results.
+- Config sources: `~/.mcporter/mcporter.json[c]` and `config/mcporter.json`.
+- Prefer `--json` when you need machine-readable output.

skills/notion/SKILL.md

@@ -1,156 +0,0 @@
----
-name: notion
-description: Notion API for creating and managing pages, databases, and blocks.
-homepage: https://developers.notion.com
-metadata: {"clawdis":{"emoji":"📝"}}
----
-
-# notion
-
-Use the Notion API to create/read/update pages, data sources (databases), and blocks.
-
-## Setup
-
-1. Create an integration at https://notion.so/my-integrations
-2. Copy the API key (starts with `ntn_` or `secret_`)
-3. Store it:
-```bash
-mkdir -p ~/.config/notion
-echo "ntn_your_key_here" > ~/.config/notion/api_key
-```
-4. Share target pages/databases with your integration (click "..." → "Connect to" → your integration name)
-
-## API Basics
-
-All requests need:
-```bash
-NOTION_KEY=$(cat ~/.config/notion/api_key)
-curl -X GET "https://api.notion.com/v1/..." \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03" \
-  -H "Content-Type: application/json"
-```
-
-> **Note:** The `Notion-Version` header is required. This skill uses `2025-09-03` (latest). In this version, databases are called "data sources" in the API.
-
-## Common Operations
-
-**Search for pages and data sources:**
-```bash
-curl -X POST "https://api.notion.com/v1/search" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03" \
-  -H "Content-Type: application/json" \
-  -d '{"query": "page title"}'
-```
-
-**Get page:**
-```bash
-curl "https://api.notion.com/v1/pages/{page_id}" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03"
-```
-
-**Get page content (blocks):**
-```bash
-curl "https://api.notion.com/v1/blocks/{page_id}/children" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03"
-```
-
-**Create page in a data source:**
-```bash
-curl -X POST "https://api.notion.com/v1/pages" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "parent": {"database_id": "xxx"},
-    "properties": {
-      "Name": {"title": [{"text": {"content": "New Item"}}]},
-      "Status": {"select": {"name": "Todo"}}
-    }
-  }'
-```
-
-**Query a data source (database):**
-```bash
-curl -X POST "https://api.notion.com/v1/data_sources/{data_source_id}/query" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "filter": {"property": "Status", "select": {"equals": "Active"}},
-    "sorts": [{"property": "Date", "direction": "descending"}]
-  }'
-```
-
-**Create a data source (database):**
-```bash
-curl -X POST "https://api.notion.com/v1/data_sources" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "parent": {"page_id": "xxx"},
-    "title": [{"text": {"content": "My Database"}}],
-    "properties": {
-      "Name": {"title": {}},
-      "Status": {"select": {"options": [{"name": "Todo"}, {"name": "Done"}]}},
-      "Date": {"date": {}}
-    }
-  }'
-```
-
-**Update page properties:**
-```bash
-curl -X PATCH "https://api.notion.com/v1/pages/{page_id}" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03" \
-  -H "Content-Type: application/json" \
-  -d '{"properties": {"Status": {"select": {"name": "Done"}}}}'
-```
-
-**Add blocks to page:**
-```bash
-curl -X PATCH "https://api.notion.com/v1/blocks/{page_id}/children" \
-  -H "Authorization: Bearer $NOTION_KEY" \
-  -H "Notion-Version: 2025-09-03" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "children": [
-      {"object": "block", "type": "paragraph", "paragraph": {"rich_text": [{"text": {"content": "Hello"}}]}}
-    ]
-  }'
-```
-
-## Property Types
-
-Common property formats for database items:
-- **Title:** `{"title": [{"text": {"content": "..."}}]}`
-- **Rich text:** `{"rich_text": [{"text": {"content": "..."}}]}`
-- **Select:** `{"select": {"name": "Option"}}`
-- **Multi-select:** `{"multi_select": [{"name": "A"}, {"name": "B"}]}`
-- **Date:** `{"date": {"start": "2024-01-15", "end": "2024-01-16"}}`
-- **Checkbox:** `{"checkbox": true}`
-- **Number:** `{"number": 42}`
-- **URL:** `{"url": "https://..."}`
-- **Email:** `{"email": "a@b.com"}`
-- **Relation:** `{"relation": [{"id": "page_id"}]}`
-
-## Key Differences in 2025-09-03
-
-- **Databases → Data Sources:** Use `/data_sources/` endpoints for queries and retrieval
-- **Two IDs:** Each database now has both a `database_id` and a `data_source_id`
-  - Use `database_id` when creating pages (`parent: {"database_id": "..."}`)
-  - Use `data_source_id` when querying (`POST /v1/data_sources/{id}/query`)
-- **Search results:** Databases return as `"object": "data_source"` with their `data_source_id`
-- **Parent in responses:** Pages show `parent.data_source_id` alongside `parent.database_id`
-- **Finding the data_source_id:** Search for the database, or call `GET /v1/data_sources/{data_source_id}`
-
-## Notes
-
-- Page/database IDs are UUIDs (with or without dashes)
-- The API cannot set database view filters — that's UI-only
-- Rate limit: ~3 requests/second average
-- Use `is_inline: true` when creating data sources to embed them in pages

skills/slack/SKILL.md

@@ -1,143 +0,0 @@
----
-name: slack
-description: Use when you need to control Slack from Clawdis via the slack tool, including reacting to messages or pinning/unpinning items in Slack channels or DMs.
----
-
-# Slack Actions
-
-## Overview
-
-Use `slack` to react, manage pins, send/edit/delete messages, and fetch member info. The tool uses the bot token configured for Clawdis.
-
-## Inputs to collect
-
-- `channelId` and `messageId` (Slack message timestamp, e.g. `1712023032.1234`).
-- For reactions, an `emoji` (Unicode or `:name:`).
-- For message sends, a `to` target (`channel:<id>` or `user:<id>`) and `content`.
-
-Message context lines include `slack message id` and `channel` fields you can reuse directly.
-
-## Actions
-
-### Action groups
-
-| Action group | Default | Notes |
-| --- | --- | --- |
-| reactions | enabled | React + list reactions |
-| messages | enabled | Read/send/edit/delete |
-| pins | enabled | Pin/unpin/list |
-| memberInfo | enabled | Member info |
-| emojiList | enabled | Custom emoji list |
-
-### React to a message
-
-```json
-{
-  "action": "react",
-  "channelId": "C123",
-  "messageId": "1712023032.1234",
-  "emoji": "✅"
-}
-```
-
-### List reactions
-
-```json
-{
-  "action": "reactions",
-  "channelId": "C123",
-  "messageId": "1712023032.1234"
-}
-```
-
-### Send a message
-
-```json
-{
-  "action": "sendMessage",
-  "to": "channel:C123",
-  "content": "Hello from Clawdis"
-}
-```
-
-### Edit a message
-
-```json
-{
-  "action": "editMessage",
-  "channelId": "C123",
-  "messageId": "1712023032.1234",
-  "content": "Updated text"
-}
-```
-
-### Delete a message
-
-```json
-{
-  "action": "deleteMessage",
-  "channelId": "C123",
-  "messageId": "1712023032.1234"
-}
-```
-
-### Read recent messages
-
-```json
-{
-  "action": "readMessages",
-  "channelId": "C123",
-  "limit": 20
-}
-```
-
-### Pin a message
-
-```json
-{
-  "action": "pinMessage",
-  "channelId": "C123",
-  "messageId": "1712023032.1234"
-}
-```
-
-### Unpin a message
-
-```json
-{
-  "action": "unpinMessage",
-  "channelId": "C123",
-  "messageId": "1712023032.1234"
-}
-```
-
-### List pinned items
-
-```json
-{
-  "action": "listPins",
-  "channelId": "C123"
-}
-```
-
-### Member info
-
-```json
-{
-  "action": "memberInfo",
-  "userId": "U123"
-}
-```
-
-### Emoji list
-
-```json
-{
-  "action": "emojiList"
-}
-```
-
-## Ideas to try
-
-- React with ✅ to mark completed tasks.
-- Pin key decisions or weekly status updates.

skills/wacli/SKILL.md

@@ -1,42 +1,31 @@
 ---
 name: wacli
-description: Send WhatsApp messages to other people or search/sync WhatsApp history via the wacli CLI (not for normal user chats).
+description: WhatsApp CLI for sync, search, and sending messages.
 homepage: https://wacli.sh
-metadata: {"clawdis":{"emoji":"📱","requires":{"bins":["wacli"]},"install":[{"id":"brew","kind":"brew","formula":"steipete/tap/wacli","bins":["wacli"],"label":"Install wacli (brew)"},{"id":"go","kind":"go","module":"github.com/steipete/wacli/cmd/wacli@latest","bins":["wacli"],"label":"Install wacli (go)"}]}}
+metadata: {"clawdis":{"emoji":"📱","requires":{"bins":["wacli"]},"install":[{"id":"go","kind":"go","module":"github.com/steipete/wacli/cmd/wacli@latest","bins":["wacli"],"label":"Install wacli (go)"}]}}
 ---
 
 # wacli
 
-Use `wacli` only when the user explicitly asks you to message someone else on WhatsApp or when they ask to sync/search WhatsApp history.
-Do NOT use `wacli` for normal user chats; Clawdis routes WhatsApp conversations automatically.
-If the user is chatting with you on WhatsApp, you should not reach for this tool unless they ask you to contact a third party.
-
-Safety
-- Require explicit recipient + message text.
-- Confirm recipient + message before sending.
-- If anything is ambiguous, ask a clarifying question.
+Use `wacli` for WhatsApp sync/search/send via WhatsApp Web protocol.
+Normal operation: the user chats with you via Telegram or WhatsApp and Clawdis handles it automatically.
+Use `wacli` only when you need to talk to other people on WhatsApp (or to debug sync/search).
 
 Auth + sync
 - `wacli auth` (QR login + initial sync)
 - `wacli sync --follow` (continuous sync)
 - `wacli doctor`
 
-Find chats + messages
-- `wacli chats list --limit 20 --query "name or number"`
-- `wacli messages search "query" --limit 20 --chat <jid>`
-- `wacli messages search "invoice" --after 2025-01-01 --before 2025-12-31`
-
-History backfill
-- `wacli history backfill --chat <jid> --requests 2 --count 50`
+Search + history
+- `wacli messages search "query"`
+- `wacli history backfill --chat <jid> --requests 5 --count 50`
 
 Send
-- Text: `wacli send text --to "+14155551212" --message "Hello! Are you free at 3pm?"`
-- Group: `wacli send text --to "1234567890-123456789@g.us" --message "Running 5 min late."`
-- File: `wacli send file --to "+14155551212" --file /path/agenda.pdf --caption "Agenda"`
+- Text: `wacli send text --to 1234567890 --message "hello"`
+- File: `wacli send file --to 1234567890 --file /path/pic.jpg --caption "hi"`
 
 Notes
 - Store dir: `~/.wacli` (override with `--store`).
-- Use `--json` for machine-readable output when parsing.
 - Backfill requires your phone online; results are best-effort.
 - WhatsApp CLI is not needed for routine user chats; it’s for messaging other people.
-- JIDs: direct chats look like `<number>@s.whatsapp.net`; groups look like `<id>@g.us` (use `wacli chats list` to find).
+- Confirm recipient + message before sending.

src/agents/bash-tools.test.ts

@@ -119,19 +119,6 @@ describe("bash tool backgrounding", () => {
     expect(status).toBe("failed");
   });
 
-  it("rejects elevated requests when not allowed", async () => {
-    const customBash = createBashTool({
-      elevated: { enabled: true, allowed: false, defaultLevel: "off" },
-    });
-
-    await expect(
-      customBash.execute("call1", {
-        command: "echo hi",
-        elevated: true,
-      }),
-    ).rejects.toThrow("elevated is not available right now.");
-  });
-
   it("logs line-based slices and defaults to last lines", async () => {
     const result = await bashTool.execute("call1", {
       command:

src/agents/bash-tools.ts

@@ -7,7 +7,6 @@ import path from "node:path";
 import type { AgentTool, AgentToolResult } from "@mariozechner/pi-agent-core";
 import { Type } from "@sinclair/typebox";
 
-import { logInfo } from "../logger.js";
 import {
   addSession,
   appendOutput,
@@ -54,7 +53,6 @@ export type BashToolDefaults = {
   backgroundMs?: number;
   timeoutSec?: number;
   sandbox?: BashSandboxConfig;
-  elevated?: BashElevatedDefaults;
 };
 
 export type ProcessToolDefaults = {
@@ -68,12 +66,6 @@ export type BashSandboxConfig = {
   env?: Record<string, string>;
 };
 
-export type BashElevatedDefaults = {
-  enabled: boolean;
-  allowed: boolean;
-  defaultLevel: "on" | "off";
-};
-
 const bashSchema = Type.Object({
   command: Type.String({ description: "Bash command to execute" }),
   workdir: Type.Optional(
@@ -93,11 +85,6 @@ const bashSchema = Type.Object({
       description: "Timeout in seconds (optional, kills process on expiry)",
     }),
   ),
-  elevated: Type.Optional(
-    Type.Boolean({
-      description: "Run on the host with elevated permissions (if allowed)",
-    }),
-  ),
 });
 
 export type BashToolDetails =
@@ -144,7 +131,6 @@ export function createBashTool(
         yieldMs?: number;
         background?: boolean;
         timeout?: number;
-        elevated?: boolean;
       };
 
       if (!params.command) {
@@ -163,24 +149,7 @@ export function createBashTool(
       const startedAt = Date.now();
       const sessionId = randomUUID();
       const warnings: string[] = [];
-      const elevatedDefaults = defaults?.elevated;
-      const elevatedRequested =
-        typeof params.elevated === "boolean"
-          ? params.elevated
-          : elevatedDefaults?.defaultLevel === "on";
-      if (elevatedRequested) {
-        if (!elevatedDefaults?.enabled || !elevatedDefaults.allowed) {
-          throw new Error("elevated is not available right now.");
-        }
-        logInfo(
-          `bash: elevated command (${sessionId.slice(0, 8)}) ${truncateMiddle(
-            params.command,
-            120,
-          )}`,
-        );
-      }
-
-      const sandbox = elevatedRequested ? undefined : defaults?.sandbox;
+      const sandbox = defaults?.sandbox;
       const rawWorkdir = params.workdir?.trim() || process.cwd();
       let workdir = rawWorkdir;
       let containerWorkdir = sandbox?.containerWorkdir;

src/agents/clawdis-tools.sessions.test.ts

@@ -7,11 +7,7 @@ vi.mock("../gateway/call.js", () => ({
 
 vi.mock("../config/config.js", () => ({
   loadConfig: () => ({
-    session: {
-      mainKey: "main",
-      scope: "per-sender",
-      agentToAgent: { maxPingPongTurns: 2 },
-    },
+    session: { mainKey: "main", scope: "per-sender" },
   }),
   resolveGatewayPort: () => 18789,
 }));
@@ -131,28 +127,18 @@ describe("sessions tools", () => {
     let agentCallCount = 0;
     let _historyCallCount = 0;
     let sendCallCount = 0;
-    let lastWaitedRunId: string | undefined;
-    const replyByRunId = new Map<string, string>();
-    const requesterKey = "discord:group:req";
+    let waitRunId: string | undefined;
+    let nextHistoryIsWaitReply = false;
     callGatewayMock.mockImplementation(async (opts: unknown) => {
       const request = opts as { method?: string; params?: unknown };
       calls.push(request);
       if (request.method === "agent") {
         agentCallCount += 1;
         const runId = `run-${agentCallCount}`;
-        const params = request.params as
-          | { message?: string; sessionKey?: string }
-          | undefined;
-        const message = params?.message ?? "";
-        let reply = "REPLY_SKIP";
-        if (message === "ping" || message === "wait") {
-          reply = "done";
-        } else if (message === "Agent-to-agent announce step.") {
-          reply = "ANNOUNCE_SKIP";
-        } else if (params?.sessionKey === requesterKey) {
-          reply = "pong";
+        const params = request.params as { message?: string } | undefined;
+        if (params?.message === "wait") {
+          waitRunId = runId;
         }
-        replyByRunId.set(runId, reply);
         return {
           runId,
           status: "accepted",
@@ -161,13 +147,15 @@ describe("sessions tools", () => {
       }
       if (request.method === "agent.wait") {
         const params = request.params as { runId?: string } | undefined;
-        lastWaitedRunId = params?.runId;
+        if (params?.runId && params.runId === waitRunId) {
+          nextHistoryIsWaitReply = true;
+        }
         return { runId: params?.runId ?? "run-1", status: "ok" };
       }
       if (request.method === "chat.history") {
         _historyCallCount += 1;
-        const text =
-          (lastWaitedRunId && replyByRunId.get(lastWaitedRunId)) ?? "";
+        const text = nextHistoryIsWaitReply ? "done" : "ANNOUNCE_SKIP";
+        nextHistoryIsWaitReply = false;
         return {
           messages: [
             {
@@ -190,10 +178,9 @@ describe("sessions tools", () => {
       return {};
     });
 
-    const tool = createClawdisTools({
-      agentSessionKey: requesterKey,
-      agentSurface: "discord",
-    }).find((candidate) => candidate.name === "sessions_send");
+    const tool = createClawdisTools().find(
+      (candidate) => candidate.name === "sessions_send",
+    );
     expect(tool).toBeDefined();
     if (!tool) throw new Error("missing sessions_send tool");
 
@@ -204,7 +191,6 @@ describe("sessions tools", () => {
     });
     expect(fire.details).toMatchObject({ status: "accepted", runId: "run-1" });
     await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
 
     const waitPromise = tool.execute("call6", {
       sessionKey: "main",
@@ -218,14 +204,13 @@ describe("sessions tools", () => {
     });
     expect(typeof (waited.details as { runId?: string }).runId).toBe("string");
     await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
 
     const agentCalls = calls.filter((call) => call.method === "agent");
     const waitCalls = calls.filter((call) => call.method === "agent.wait");
     const historyOnlyCalls = calls.filter(
       (call) => call.method === "chat.history",
     );
-    expect(agentCalls).toHaveLength(8);
+    expect(agentCalls).toHaveLength(4);
     for (const call of agentCalls) {
       expect(call.params).toMatchObject({ lane: "nested" });
     }
@@ -246,21 +231,11 @@ describe("sessions tools", () => {
             ?.extraSystemPrompt === "string" &&
           (
             call.params as { extraSystemPrompt?: string }
-          )?.extraSystemPrompt?.includes("Agent-to-agent reply step"),
+          )?.extraSystemPrompt?.includes("Agent-to-agent post step"),
       ),
     ).toBe(true);
-    expect(
-      agentCalls.some(
-        (call) =>
-          typeof (call.params as { extraSystemPrompt?: string })
-            ?.extraSystemPrompt === "string" &&
-          (
-            call.params as { extraSystemPrompt?: string }
-          )?.extraSystemPrompt?.includes("Agent-to-agent announce step"),
-      ),
-    ).toBe(true);
-    expect(waitCalls).toHaveLength(8);
-    expect(historyOnlyCalls).toHaveLength(8);
+    expect(waitCalls).toHaveLength(3);
+    expect(historyOnlyCalls).toHaveLength(3);
     expect(
       waitCalls.some(
         (call) =>
@@ -269,110 +244,4 @@ describe("sessions tools", () => {
     ).toBe(true);
     expect(sendCallCount).toBe(0);
   });
-
-  it("sessions_send runs ping-pong then announces", async () => {
-    callGatewayMock.mockReset();
-    const calls: Array<{ method?: string; params?: unknown }> = [];
-    let agentCallCount = 0;
-    let lastWaitedRunId: string | undefined;
-    const replyByRunId = new Map<string, string>();
-    const requesterKey = "discord:group:req";
-    const targetKey = "discord:group:target";
-    let sendParams: { to?: string; provider?: string; message?: string } = {};
-    callGatewayMock.mockImplementation(async (opts: unknown) => {
-      const request = opts as { method?: string; params?: unknown };
-      calls.push(request);
-      if (request.method === "agent") {
-        agentCallCount += 1;
-        const runId = `run-${agentCallCount}`;
-        const params = request.params as
-          | {
-              message?: string;
-              sessionKey?: string;
-              extraSystemPrompt?: string;
-            }
-          | undefined;
-        let reply = "initial";
-        if (params?.extraSystemPrompt?.includes("Agent-to-agent reply step")) {
-          reply = params.sessionKey === requesterKey ? "pong-1" : "pong-2";
-        }
-        if (
-          params?.extraSystemPrompt?.includes("Agent-to-agent announce step")
-        ) {
-          reply = "announce now";
-        }
-        replyByRunId.set(runId, reply);
-        return {
-          runId,
-          status: "accepted",
-          acceptedAt: 2000 + agentCallCount,
-        };
-      }
-      if (request.method === "agent.wait") {
-        const params = request.params as { runId?: string } | undefined;
-        lastWaitedRunId = params?.runId;
-        return { runId: params?.runId ?? "run-1", status: "ok" };
-      }
-      if (request.method === "chat.history") {
-        const text =
-          (lastWaitedRunId && replyByRunId.get(lastWaitedRunId)) ?? "";
-        return {
-          messages: [
-            {
-              role: "assistant",
-              content: [{ type: "text", text }],
-              timestamp: 20,
-            },
-          ],
-        };
-      }
-      if (request.method === "send") {
-        const params = request.params as
-          | { to?: string; provider?: string; message?: string }
-          | undefined;
-        sendParams = {
-          to: params?.to,
-          provider: params?.provider,
-          message: params?.message,
-        };
-        return { messageId: "m-announce" };
-      }
-      return {};
-    });
-
-    const tool = createClawdisTools({
-      agentSessionKey: requesterKey,
-      agentSurface: "discord",
-    }).find((candidate) => candidate.name === "sessions_send");
-    expect(tool).toBeDefined();
-    if (!tool) throw new Error("missing sessions_send tool");
-
-    const waited = await tool.execute("call7", {
-      sessionKey: targetKey,
-      message: "ping",
-      timeoutSeconds: 1,
-    });
-    expect(waited.details).toMatchObject({
-      status: "ok",
-      reply: "initial",
-    });
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
-    const replySteps = calls.filter(
-      (call) =>
-        call.method === "agent" &&
-        typeof (call.params as { extraSystemPrompt?: string })
-          ?.extraSystemPrompt === "string" &&
-        (
-          call.params as { extraSystemPrompt?: string }
-        )?.extraSystemPrompt?.includes("Agent-to-agent reply step"),
-    );
-    expect(replySteps).toHaveLength(2);
-    expect(sendParams).toMatchObject({
-      to: "channel:target",
-      provider: "discord",
-      message: "announce now",
-    });
-  });
 });

src/agents/pi-embedded-runner.ts

@@ -34,7 +34,6 @@ import {
 } from "../process/command-queue.js";
 import { CONFIG_DIR, resolveUserPath } from "../utils.js";
 import { resolveClawdisAgentDir } from "./agent-paths.js";
-import type { BashElevatedDefaults } from "./bash-tools.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "./defaults.js";
 import { ensureClawdisModelsJson } from "./models-config.js";
 import {
@@ -391,7 +390,6 @@ export async function runEmbeddedPiAgent(params: {
   model?: string;
   thinkLevel?: ThinkLevel;
   verboseLevel?: VerboseLevel;
-  bashElevated?: BashElevatedDefaults;
   timeoutMs: number;
   runId: string;
   abortSignal?: AbortSignal;
@@ -497,10 +495,7 @@ export async function runEmbeddedPiAgent(params: {
         const contextFiles = buildBootstrapContextFiles(bootstrapFiles);
         const promptSkills = resolvePromptSkills(skillsSnapshot, skillEntries);
         const tools = createClawdisCodingTools({
-          bash: {
-            ...params.config?.agent?.bash,
-            elevated: params.bashElevated,
-          },
+          bash: params.config?.agent?.bash,
           sandbox,
           surface: params.surface,
           sessionKey: params.sessionKey ?? params.sessionId,

src/agents/pi-embedded-subscribe.ts

@@ -248,9 +248,7 @@ export function subscribeEmbeddedPiSession(params: {
   };
 
   const emitBlockChunk = (text: string) => {
-    // Strip any <thinking> tags that may have leaked into the output (e.g., from Gemini mimicking history)
-    const strippedText = stripThinkingSegments(stripUnpairedThinkingTags(text));
-    const chunk = strippedText.trimEnd();
+    const chunk = text.trimEnd();
     if (!chunk) return;
     if (chunk === lastBlockReplyText) return;
     lastBlockReplyText = chunk;

src/agents/pi-tools.test.ts

@@ -88,14 +88,6 @@ describe("createClawdisCodingTools", () => {
     expect(discord.some((tool) => tool.name === "discord")).toBe(true);
   });
 
-  it("scopes slack tool to slack surface", () => {
-    const other = createClawdisCodingTools({ surface: "whatsapp" });
-    expect(other.some((tool) => tool.name === "slack")).toBe(false);
-
-    const slack = createClawdisCodingTools({ surface: "slack" });
-    expect(slack.some((tool) => tool.name === "slack")).toBe(true);
-  });
-
   it("keeps read tool image metadata intact", async () => {
     const tools = createClawdisCodingTools();
     const readTool = tools.find((tool) => tool.name === "read");

src/agents/pi-tools.ts

@@ -441,12 +441,6 @@ function shouldIncludeDiscordTool(surface?: string): boolean {
   return normalized === "discord" || normalized.startsWith("discord:");
 }
 
-function shouldIncludeSlackTool(surface?: string): boolean {
-  const normalized = normalizeSurface(surface);
-  if (!normalized) return false;
-  return normalized === "slack" || normalized.startsWith("slack:");
-}
-
 export function createClawdisCodingTools(options?: {
   bash?: BashToolDefaults & ProcessToolDefaults;
   surface?: string;
@@ -500,12 +494,9 @@ export function createClawdisCodingTools(options?: {
     }),
   ];
   const allowDiscord = shouldIncludeDiscordTool(options?.surface);
-  const allowSlack = shouldIncludeSlackTool(options?.surface);
-  const filtered = tools.filter((tool) => {
-    if (tool.name === "discord") return allowDiscord;
-    if (tool.name === "slack") return allowSlack;
-    return true;
-  });
+  const filtered = allowDiscord
+    ? tools
+    : tools.filter((tool) => tool.name !== "discord");
   const sandboxed = sandbox
     ? filterToolsByPolicy(filtered, sandbox.tools)
     : filtered;

src/agents/sandbox.ts

@@ -9,10 +9,7 @@ import {
   startBrowserBridgeServer,
   stopBrowserBridgeServer,
 } from "../browser/bridge-server.js";
-import {
-  type ResolvedBrowserConfig,
-  resolveProfile,
-} from "../browser/config.js";
+import type { ResolvedBrowserConfig } from "../browser/config.js";
 import { DEFAULT_CLAWD_BROWSER_COLOR } from "../browser/constants.js";
 import type { ClawdisConfig } from "../config/config.js";
 import { STATE_DIR_CLAWDIS } from "../config/config.js";
@@ -511,23 +508,21 @@ function buildSandboxBrowserResolvedConfig(params: {
   const controlHost = "127.0.0.1";
   const controlUrl = `http://${controlHost}:${params.controlPort}`;
   const cdpHost = "127.0.0.1";
+  const cdpUrl = `http://${cdpHost}:${params.cdpPort}`;
   return {
     enabled: true,
     controlUrl,
     controlHost,
     controlPort: params.controlPort,
-    cdpProtocol: "http",
+    cdpUrl,
     cdpHost,
+    cdpPort: params.cdpPort,
     cdpIsLoopback: true,
     color: DEFAULT_CLAWD_BROWSER_COLOR,
     executablePath: undefined,
     headless: params.headless,
     noSandbox: false,
     attachOnly: true,
-    defaultProfile: "clawd",
-    profiles: {
-      clawd: { cdpPort: params.cdpPort, color: DEFAULT_CLAWD_BROWSER_COLOR },
-    },
   };
 }
 
@@ -605,13 +600,10 @@ async function ensureSandboxBrowser(params: {
       : null;
 
   const existing = BROWSER_BRIDGES.get(params.sessionKey);
-  const existingProfile = existing
-    ? resolveProfile(existing.bridge.state.resolved, "clawd")
-    : null;
   const shouldReuse =
     existing &&
     existing.containerName === containerName &&
-    existingProfile?.cdpPort === mappedCdp;
+    existing.bridge.state.resolved.cdpPort === mappedCdp;
   if (existing && !shouldReuse) {
     await stopBrowserBridgeServer(existing.bridge.server).catch(
       () => undefined,

src/agents/tool-display.json

@@ -196,8 +196,6 @@
         "memberInfo": { "label": "member", "detailKeys": ["guildId", "userId"] },
         "roleInfo": { "label": "roles", "detailKeys": ["guildId"] },
         "emojiList": { "label": "emoji list", "detailKeys": ["guildId"] },
-        "emojiUpload": { "label": "emoji upload", "detailKeys": ["guildId", "name"] },
-        "stickerUpload": { "label": "sticker upload", "detailKeys": ["guildId", "name"] },
         "roleAdd": { "label": "role add", "detailKeys": ["guildId", "userId", "roleId"] },
         "roleRemove": { "label": "role remove", "detailKeys": ["guildId", "userId", "roleId"] },
         "channelInfo": { "label": "channel", "detailKeys": ["channelId"] },
@@ -209,24 +207,6 @@
         "kick": { "label": "kick", "detailKeys": ["guildId", "userId"] },
         "ban": { "label": "ban", "detailKeys": ["guildId", "userId"] }
       }
-    },
-    "slack": {
-      "emoji": "💬",
-      "title": "Slack",
-      "actions": {
-        "react": { "label": "react", "detailKeys": ["channelId", "messageId", "emoji"] },
-        "reactions": { "label": "reactions", "detailKeys": ["channelId", "messageId"] },
-        "sendMessage": { "label": "send", "detailKeys": ["to", "content"] },
-        "editMessage": { "label": "edit", "detailKeys": ["channelId", "messageId"] },
-        "deleteMessage": { "label": "delete", "detailKeys": ["channelId", "messageId"] },
-        "readMessages": { "label": "read messages", "detailKeys": ["channelId", "limit"] },
-        "pinMessage": { "label": "pin", "detailKeys": ["channelId", "messageId"] },
-        "unpinMessage": { "label": "unpin", "detailKeys": ["channelId", "messageId"] },
-        "listPins": { "label": "list pins", "detailKeys": ["channelId"] },
-        "memberInfo": { "label": "member", "detailKeys": ["userId"] },
-        "emojiList": { "label": "emoji list" }
-      }
     }
   }
 }
-

src/agents/tools/browser-tool.ts

@@ -1,397 +0,0 @@
-import { Type } from "@sinclair/typebox";
-
-import {
-  browserCloseTab,
-  browserFocusTab,
-  browserOpenTab,
-  browserSnapshot,
-  browserStart,
-  browserStatus,
-  browserStop,
-  browserTabs,
-} from "../../browser/client.js";
-import {
-  browserAct,
-  browserArmDialog,
-  browserArmFileChooser,
-  browserConsoleMessages,
-  browserNavigate,
-  browserPdfSave,
-  browserScreenshotAction,
-} from "../../browser/client-actions.js";
-import { resolveBrowserConfig } from "../../browser/config.js";
-import { loadConfig } from "../../config/config.js";
-import {
-  type AnyAgentTool,
-  imageResultFromFile,
-  jsonResult,
-  readStringParam,
-} from "./common.js";
-
-const BrowserActSchema = Type.Union([
-  Type.Object({
-    kind: Type.Literal("click"),
-    ref: Type.String(),
-    targetId: Type.Optional(Type.String()),
-    doubleClick: Type.Optional(Type.Boolean()),
-    button: Type.Optional(Type.String()),
-    modifiers: Type.Optional(Type.Array(Type.String())),
-  }),
-  Type.Object({
-    kind: Type.Literal("type"),
-    ref: Type.String(),
-    text: Type.String(),
-    targetId: Type.Optional(Type.String()),
-    submit: Type.Optional(Type.Boolean()),
-    slowly: Type.Optional(Type.Boolean()),
-  }),
-  Type.Object({
-    kind: Type.Literal("press"),
-    key: Type.String(),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("hover"),
-    ref: Type.String(),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("drag"),
-    startRef: Type.String(),
-    endRef: Type.String(),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("select"),
-    ref: Type.String(),
-    values: Type.Array(Type.String()),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("fill"),
-    fields: Type.Array(Type.Record(Type.String(), Type.Unknown())),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("resize"),
-    width: Type.Number(),
-    height: Type.Number(),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("wait"),
-    timeMs: Type.Optional(Type.Number()),
-    text: Type.Optional(Type.String()),
-    textGone: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("evaluate"),
-    fn: Type.String(),
-    ref: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    kind: Type.Literal("close"),
-    targetId: Type.Optional(Type.String()),
-  }),
-]);
-
-const BrowserToolSchema = Type.Union([
-  Type.Object({
-    action: Type.Literal("status"),
-    controlUrl: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("start"),
-    controlUrl: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("stop"),
-    controlUrl: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("tabs"),
-    controlUrl: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("open"),
-    controlUrl: Type.Optional(Type.String()),
-    targetUrl: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("focus"),
-    controlUrl: Type.Optional(Type.String()),
-    targetId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("close"),
-    controlUrl: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("snapshot"),
-    controlUrl: Type.Optional(Type.String()),
-    format: Type.Optional(
-      Type.Union([Type.Literal("aria"), Type.Literal("ai")]),
-    ),
-    targetId: Type.Optional(Type.String()),
-    limit: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("screenshot"),
-    controlUrl: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-    fullPage: Type.Optional(Type.Boolean()),
-    ref: Type.Optional(Type.String()),
-    element: Type.Optional(Type.String()),
-    type: Type.Optional(
-      Type.Union([Type.Literal("png"), Type.Literal("jpeg")]),
-    ),
-  }),
-  Type.Object({
-    action: Type.Literal("navigate"),
-    controlUrl: Type.Optional(Type.String()),
-    targetUrl: Type.String(),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("console"),
-    controlUrl: Type.Optional(Type.String()),
-    level: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("pdf"),
-    controlUrl: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("upload"),
-    controlUrl: Type.Optional(Type.String()),
-    paths: Type.Array(Type.String()),
-    ref: Type.Optional(Type.String()),
-    inputRef: Type.Optional(Type.String()),
-    element: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("dialog"),
-    controlUrl: Type.Optional(Type.String()),
-    accept: Type.Boolean(),
-    promptText: Type.Optional(Type.String()),
-    targetId: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("act"),
-    controlUrl: Type.Optional(Type.String()),
-    request: BrowserActSchema,
-  }),
-]);
-
-function resolveBrowserBaseUrl(controlUrl?: string) {
-  const cfg = loadConfig();
-  const resolved = resolveBrowserConfig(cfg.browser);
-  if (!resolved.enabled && !controlUrl?.trim()) {
-    throw new Error(
-      "Browser control is disabled. Set browser.enabled=true in ~/.clawdis/clawdis.json.",
-    );
-  }
-  const url = controlUrl?.trim() ? controlUrl.trim() : resolved.controlUrl;
-  return url.replace(/\/$/, "");
-}
-
-export function createBrowserTool(opts?: {
-  defaultControlUrl?: string;
-}): AnyAgentTool {
-  return {
-    label: "Browser",
-    name: "browser",
-    description:
-      "Control clawd's dedicated browser (status/start/stop/tabs/open/snapshot/screenshot/actions). Use snapshot+act for UI automation. Avoid act:wait by default; use only in exceptional cases when no reliable UI state exists.",
-    parameters: BrowserToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const action = readStringParam(params, "action", { required: true });
-      const controlUrl = readStringParam(params, "controlUrl");
-      const baseUrl = resolveBrowserBaseUrl(
-        controlUrl ?? opts?.defaultControlUrl,
-      );
-
-      switch (action) {
-        case "status":
-          return jsonResult(await browserStatus(baseUrl));
-        case "start":
-          await browserStart(baseUrl);
-          return jsonResult(await browserStatus(baseUrl));
-        case "stop":
-          await browserStop(baseUrl);
-          return jsonResult(await browserStatus(baseUrl));
-        case "tabs":
-          return jsonResult({ tabs: await browserTabs(baseUrl) });
-        case "open": {
-          const targetUrl = readStringParam(params, "targetUrl", {
-            required: true,
-          });
-          return jsonResult(await browserOpenTab(baseUrl, targetUrl));
-        }
-        case "focus": {
-          const targetId = readStringParam(params, "targetId", {
-            required: true,
-          });
-          await browserFocusTab(baseUrl, targetId);
-          return jsonResult({ ok: true });
-        }
-        case "close": {
-          const targetId = readStringParam(params, "targetId");
-          if (targetId) await browserCloseTab(baseUrl, targetId);
-          else await browserAct(baseUrl, { kind: "close" });
-          return jsonResult({ ok: true });
-        }
-        case "snapshot": {
-          const format =
-            params.format === "ai" || params.format === "aria"
-              ? (params.format as "ai" | "aria")
-              : "ai";
-          const targetId =
-            typeof params.targetId === "string"
-              ? params.targetId.trim()
-              : undefined;
-          const limit =
-            typeof params.limit === "number" && Number.isFinite(params.limit)
-              ? params.limit
-              : undefined;
-          const snapshot = await browserSnapshot(baseUrl, {
-            format,
-            targetId,
-            limit,
-          });
-          if (snapshot.format === "ai") {
-            return {
-              content: [{ type: "text", text: snapshot.snapshot }],
-              details: snapshot,
-            };
-          }
-          return jsonResult(snapshot);
-        }
-        case "screenshot": {
-          const targetId = readStringParam(params, "targetId");
-          const fullPage = Boolean(params.fullPage);
-          const ref = readStringParam(params, "ref");
-          const element = readStringParam(params, "element");
-          const type = params.type === "jpeg" ? "jpeg" : "png";
-          const result = await browserScreenshotAction(baseUrl, {
-            targetId,
-            fullPage,
-            ref,
-            element,
-            type,
-          });
-          return await imageResultFromFile({
-            label: "browser:screenshot",
-            path: result.path,
-            details: result,
-          });
-        }
-        case "navigate": {
-          const targetUrl = readStringParam(params, "targetUrl", {
-            required: true,
-          });
-          const targetId = readStringParam(params, "targetId");
-          return jsonResult(
-            await browserNavigate(baseUrl, { url: targetUrl, targetId }),
-          );
-        }
-        case "console": {
-          const level =
-            typeof params.level === "string" ? params.level.trim() : undefined;
-          const targetId =
-            typeof params.targetId === "string"
-              ? params.targetId.trim()
-              : undefined;
-          return jsonResult(
-            await browserConsoleMessages(baseUrl, { level, targetId }),
-          );
-        }
-        case "pdf": {
-          const targetId =
-            typeof params.targetId === "string"
-              ? params.targetId.trim()
-              : undefined;
-          const result = await browserPdfSave(baseUrl, { targetId });
-          return {
-            content: [{ type: "text", text: `FILE:${result.path}` }],
-            details: result,
-          };
-        }
-        case "upload": {
-          const paths = Array.isArray(params.paths)
-            ? params.paths.map((p) => String(p))
-            : [];
-          if (paths.length === 0) throw new Error("paths required");
-          const ref = readStringParam(params, "ref");
-          const inputRef = readStringParam(params, "inputRef");
-          const element = readStringParam(params, "element");
-          const targetId =
-            typeof params.targetId === "string"
-              ? params.targetId.trim()
-              : undefined;
-          const timeoutMs =
-            typeof params.timeoutMs === "number" &&
-            Number.isFinite(params.timeoutMs)
-              ? params.timeoutMs
-              : undefined;
-          return jsonResult(
-            await browserArmFileChooser(baseUrl, {
-              paths,
-              ref,
-              inputRef,
-              element,
-              targetId,
-              timeoutMs,
-            }),
-          );
-        }
-        case "dialog": {
-          const accept = Boolean(params.accept);
-          const promptText =
-            typeof params.promptText === "string"
-              ? params.promptText
-              : undefined;
-          const targetId =
-            typeof params.targetId === "string"
-              ? params.targetId.trim()
-              : undefined;
-          const timeoutMs =
-            typeof params.timeoutMs === "number" &&
-            Number.isFinite(params.timeoutMs)
-              ? params.timeoutMs
-              : undefined;
-          return jsonResult(
-            await browserArmDialog(baseUrl, {
-              accept,
-              promptText,
-              targetId,
-              timeoutMs,
-            }),
-          );
-        }
-        case "act": {
-          const request = params.request as Record<string, unknown> | undefined;
-          if (!request || typeof request !== "object") {
-            throw new Error("request required");
-          }
-          const result = await browserAct(
-            baseUrl,
-            request as Parameters<typeof browserAct>[1],
-          );
-          return jsonResult(result);
-        }
-        default:
-          throw new Error(`Unknown action: ${action}`);
-      }
-    },
-  };
-}

src/agents/tools/canvas-tool.ts

@@ -1,228 +0,0 @@
-import crypto from "node:crypto";
-import fs from "node:fs/promises";
-
-import { Type } from "@sinclair/typebox";
-import { writeBase64ToFile } from "../../cli/nodes-camera.js";
-import {
-  canvasSnapshotTempPath,
-  parseCanvasSnapshotPayload,
-} from "../../cli/nodes-canvas.js";
-import { imageMimeFromFormat } from "../../media/mime.js";
-import {
-  type AnyAgentTool,
-  imageResult,
-  jsonResult,
-  readStringParam,
-} from "./common.js";
-import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
-import { resolveNodeId } from "./nodes-utils.js";
-
-const CanvasToolSchema = Type.Union([
-  Type.Object({
-    action: Type.Literal("present"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.Optional(Type.String()),
-    target: Type.Optional(Type.String()),
-    x: Type.Optional(Type.Number()),
-    y: Type.Optional(Type.Number()),
-    width: Type.Optional(Type.Number()),
-    height: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("hide"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("navigate"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.Optional(Type.String()),
-    url: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("eval"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.Optional(Type.String()),
-    javaScript: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("snapshot"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.Optional(Type.String()),
-    format: Type.Optional(
-      Type.Union([
-        Type.Literal("png"),
-        Type.Literal("jpg"),
-        Type.Literal("jpeg"),
-      ]),
-    ),
-    maxWidth: Type.Optional(Type.Number()),
-    quality: Type.Optional(Type.Number()),
-    delayMs: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("a2ui_push"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.Optional(Type.String()),
-    jsonl: Type.Optional(Type.String()),
-    jsonlPath: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("a2ui_reset"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.Optional(Type.String()),
-  }),
-]);
-
-export function createCanvasTool(): AnyAgentTool {
-  return {
-    label: "Canvas",
-    name: "canvas",
-    description:
-      "Control node canvases (present/hide/navigate/eval/snapshot/A2UI). Use snapshot to capture the rendered UI.",
-    parameters: CanvasToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const action = readStringParam(params, "action", { required: true });
-      const gatewayOpts: GatewayCallOptions = {
-        gatewayUrl: readStringParam(params, "gatewayUrl", { trim: false }),
-        gatewayToken: readStringParam(params, "gatewayToken", { trim: false }),
-        timeoutMs:
-          typeof params.timeoutMs === "number" ? params.timeoutMs : undefined,
-      };
-
-      const nodeId = await resolveNodeId(
-        gatewayOpts,
-        readStringParam(params, "node", { trim: true }),
-        true,
-      );
-
-      const invoke = async (
-        command: string,
-        invokeParams?: Record<string, unknown>,
-      ) =>
-        await callGatewayTool("node.invoke", gatewayOpts, {
-          nodeId,
-          command,
-          params: invokeParams,
-          idempotencyKey: crypto.randomUUID(),
-        });
-
-      switch (action) {
-        case "present": {
-          const placement = {
-            x: typeof params.x === "number" ? params.x : undefined,
-            y: typeof params.y === "number" ? params.y : undefined,
-            width: typeof params.width === "number" ? params.width : undefined,
-            height:
-              typeof params.height === "number" ? params.height : undefined,
-          };
-          const invokeParams: Record<string, unknown> = {};
-          if (typeof params.target === "string" && params.target.trim()) {
-            invokeParams.url = params.target.trim();
-          }
-          if (
-            Number.isFinite(placement.x) ||
-            Number.isFinite(placement.y) ||
-            Number.isFinite(placement.width) ||
-            Number.isFinite(placement.height)
-          ) {
-            invokeParams.placement = placement;
-          }
-          await invoke("canvas.present", invokeParams);
-          return jsonResult({ ok: true });
-        }
-        case "hide":
-          await invoke("canvas.hide", undefined);
-          return jsonResult({ ok: true });
-        case "navigate": {
-          const url = readStringParam(params, "url", { required: true });
-          await invoke("canvas.navigate", { url });
-          return jsonResult({ ok: true });
-        }
-        case "eval": {
-          const javaScript = readStringParam(params, "javaScript", {
-            required: true,
-          });
-          const raw = (await invoke("canvas.eval", { javaScript })) as {
-            payload?: { result?: string };
-          };
-          const result = raw?.payload?.result;
-          if (result) {
-            return {
-              content: [{ type: "text", text: result }],
-              details: { result },
-            };
-          }
-          return jsonResult({ ok: true });
-        }
-        case "snapshot": {
-          const formatRaw =
-            typeof params.format === "string"
-              ? params.format.toLowerCase()
-              : "png";
-          const format =
-            formatRaw === "jpg" || formatRaw === "jpeg" ? "jpeg" : "png";
-          const maxWidth =
-            typeof params.maxWidth === "number" &&
-            Number.isFinite(params.maxWidth)
-              ? params.maxWidth
-              : undefined;
-          const quality =
-            typeof params.quality === "number" &&
-            Number.isFinite(params.quality)
-              ? params.quality
-              : undefined;
-          const raw = (await invoke("canvas.snapshot", {
-            format,
-            maxWidth,
-            quality,
-          })) as { payload?: unknown };
-          const payload = parseCanvasSnapshotPayload(raw?.payload);
-          const filePath = canvasSnapshotTempPath({
-            ext: payload.format === "jpeg" ? "jpg" : payload.format,
-          });
-          await writeBase64ToFile(filePath, payload.base64);
-          const mimeType = imageMimeFromFormat(payload.format) ?? "image/png";
-          return await imageResult({
-            label: "canvas:snapshot",
-            path: filePath,
-            base64: payload.base64,
-            mimeType,
-            details: { format: payload.format },
-          });
-        }
-        case "a2ui_push": {
-          const jsonl =
-            typeof params.jsonl === "string" && params.jsonl.trim()
-              ? params.jsonl
-              : typeof params.jsonlPath === "string" && params.jsonlPath.trim()
-                ? await fs.readFile(params.jsonlPath.trim(), "utf8")
-                : "";
-          if (!jsonl.trim()) throw new Error("jsonl or jsonlPath required");
-          await invoke("canvas.a2ui.pushJSONL", { jsonl });
-          return jsonResult({ ok: true });
-        }
-        case "a2ui_reset":
-          await invoke("canvas.a2ui.reset", undefined);
-          return jsonResult({ ok: true });
-        default:
-          throw new Error(`Unknown action: ${action}`);
-      }
-    },
-  };
-}

src/agents/tools/common.ts

@@ -1,141 +0,0 @@
-import fs from "node:fs/promises";
-
-import type { AgentTool, AgentToolResult } from "@mariozechner/pi-agent-core";
-
-import { detectMime } from "../../media/mime.js";
-import { sanitizeToolResultImages } from "../tool-images.js";
-
-// biome-ignore lint/suspicious/noExplicitAny: TypeBox schema type from pi-agent-core uses a different module instance.
-export type AnyAgentTool = AgentTool<any, unknown>;
-
-export type StringParamOptions = {
-  required?: boolean;
-  trim?: boolean;
-  label?: string;
-};
-
-export function readStringParam(
-  params: Record<string, unknown>,
-  key: string,
-  options: StringParamOptions & { required: true },
-): string;
-export function readStringParam(
-  params: Record<string, unknown>,
-  key: string,
-  options?: StringParamOptions,
-): string | undefined;
-export function readStringParam(
-  params: Record<string, unknown>,
-  key: string,
-  options: StringParamOptions = {},
-) {
-  const { required = false, trim = true, label = key } = options;
-  const raw = params[key];
-  if (typeof raw !== "string") {
-    if (required) throw new Error(`${label} required`);
-    return undefined;
-  }
-  const value = trim ? raw.trim() : raw;
-  if (!value) {
-    if (required) throw new Error(`${label} required`);
-    return undefined;
-  }
-  return value;
-}
-
-export function readStringArrayParam(
-  params: Record<string, unknown>,
-  key: string,
-  options: StringParamOptions & { required: true },
-): string[];
-export function readStringArrayParam(
-  params: Record<string, unknown>,
-  key: string,
-  options?: StringParamOptions,
-): string[] | undefined;
-export function readStringArrayParam(
-  params: Record<string, unknown>,
-  key: string,
-  options: StringParamOptions = {},
-) {
-  const { required = false, label = key } = options;
-  const raw = params[key];
-  if (Array.isArray(raw)) {
-    const values = raw
-      .filter((entry) => typeof entry === "string")
-      .map((entry) => entry.trim())
-      .filter(Boolean);
-    if (values.length === 0) {
-      if (required) throw new Error(`${label} required`);
-      return undefined;
-    }
-    return values;
-  }
-  if (typeof raw === "string") {
-    const value = raw.trim();
-    if (!value) {
-      if (required) throw new Error(`${label} required`);
-      return undefined;
-    }
-    return [value];
-  }
-  if (required) throw new Error(`${label} required`);
-  return undefined;
-}
-
-export function jsonResult(payload: unknown): AgentToolResult<unknown> {
-  return {
-    content: [
-      {
-        type: "text",
-        text: JSON.stringify(payload, null, 2),
-      },
-    ],
-    details: payload,
-  };
-}
-
-export async function imageResult(params: {
-  label: string;
-  path: string;
-  base64: string;
-  mimeType: string;
-  extraText?: string;
-  details?: Record<string, unknown>;
-}): Promise<AgentToolResult<unknown>> {
-  const content: AgentToolResult<unknown>["content"] = [
-    {
-      type: "text",
-      text: params.extraText ?? `MEDIA:${params.path}`,
-    },
-    {
-      type: "image",
-      data: params.base64,
-      mimeType: params.mimeType,
-    },
-  ];
-  const result: AgentToolResult<unknown> = {
-    content,
-    details: { path: params.path, ...params.details },
-  };
-  return await sanitizeToolResultImages(result, params.label);
-}
-
-export async function imageResultFromFile(params: {
-  label: string;
-  path: string;
-  extraText?: string;
-  details?: Record<string, unknown>;
-}): Promise<AgentToolResult<unknown>> {
-  const buf = await fs.readFile(params.path);
-  const mimeType =
-    (await detectMime({ buffer: buf.slice(0, 256) })) ?? "image/png";
-  return await imageResult({
-    label: params.label,
-    path: params.path,
-    base64: buf.toString("base64"),
-    mimeType,
-    extraText: params.extraText,
-    details: params.details,
-  });
-}

src/agents/tools/cron-tool.ts

@@ -1,154 +0,0 @@
-import { Type } from "@sinclair/typebox";
-
-import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
-import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
-
-const CronToolSchema = Type.Union([
-  Type.Object({
-    action: Type.Literal("status"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("list"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    includeDisabled: Type.Optional(Type.Boolean()),
-  }),
-  Type.Object({
-    action: Type.Literal("add"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    job: Type.Object({}, { additionalProperties: true }),
-  }),
-  Type.Object({
-    action: Type.Literal("update"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    jobId: Type.String(),
-    patch: Type.Object({}, { additionalProperties: true }),
-  }),
-  Type.Object({
-    action: Type.Literal("remove"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    jobId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("run"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    jobId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("runs"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    jobId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("wake"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    text: Type.String(),
-    mode: Type.Optional(
-      Type.Union([Type.Literal("now"), Type.Literal("next-heartbeat")]),
-    ),
-  }),
-]);
-
-export function createCronTool(): AnyAgentTool {
-  return {
-    label: "Cron",
-    name: "cron",
-    description:
-      "Manage Gateway cron jobs (status/list/add/update/remove/run/runs) and send wake events.",
-    parameters: CronToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const action = readStringParam(params, "action", { required: true });
-      const gatewayOpts: GatewayCallOptions = {
-        gatewayUrl: readStringParam(params, "gatewayUrl", { trim: false }),
-        gatewayToken: readStringParam(params, "gatewayToken", { trim: false }),
-        timeoutMs:
-          typeof params.timeoutMs === "number" ? params.timeoutMs : undefined,
-      };
-
-      switch (action) {
-        case "status":
-          return jsonResult(
-            await callGatewayTool("cron.status", gatewayOpts, {}),
-          );
-        case "list":
-          return jsonResult(
-            await callGatewayTool("cron.list", gatewayOpts, {
-              includeDisabled: Boolean(params.includeDisabled),
-            }),
-          );
-        case "add": {
-          if (!params.job || typeof params.job !== "object") {
-            throw new Error("job required");
-          }
-          return jsonResult(
-            await callGatewayTool("cron.add", gatewayOpts, params.job),
-          );
-        }
-        case "update": {
-          const jobId = readStringParam(params, "jobId", { required: true });
-          if (!params.patch || typeof params.patch !== "object") {
-            throw new Error("patch required");
-          }
-          return jsonResult(
-            await callGatewayTool("cron.update", gatewayOpts, {
-              jobId,
-              patch: params.patch,
-            }),
-          );
-        }
-        case "remove": {
-          const jobId = readStringParam(params, "jobId", { required: true });
-          return jsonResult(
-            await callGatewayTool("cron.remove", gatewayOpts, { jobId }),
-          );
-        }
-        case "run": {
-          const jobId = readStringParam(params, "jobId", { required: true });
-          return jsonResult(
-            await callGatewayTool("cron.run", gatewayOpts, { jobId }),
-          );
-        }
-        case "runs": {
-          const jobId = readStringParam(params, "jobId", { required: true });
-          return jsonResult(
-            await callGatewayTool("cron.runs", gatewayOpts, { jobId }),
-          );
-        }
-        case "wake": {
-          const text = readStringParam(params, "text", { required: true });
-          const mode =
-            params.mode === "now" || params.mode === "next-heartbeat"
-              ? params.mode
-              : "next-heartbeat";
-          return jsonResult(
-            await callGatewayTool(
-              "wake",
-              gatewayOpts,
-              { mode, text },
-              { expectFinal: false },
-            ),
-          );
-        }
-        default:
-          throw new Error(`Unknown action: ${action}`);
-      }
-    },
-  };
-}

src/agents/tools/discord-actions-guild.ts

@@ -1,213 +0,0 @@
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import type { DiscordActionConfig } from "../../config/config.js";
-import {
-  addRoleDiscord,
-  createScheduledEventDiscord,
-  fetchChannelInfoDiscord,
-  fetchMemberInfoDiscord,
-  fetchRoleInfoDiscord,
-  fetchVoiceStatusDiscord,
-  listGuildChannelsDiscord,
-  listGuildEmojisDiscord,
-  listScheduledEventsDiscord,
-  removeRoleDiscord,
-  uploadEmojiDiscord,
-  uploadStickerDiscord,
-} from "../../discord/send.js";
-import { jsonResult, readStringArrayParam, readStringParam } from "./common.js";
-
-type ActionGate = (
-  key: keyof DiscordActionConfig,
-  defaultValue?: boolean,
-) => boolean;
-
-export async function handleDiscordGuildAction(
-  action: string,
-  params: Record<string, unknown>,
-  isActionEnabled: ActionGate,
-): Promise<AgentToolResult<unknown>> {
-  switch (action) {
-    case "memberInfo": {
-      if (!isActionEnabled("memberInfo")) {
-        throw new Error("Discord member info is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const userId = readStringParam(params, "userId", {
-        required: true,
-      });
-      const member = await fetchMemberInfoDiscord(guildId, userId);
-      return jsonResult({ ok: true, member });
-    }
-    case "roleInfo": {
-      if (!isActionEnabled("roleInfo")) {
-        throw new Error("Discord role info is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const roles = await fetchRoleInfoDiscord(guildId);
-      return jsonResult({ ok: true, roles });
-    }
-    case "emojiList": {
-      if (!isActionEnabled("reactions")) {
-        throw new Error("Discord reactions are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const emojis = await listGuildEmojisDiscord(guildId);
-      return jsonResult({ ok: true, emojis });
-    }
-    case "emojiUpload": {
-      if (!isActionEnabled("emojiUploads")) {
-        throw new Error("Discord emoji uploads are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const name = readStringParam(params, "name", { required: true });
-      const mediaUrl = readStringParam(params, "mediaUrl", {
-        required: true,
-      });
-      const roleIds = readStringArrayParam(params, "roleIds");
-      const emoji = await uploadEmojiDiscord({
-        guildId,
-        name,
-        mediaUrl,
-        roleIds: roleIds?.length ? roleIds : undefined,
-      });
-      return jsonResult({ ok: true, emoji });
-    }
-    case "stickerUpload": {
-      if (!isActionEnabled("stickerUploads")) {
-        throw new Error("Discord sticker uploads are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const name = readStringParam(params, "name", { required: true });
-      const description = readStringParam(params, "description", {
-        required: true,
-      });
-      const tags = readStringParam(params, "tags", { required: true });
-      const mediaUrl = readStringParam(params, "mediaUrl", {
-        required: true,
-      });
-      const sticker = await uploadStickerDiscord({
-        guildId,
-        name,
-        description,
-        tags,
-        mediaUrl,
-      });
-      return jsonResult({ ok: true, sticker });
-    }
-    case "roleAdd": {
-      if (!isActionEnabled("roles", false)) {
-        throw new Error("Discord role changes are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const userId = readStringParam(params, "userId", {
-        required: true,
-      });
-      const roleId = readStringParam(params, "roleId", { required: true });
-      await addRoleDiscord({ guildId, userId, roleId });
-      return jsonResult({ ok: true });
-    }
-    case "roleRemove": {
-      if (!isActionEnabled("roles", false)) {
-        throw new Error("Discord role changes are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const userId = readStringParam(params, "userId", {
-        required: true,
-      });
-      const roleId = readStringParam(params, "roleId", { required: true });
-      await removeRoleDiscord({ guildId, userId, roleId });
-      return jsonResult({ ok: true });
-    }
-    case "channelInfo": {
-      if (!isActionEnabled("channelInfo")) {
-        throw new Error("Discord channel info is disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const channel = await fetchChannelInfoDiscord(channelId);
-      return jsonResult({ ok: true, channel });
-    }
-    case "channelList": {
-      if (!isActionEnabled("channelInfo")) {
-        throw new Error("Discord channel info is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const channels = await listGuildChannelsDiscord(guildId);
-      return jsonResult({ ok: true, channels });
-    }
-    case "voiceStatus": {
-      if (!isActionEnabled("voiceStatus")) {
-        throw new Error("Discord voice status is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const userId = readStringParam(params, "userId", {
-        required: true,
-      });
-      const voice = await fetchVoiceStatusDiscord(guildId, userId);
-      return jsonResult({ ok: true, voice });
-    }
-    case "eventList": {
-      if (!isActionEnabled("events")) {
-        throw new Error("Discord events are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const events = await listScheduledEventsDiscord(guildId);
-      return jsonResult({ ok: true, events });
-    }
-    case "eventCreate": {
-      if (!isActionEnabled("events")) {
-        throw new Error("Discord events are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const name = readStringParam(params, "name", { required: true });
-      const startTime = readStringParam(params, "startTime", {
-        required: true,
-      });
-      const endTime = readStringParam(params, "endTime");
-      const description = readStringParam(params, "description");
-      const channelId = readStringParam(params, "channelId");
-      const location = readStringParam(params, "location");
-      const entityTypeRaw = readStringParam(params, "entityType");
-      const entityType =
-        entityTypeRaw === "stage" ? 1 : entityTypeRaw === "external" ? 3 : 2;
-      const payload = {
-        name,
-        description,
-        scheduled_start_time: startTime,
-        scheduled_end_time: endTime,
-        entity_type: entityType,
-        channel_id: channelId,
-        entity_metadata:
-          entityType === 3 && location ? { location } : undefined,
-        privacy_level: 2,
-      };
-      const event = await createScheduledEventDiscord(guildId, payload);
-      return jsonResult({ ok: true, event });
-    }
-    default:
-      throw new Error(`Unknown action: ${action}`);
-  }
-}

src/agents/tools/discord-actions-messaging.ts

@@ -1,325 +0,0 @@
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import type { DiscordActionConfig } from "../../config/config.js";
-import {
-  createThreadDiscord,
-  deleteMessageDiscord,
-  editMessageDiscord,
-  fetchChannelPermissionsDiscord,
-  fetchReactionsDiscord,
-  listPinsDiscord,
-  listThreadsDiscord,
-  pinMessageDiscord,
-  reactMessageDiscord,
-  readMessagesDiscord,
-  searchMessagesDiscord,
-  sendMessageDiscord,
-  sendPollDiscord,
-  sendStickerDiscord,
-  unpinMessageDiscord,
-} from "../../discord/send.js";
-import { jsonResult, readStringArrayParam, readStringParam } from "./common.js";
-
-type ActionGate = (
-  key: keyof DiscordActionConfig,
-  defaultValue?: boolean,
-) => boolean;
-
-export async function handleDiscordMessagingAction(
-  action: string,
-  params: Record<string, unknown>,
-  isActionEnabled: ActionGate,
-): Promise<AgentToolResult<unknown>> {
-  switch (action) {
-    case "react": {
-      if (!isActionEnabled("reactions")) {
-        throw new Error("Discord reactions are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      const emoji = readStringParam(params, "emoji", { required: true });
-      await reactMessageDiscord(channelId, messageId, emoji);
-      return jsonResult({ ok: true });
-    }
-    case "reactions": {
-      if (!isActionEnabled("reactions")) {
-        throw new Error("Discord reactions are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      const limitRaw = params.limit;
-      const limit =
-        typeof limitRaw === "number" && Number.isFinite(limitRaw)
-          ? limitRaw
-          : undefined;
-      const reactions = await fetchReactionsDiscord(channelId, messageId, {
-        limit,
-      });
-      return jsonResult({ ok: true, reactions });
-    }
-    case "sticker": {
-      if (!isActionEnabled("stickers")) {
-        throw new Error("Discord stickers are disabled.");
-      }
-      const to = readStringParam(params, "to", { required: true });
-      const content = readStringParam(params, "content");
-      const stickerIds = readStringArrayParam(params, "stickerIds", {
-        required: true,
-        label: "stickerIds",
-      });
-      await sendStickerDiscord(to, stickerIds, { content });
-      return jsonResult({ ok: true });
-    }
-    case "poll": {
-      if (!isActionEnabled("polls")) {
-        throw new Error("Discord polls are disabled.");
-      }
-      const to = readStringParam(params, "to", { required: true });
-      const content = readStringParam(params, "content");
-      const question = readStringParam(params, "question", {
-        required: true,
-      });
-      const answers = readStringArrayParam(params, "answers", {
-        required: true,
-        label: "answers",
-      });
-      const allowMultiselectRaw = params.allowMultiselect;
-      const allowMultiselect =
-        typeof allowMultiselectRaw === "boolean"
-          ? allowMultiselectRaw
-          : undefined;
-      const durationRaw = params.durationHours;
-      const durationHours =
-        typeof durationRaw === "number" && Number.isFinite(durationRaw)
-          ? durationRaw
-          : undefined;
-      await sendPollDiscord(
-        to,
-        { question, answers, allowMultiselect, durationHours },
-        { content },
-      );
-      return jsonResult({ ok: true });
-    }
-    case "permissions": {
-      if (!isActionEnabled("permissions")) {
-        throw new Error("Discord permissions are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const permissions = await fetchChannelPermissionsDiscord(channelId);
-      return jsonResult({ ok: true, permissions });
-    }
-    case "readMessages": {
-      if (!isActionEnabled("messages")) {
-        throw new Error("Discord message reads are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const messages = await readMessagesDiscord(channelId, {
-        limit:
-          typeof params.limit === "number" && Number.isFinite(params.limit)
-            ? params.limit
-            : undefined,
-        before: readStringParam(params, "before"),
-        after: readStringParam(params, "after"),
-        around: readStringParam(params, "around"),
-      });
-      return jsonResult({ ok: true, messages });
-    }
-    case "sendMessage": {
-      if (!isActionEnabled("messages")) {
-        throw new Error("Discord message sends are disabled.");
-      }
-      const to = readStringParam(params, "to", { required: true });
-      const content = readStringParam(params, "content", {
-        required: true,
-      });
-      const mediaUrl = readStringParam(params, "mediaUrl");
-      const replyTo = readStringParam(params, "replyTo");
-      const result = await sendMessageDiscord(to, content, {
-        mediaUrl,
-        replyTo,
-      });
-      return jsonResult({ ok: true, result });
-    }
-    case "editMessage": {
-      if (!isActionEnabled("messages")) {
-        throw new Error("Discord message edits are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      const content = readStringParam(params, "content", {
-        required: true,
-      });
-      const message = await editMessageDiscord(channelId, messageId, {
-        content,
-      });
-      return jsonResult({ ok: true, message });
-    }
-    case "deleteMessage": {
-      if (!isActionEnabled("messages")) {
-        throw new Error("Discord message deletes are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      await deleteMessageDiscord(channelId, messageId);
-      return jsonResult({ ok: true });
-    }
-    case "threadCreate": {
-      if (!isActionEnabled("threads")) {
-        throw new Error("Discord threads are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const name = readStringParam(params, "name", { required: true });
-      const messageId = readStringParam(params, "messageId");
-      const autoArchiveMinutesRaw = params.autoArchiveMinutes;
-      const autoArchiveMinutes =
-        typeof autoArchiveMinutesRaw === "number" &&
-        Number.isFinite(autoArchiveMinutesRaw)
-          ? autoArchiveMinutesRaw
-          : undefined;
-      const thread = await createThreadDiscord(channelId, {
-        name,
-        messageId,
-        autoArchiveMinutes,
-      });
-      return jsonResult({ ok: true, thread });
-    }
-    case "threadList": {
-      if (!isActionEnabled("threads")) {
-        throw new Error("Discord threads are disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const channelId = readStringParam(params, "channelId");
-      const includeArchived =
-        typeof params.includeArchived === "boolean"
-          ? params.includeArchived
-          : undefined;
-      const before = readStringParam(params, "before");
-      const limit =
-        typeof params.limit === "number" && Number.isFinite(params.limit)
-          ? params.limit
-          : undefined;
-      const threads = await listThreadsDiscord({
-        guildId,
-        channelId,
-        includeArchived,
-        before,
-        limit,
-      });
-      return jsonResult({ ok: true, threads });
-    }
-    case "threadReply": {
-      if (!isActionEnabled("threads")) {
-        throw new Error("Discord threads are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const content = readStringParam(params, "content", {
-        required: true,
-      });
-      const mediaUrl = readStringParam(params, "mediaUrl");
-      const replyTo = readStringParam(params, "replyTo");
-      const result = await sendMessageDiscord(`channel:${channelId}`, content, {
-        mediaUrl,
-        replyTo,
-      });
-      return jsonResult({ ok: true, result });
-    }
-    case "pinMessage": {
-      if (!isActionEnabled("pins")) {
-        throw new Error("Discord pins are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      await pinMessageDiscord(channelId, messageId);
-      return jsonResult({ ok: true });
-    }
-    case "unpinMessage": {
-      if (!isActionEnabled("pins")) {
-        throw new Error("Discord pins are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      await unpinMessageDiscord(channelId, messageId);
-      return jsonResult({ ok: true });
-    }
-    case "listPins": {
-      if (!isActionEnabled("pins")) {
-        throw new Error("Discord pins are disabled.");
-      }
-      const channelId = readStringParam(params, "channelId", {
-        required: true,
-      });
-      const pins = await listPinsDiscord(channelId);
-      return jsonResult({ ok: true, pins });
-    }
-    case "searchMessages": {
-      if (!isActionEnabled("search")) {
-        throw new Error("Discord search is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const content = readStringParam(params, "content", {
-        required: true,
-      });
-      const channelId = readStringParam(params, "channelId");
-      const channelIds = readStringArrayParam(params, "channelIds");
-      const authorId = readStringParam(params, "authorId");
-      const authorIds = readStringArrayParam(params, "authorIds");
-      const limit =
-        typeof params.limit === "number" && Number.isFinite(params.limit)
-          ? params.limit
-          : undefined;
-      const channelIdList = [
-        ...(channelIds ?? []),
-        ...(channelId ? [channelId] : []),
-      ];
-      const authorIdList = [
-        ...(authorIds ?? []),
-        ...(authorId ? [authorId] : []),
-      ];
-      const results = await searchMessagesDiscord({
-        guildId,
-        content,
-        channelIds: channelIdList.length ? channelIdList : undefined,
-        authorIds: authorIdList.length ? authorIdList : undefined,
-        limit,
-      });
-      return jsonResult({ ok: true, results });
-    }
-    default:
-      throw new Error(`Unknown action: ${action}`);
-  }
-}

src/agents/tools/discord-actions-moderation.ts

@@ -1,88 +0,0 @@
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import type { DiscordActionConfig } from "../../config/config.js";
-import {
-  banMemberDiscord,
-  kickMemberDiscord,
-  timeoutMemberDiscord,
-} from "../../discord/send.js";
-import { jsonResult, readStringParam } from "./common.js";
-
-type ActionGate = (
-  key: keyof DiscordActionConfig,
-  defaultValue?: boolean,
-) => boolean;
-
-export async function handleDiscordModerationAction(
-  action: string,
-  params: Record<string, unknown>,
-  isActionEnabled: ActionGate,
-): Promise<AgentToolResult<unknown>> {
-  switch (action) {
-    case "timeout": {
-      if (!isActionEnabled("moderation", false)) {
-        throw new Error("Discord moderation is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const userId = readStringParam(params, "userId", {
-        required: true,
-      });
-      const durationMinutes =
-        typeof params.durationMinutes === "number" &&
-        Number.isFinite(params.durationMinutes)
-          ? params.durationMinutes
-          : undefined;
-      const until = readStringParam(params, "until");
-      const reason = readStringParam(params, "reason");
-      const member = await timeoutMemberDiscord({
-        guildId,
-        userId,
-        durationMinutes,
-        until,
-        reason,
-      });
-      return jsonResult({ ok: true, member });
-    }
-    case "kick": {
-      if (!isActionEnabled("moderation", false)) {
-        throw new Error("Discord moderation is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const userId = readStringParam(params, "userId", {
-        required: true,
-      });
-      const reason = readStringParam(params, "reason");
-      await kickMemberDiscord({ guildId, userId, reason });
-      return jsonResult({ ok: true });
-    }
-    case "ban": {
-      if (!isActionEnabled("moderation", false)) {
-        throw new Error("Discord moderation is disabled.");
-      }
-      const guildId = readStringParam(params, "guildId", {
-        required: true,
-      });
-      const userId = readStringParam(params, "userId", {
-        required: true,
-      });
-      const reason = readStringParam(params, "reason");
-      const deleteMessageDays =
-        typeof params.deleteMessageDays === "number" &&
-        Number.isFinite(params.deleteMessageDays)
-          ? params.deleteMessageDays
-          : undefined;
-      await banMemberDiscord({
-        guildId,
-        userId,
-        reason,
-        deleteMessageDays,
-      });
-      return jsonResult({ ok: true });
-    }
-    default:
-      throw new Error(`Unknown action: ${action}`);
-  }
-}

src/agents/tools/discord-actions.ts

@@ -1,73 +0,0 @@
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import type {
-  ClawdisConfig,
-  DiscordActionConfig,
-} from "../../config/config.js";
-import { readStringParam } from "./common.js";
-import { handleDiscordGuildAction } from "./discord-actions-guild.js";
-import { handleDiscordMessagingAction } from "./discord-actions-messaging.js";
-import { handleDiscordModerationAction } from "./discord-actions-moderation.js";
-
-const messagingActions = new Set([
-  "react",
-  "reactions",
-  "sticker",
-  "poll",
-  "permissions",
-  "readMessages",
-  "sendMessage",
-  "editMessage",
-  "deleteMessage",
-  "threadCreate",
-  "threadList",
-  "threadReply",
-  "pinMessage",
-  "unpinMessage",
-  "listPins",
-  "searchMessages",
-]);
-
-const guildActions = new Set([
-  "memberInfo",
-  "roleInfo",
-  "emojiList",
-  "emojiUpload",
-  "stickerUpload",
-  "roleAdd",
-  "roleRemove",
-  "channelInfo",
-  "channelList",
-  "voiceStatus",
-  "eventList",
-  "eventCreate",
-]);
-
-const moderationActions = new Set(["timeout", "kick", "ban"]);
-
-type ActionGate = (
-  key: keyof DiscordActionConfig,
-  defaultValue?: boolean,
-) => boolean;
-
-export async function handleDiscordAction(
-  params: Record<string, unknown>,
-  cfg: ClawdisConfig,
-): Promise<AgentToolResult<unknown>> {
-  const action = readStringParam(params, "action", { required: true });
-  const isActionEnabled: ActionGate = (key, defaultValue = true) => {
-    const value = cfg.discord?.actions?.[key];
-    if (value === undefined) return defaultValue;
-    return value !== false;
-  };
-
-  if (messagingActions.has(action)) {
-    return await handleDiscordMessagingAction(action, params, isActionEnabled);
-  }
-  if (guildActions.has(action)) {
-    return await handleDiscordGuildAction(action, params, isActionEnabled);
-  }
-  if (moderationActions.has(action)) {
-    return await handleDiscordModerationAction(action, params, isActionEnabled);
-  }
-  throw new Error(`Unknown action: ${action}`);
-}

src/agents/tools/discord-schema.ts

@@ -1,202 +0,0 @@
-import { Type } from "@sinclair/typebox";
-
-export const DiscordToolSchema = Type.Union([
-  Type.Object({
-    action: Type.Literal("react"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-    emoji: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("reactions"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-    limit: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("sticker"),
-    to: Type.String(),
-    stickerIds: Type.Array(Type.String()),
-    content: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("poll"),
-    to: Type.String(),
-    question: Type.String(),
-    answers: Type.Array(Type.String()),
-    allowMultiselect: Type.Optional(Type.Boolean()),
-    durationHours: Type.Optional(Type.Number()),
-    content: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("permissions"),
-    channelId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("readMessages"),
-    channelId: Type.String(),
-    limit: Type.Optional(Type.Number()),
-    before: Type.Optional(Type.String()),
-    after: Type.Optional(Type.String()),
-    around: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("sendMessage"),
-    to: Type.String(),
-    content: Type.String(),
-    mediaUrl: Type.Optional(Type.String()),
-    replyTo: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("editMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-    content: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("deleteMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("threadCreate"),
-    channelId: Type.String(),
-    name: Type.String(),
-    messageId: Type.Optional(Type.String()),
-    autoArchiveMinutes: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("threadList"),
-    guildId: Type.String(),
-    channelId: Type.Optional(Type.String()),
-    includeArchived: Type.Optional(Type.Boolean()),
-    before: Type.Optional(Type.String()),
-    limit: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("threadReply"),
-    channelId: Type.String(),
-    content: Type.String(),
-    mediaUrl: Type.Optional(Type.String()),
-    replyTo: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("pinMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("unpinMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("listPins"),
-    channelId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("searchMessages"),
-    guildId: Type.String(),
-    content: Type.String(),
-    channelId: Type.Optional(Type.String()),
-    channelIds: Type.Optional(Type.Array(Type.String())),
-    authorId: Type.Optional(Type.String()),
-    authorIds: Type.Optional(Type.Array(Type.String())),
-    limit: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("memberInfo"),
-    guildId: Type.String(),
-    userId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("roleInfo"),
-    guildId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("emojiList"),
-    guildId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("emojiUpload"),
-    guildId: Type.String(),
-    name: Type.String(),
-    mediaUrl: Type.String(),
-    roleIds: Type.Optional(Type.Array(Type.String())),
-  }),
-  Type.Object({
-    action: Type.Literal("stickerUpload"),
-    guildId: Type.String(),
-    name: Type.String(),
-    description: Type.String(),
-    tags: Type.String(),
-    mediaUrl: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("roleAdd"),
-    guildId: Type.String(),
-    userId: Type.String(),
-    roleId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("roleRemove"),
-    guildId: Type.String(),
-    userId: Type.String(),
-    roleId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("channelInfo"),
-    channelId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("channelList"),
-    guildId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("voiceStatus"),
-    guildId: Type.String(),
-    userId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("eventList"),
-    guildId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("eventCreate"),
-    guildId: Type.String(),
-    name: Type.String(),
-    startTime: Type.String(),
-    endTime: Type.Optional(Type.String()),
-    description: Type.Optional(Type.String()),
-    channelId: Type.Optional(Type.String()),
-    entityType: Type.Optional(
-      Type.Union([
-        Type.Literal("voice"),
-        Type.Literal("stage"),
-        Type.Literal("external"),
-      ]),
-    ),
-    location: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("timeout"),
-    guildId: Type.String(),
-    userId: Type.String(),
-    durationMinutes: Type.Optional(Type.Number()),
-    until: Type.Optional(Type.String()),
-    reason: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("kick"),
-    guildId: Type.String(),
-    userId: Type.String(),
-    reason: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("ban"),
-    guildId: Type.String(),
-    userId: Type.String(),
-    reason: Type.Optional(Type.String()),
-    deleteMessageDays: Type.Optional(Type.Number()),
-  }),
-]);

src/agents/tools/discord-tool.ts

@@ -1,18 +0,0 @@
-import { loadConfig } from "../../config/config.js";
-import type { AnyAgentTool } from "./common.js";
-import { handleDiscordAction } from "./discord-actions.js";
-import { DiscordToolSchema } from "./discord-schema.js";
-
-export function createDiscordTool(): AnyAgentTool {
-  return {
-    label: "Discord",
-    name: "discord",
-    description: "Manage Discord messages, reactions, and moderation.",
-    parameters: DiscordToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const cfg = loadConfig();
-      return await handleDiscordAction(params, cfg);
-    },
-  };
-}

src/agents/tools/gateway-tool.ts

@@ -1,53 +0,0 @@
-import { Type } from "@sinclair/typebox";
-
-import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
-
-const GatewayToolSchema = Type.Union([
-  Type.Object({
-    action: Type.Literal("restart"),
-    delayMs: Type.Optional(Type.Number()),
-    reason: Type.Optional(Type.String()),
-  }),
-]);
-
-export function createGatewayTool(): AnyAgentTool {
-  return {
-    label: "Gateway",
-    name: "gateway",
-    description:
-      "Restart the running gateway process in-place (SIGUSR1) without needing an external supervisor. Use delayMs to avoid interrupting an in-flight reply.",
-    parameters: GatewayToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const action = readStringParam(params, "action", { required: true });
-      if (action !== "restart") throw new Error(`Unknown action: ${action}`);
-
-      const delayMsRaw =
-        typeof params.delayMs === "number" && Number.isFinite(params.delayMs)
-          ? Math.floor(params.delayMs)
-          : 2000;
-      const delayMs = Math.min(Math.max(delayMsRaw, 0), 60_000);
-      const reason =
-        typeof params.reason === "string" && params.reason.trim()
-          ? params.reason.trim().slice(0, 200)
-          : undefined;
-
-      const pid = process.pid;
-      setTimeout(() => {
-        try {
-          process.kill(pid, "SIGUSR1");
-        } catch {
-          /* ignore */
-        }
-      }, delayMs);
-
-      return jsonResult({
-        ok: true,
-        pid,
-        signal: "SIGUSR1",
-        delayMs,
-        reason: reason ?? null,
-      });
-    },
-  };
-}

src/agents/tools/gateway.ts

@@ -1,44 +0,0 @@
-import { callGateway } from "../../gateway/call.js";
-
-export const DEFAULT_GATEWAY_URL = "ws://127.0.0.1:18789";
-
-export type GatewayCallOptions = {
-  gatewayUrl?: string;
-  gatewayToken?: string;
-  timeoutMs?: number;
-};
-
-export function resolveGatewayOptions(opts?: GatewayCallOptions) {
-  const url =
-    typeof opts?.gatewayUrl === "string" && opts.gatewayUrl.trim()
-      ? opts.gatewayUrl.trim()
-      : DEFAULT_GATEWAY_URL;
-  const token =
-    typeof opts?.gatewayToken === "string" && opts.gatewayToken.trim()
-      ? opts.gatewayToken.trim()
-      : undefined;
-  const timeoutMs =
-    typeof opts?.timeoutMs === "number" && Number.isFinite(opts.timeoutMs)
-      ? Math.max(1, Math.floor(opts.timeoutMs))
-      : 10_000;
-  return { url, token, timeoutMs };
-}
-
-export async function callGatewayTool<T = unknown>(
-  method: string,
-  opts: GatewayCallOptions,
-  params?: unknown,
-  extra?: { expectFinal?: boolean },
-) {
-  const gateway = resolveGatewayOptions(opts);
-  return await callGateway<T>({
-    url: gateway.url,
-    token: gateway.token,
-    method,
-    params,
-    timeoutMs: gateway.timeoutMs,
-    expectFinal: extra?.expectFinal,
-    clientName: "agent",
-    mode: "agent",
-  });
-}

src/agents/tools/nodes-tool.ts

@@ -1,486 +0,0 @@
-import crypto from "node:crypto";
-
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import { Type } from "@sinclair/typebox";
-
-import {
-  type CameraFacing,
-  cameraTempPath,
-  parseCameraClipPayload,
-  parseCameraSnapPayload,
-  writeBase64ToFile,
-} from "../../cli/nodes-camera.js";
-import {
-  parseScreenRecordPayload,
-  screenRecordTempPath,
-  writeScreenRecordToFile,
-} from "../../cli/nodes-screen.js";
-import { parseDurationMs } from "../../cli/parse-duration.js";
-import { imageMimeFromFormat } from "../../media/mime.js";
-import { sanitizeToolResultImages } from "../tool-images.js";
-import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
-import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
-import { resolveNodeId } from "./nodes-utils.js";
-
-const NodesToolSchema = Type.Union([
-  Type.Object({
-    action: Type.Literal("status"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("describe"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("pending"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-  }),
-  Type.Object({
-    action: Type.Literal("approve"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    requestId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("reject"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    requestId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("notify"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.String(),
-    title: Type.Optional(Type.String()),
-    body: Type.Optional(Type.String()),
-    sound: Type.Optional(Type.String()),
-    priority: Type.Optional(
-      Type.Union([
-        Type.Literal("passive"),
-        Type.Literal("active"),
-        Type.Literal("timeSensitive"),
-      ]),
-    ),
-    delivery: Type.Optional(
-      Type.Union([
-        Type.Literal("system"),
-        Type.Literal("overlay"),
-        Type.Literal("auto"),
-      ]),
-    ),
-  }),
-  Type.Object({
-    action: Type.Literal("camera_snap"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.String(),
-    facing: Type.Optional(
-      Type.Union([
-        Type.Literal("front"),
-        Type.Literal("back"),
-        Type.Literal("both"),
-      ]),
-    ),
-    maxWidth: Type.Optional(Type.Number()),
-    quality: Type.Optional(Type.Number()),
-    delayMs: Type.Optional(Type.Number()),
-    deviceId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("camera_list"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("camera_clip"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.String(),
-    facing: Type.Optional(
-      Type.Union([Type.Literal("front"), Type.Literal("back")]),
-    ),
-    duration: Type.Optional(Type.String()),
-    durationMs: Type.Optional(Type.Number()),
-    includeAudio: Type.Optional(Type.Boolean()),
-    deviceId: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("screen_record"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.String(),
-    duration: Type.Optional(Type.String()),
-    durationMs: Type.Optional(Type.Number()),
-    fps: Type.Optional(Type.Number()),
-    screenIndex: Type.Optional(Type.Number()),
-    includeAudio: Type.Optional(Type.Boolean()),
-    outPath: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("location_get"),
-    gatewayUrl: Type.Optional(Type.String()),
-    gatewayToken: Type.Optional(Type.String()),
-    timeoutMs: Type.Optional(Type.Number()),
-    node: Type.String(),
-    maxAgeMs: Type.Optional(Type.Number()),
-    locationTimeoutMs: Type.Optional(Type.Number()),
-    desiredAccuracy: Type.Optional(
-      Type.Union([
-        Type.Literal("coarse"),
-        Type.Literal("balanced"),
-        Type.Literal("precise"),
-      ]),
-    ),
-  }),
-]);
-
-export function createNodesTool(): AnyAgentTool {
-  return {
-    label: "Nodes",
-    name: "nodes",
-    description:
-      "Discover and control paired nodes (status/describe/pairing/notify/camera/screen/location).",
-    parameters: NodesToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const action = readStringParam(params, "action", { required: true });
-      const gatewayOpts: GatewayCallOptions = {
-        gatewayUrl: readStringParam(params, "gatewayUrl", { trim: false }),
-        gatewayToken: readStringParam(params, "gatewayToken", { trim: false }),
-        timeoutMs:
-          typeof params.timeoutMs === "number" ? params.timeoutMs : undefined,
-      };
-
-      switch (action) {
-        case "status":
-          return jsonResult(
-            await callGatewayTool("node.list", gatewayOpts, {}),
-          );
-        case "describe": {
-          const node = readStringParam(params, "node", { required: true });
-          const nodeId = await resolveNodeId(gatewayOpts, node);
-          return jsonResult(
-            await callGatewayTool("node.describe", gatewayOpts, { nodeId }),
-          );
-        }
-        case "pending":
-          return jsonResult(
-            await callGatewayTool("node.pair.list", gatewayOpts, {}),
-          );
-        case "approve": {
-          const requestId = readStringParam(params, "requestId", {
-            required: true,
-          });
-          return jsonResult(
-            await callGatewayTool("node.pair.approve", gatewayOpts, {
-              requestId,
-            }),
-          );
-        }
-        case "reject": {
-          const requestId = readStringParam(params, "requestId", {
-            required: true,
-          });
-          return jsonResult(
-            await callGatewayTool("node.pair.reject", gatewayOpts, {
-              requestId,
-            }),
-          );
-        }
-        case "notify": {
-          const node = readStringParam(params, "node", { required: true });
-          const title = typeof params.title === "string" ? params.title : "";
-          const body = typeof params.body === "string" ? params.body : "";
-          if (!title.trim() && !body.trim()) {
-            throw new Error("title or body required");
-          }
-          const nodeId = await resolveNodeId(gatewayOpts, node);
-          await callGatewayTool("node.invoke", gatewayOpts, {
-            nodeId,
-            command: "system.notify",
-            params: {
-              title: title.trim() || undefined,
-              body: body.trim() || undefined,
-              sound:
-                typeof params.sound === "string" ? params.sound : undefined,
-              priority:
-                typeof params.priority === "string"
-                  ? params.priority
-                  : undefined,
-              delivery:
-                typeof params.delivery === "string"
-                  ? params.delivery
-                  : undefined,
-            },
-            idempotencyKey: crypto.randomUUID(),
-          });
-          return jsonResult({ ok: true });
-        }
-        case "camera_snap": {
-          const node = readStringParam(params, "node", { required: true });
-          const nodeId = await resolveNodeId(gatewayOpts, node);
-          const facingRaw =
-            typeof params.facing === "string"
-              ? params.facing.toLowerCase()
-              : "both";
-          const facings: CameraFacing[] =
-            facingRaw === "both"
-              ? ["front", "back"]
-              : facingRaw === "front" || facingRaw === "back"
-                ? [facingRaw]
-                : (() => {
-                    throw new Error("invalid facing (front|back|both)");
-                  })();
-          const maxWidth =
-            typeof params.maxWidth === "number" &&
-            Number.isFinite(params.maxWidth)
-              ? params.maxWidth
-              : undefined;
-          const quality =
-            typeof params.quality === "number" &&
-            Number.isFinite(params.quality)
-              ? params.quality
-              : undefined;
-          const delayMs =
-            typeof params.delayMs === "number" &&
-            Number.isFinite(params.delayMs)
-              ? params.delayMs
-              : undefined;
-          const deviceId =
-            typeof params.deviceId === "string" && params.deviceId.trim()
-              ? params.deviceId.trim()
-              : undefined;
-
-          const content: AgentToolResult<unknown>["content"] = [];
-          const details: Array<Record<string, unknown>> = [];
-
-          for (const facing of facings) {
-            const raw = (await callGatewayTool("node.invoke", gatewayOpts, {
-              nodeId,
-              command: "camera.snap",
-              params: {
-                facing,
-                maxWidth,
-                quality,
-                format: "jpg",
-                delayMs,
-                deviceId,
-              },
-              idempotencyKey: crypto.randomUUID(),
-            })) as { payload?: unknown };
-            const payload = parseCameraSnapPayload(raw?.payload);
-            const normalizedFormat = payload.format.toLowerCase();
-            if (
-              normalizedFormat !== "jpg" &&
-              normalizedFormat !== "jpeg" &&
-              normalizedFormat !== "png"
-            ) {
-              throw new Error(
-                `unsupported camera.snap format: ${payload.format}`,
-              );
-            }
-
-            const isJpeg =
-              normalizedFormat === "jpg" || normalizedFormat === "jpeg";
-            const filePath = cameraTempPath({
-              kind: "snap",
-              facing,
-              ext: isJpeg ? "jpg" : "png",
-            });
-            await writeBase64ToFile(filePath, payload.base64);
-            content.push({ type: "text", text: `MEDIA:${filePath}` });
-            content.push({
-              type: "image",
-              data: payload.base64,
-              mimeType:
-                imageMimeFromFormat(payload.format) ??
-                (isJpeg ? "image/jpeg" : "image/png"),
-            });
-            details.push({
-              facing,
-              path: filePath,
-              width: payload.width,
-              height: payload.height,
-            });
-          }
-
-          const result: AgentToolResult<unknown> = { content, details };
-          return await sanitizeToolResultImages(result, "nodes:camera_snap");
-        }
-        case "camera_list": {
-          const node = readStringParam(params, "node", { required: true });
-          const nodeId = await resolveNodeId(gatewayOpts, node);
-          const raw = (await callGatewayTool("node.invoke", gatewayOpts, {
-            nodeId,
-            command: "camera.list",
-            params: {},
-            idempotencyKey: crypto.randomUUID(),
-          })) as { payload?: unknown };
-          const payload =
-            raw && typeof raw.payload === "object" && raw.payload !== null
-              ? raw.payload
-              : {};
-          return jsonResult(payload);
-        }
-        case "camera_clip": {
-          const node = readStringParam(params, "node", { required: true });
-          const nodeId = await resolveNodeId(gatewayOpts, node);
-          const facing =
-            typeof params.facing === "string"
-              ? params.facing.toLowerCase()
-              : "front";
-          if (facing !== "front" && facing !== "back") {
-            throw new Error("invalid facing (front|back)");
-          }
-          const durationMs =
-            typeof params.durationMs === "number" &&
-            Number.isFinite(params.durationMs)
-              ? params.durationMs
-              : typeof params.duration === "string"
-                ? parseDurationMs(params.duration)
-                : 3000;
-          const includeAudio =
-            typeof params.includeAudio === "boolean"
-              ? params.includeAudio
-              : true;
-          const deviceId =
-            typeof params.deviceId === "string" && params.deviceId.trim()
-              ? params.deviceId.trim()
-              : undefined;
-          const raw = (await callGatewayTool("node.invoke", gatewayOpts, {
-            nodeId,
-            command: "camera.clip",
-            params: {
-              facing,
-              durationMs,
-              includeAudio,
-              format: "mp4",
-              deviceId,
-            },
-            idempotencyKey: crypto.randomUUID(),
-          })) as { payload?: unknown };
-          const payload = parseCameraClipPayload(raw?.payload);
-          const filePath = cameraTempPath({
-            kind: "clip",
-            facing,
-            ext: payload.format,
-          });
-          await writeBase64ToFile(filePath, payload.base64);
-          return {
-            content: [{ type: "text", text: `FILE:${filePath}` }],
-            details: {
-              facing,
-              path: filePath,
-              durationMs: payload.durationMs,
-              hasAudio: payload.hasAudio,
-            },
-          };
-        }
-        case "screen_record": {
-          const node = readStringParam(params, "node", { required: true });
-          const nodeId = await resolveNodeId(gatewayOpts, node);
-          const durationMs =
-            typeof params.durationMs === "number" &&
-            Number.isFinite(params.durationMs)
-              ? params.durationMs
-              : typeof params.duration === "string"
-                ? parseDurationMs(params.duration)
-                : 10_000;
-          const fps =
-            typeof params.fps === "number" && Number.isFinite(params.fps)
-              ? params.fps
-              : 10;
-          const screenIndex =
-            typeof params.screenIndex === "number" &&
-            Number.isFinite(params.screenIndex)
-              ? params.screenIndex
-              : 0;
-          const includeAudio =
-            typeof params.includeAudio === "boolean"
-              ? params.includeAudio
-              : true;
-          const raw = (await callGatewayTool("node.invoke", gatewayOpts, {
-            nodeId,
-            command: "screen.record",
-            params: {
-              durationMs,
-              screenIndex,
-              fps,
-              format: "mp4",
-              includeAudio,
-            },
-            idempotencyKey: crypto.randomUUID(),
-          })) as { payload?: unknown };
-          const payload = parseScreenRecordPayload(raw?.payload);
-          const filePath =
-            typeof params.outPath === "string" && params.outPath.trim()
-              ? params.outPath.trim()
-              : screenRecordTempPath({ ext: payload.format || "mp4" });
-          const written = await writeScreenRecordToFile(
-            filePath,
-            payload.base64,
-          );
-          return {
-            content: [{ type: "text", text: `FILE:${written.path}` }],
-            details: {
-              path: written.path,
-              durationMs: payload.durationMs,
-              fps: payload.fps,
-              screenIndex: payload.screenIndex,
-              hasAudio: payload.hasAudio,
-            },
-          };
-        }
-        case "location_get": {
-          const node = readStringParam(params, "node", { required: true });
-          const nodeId = await resolveNodeId(gatewayOpts, node);
-          const maxAgeMs =
-            typeof params.maxAgeMs === "number" &&
-            Number.isFinite(params.maxAgeMs)
-              ? params.maxAgeMs
-              : undefined;
-          const desiredAccuracy =
-            params.desiredAccuracy === "coarse" ||
-            params.desiredAccuracy === "balanced" ||
-            params.desiredAccuracy === "precise"
-              ? params.desiredAccuracy
-              : undefined;
-          const locationTimeoutMs =
-            typeof params.locationTimeoutMs === "number" &&
-            Number.isFinite(params.locationTimeoutMs)
-              ? params.locationTimeoutMs
-              : undefined;
-          const raw = (await callGatewayTool("node.invoke", gatewayOpts, {
-            nodeId,
-            command: "location.get",
-            params: {
-              maxAgeMs,
-              desiredAccuracy,
-              timeoutMs: locationTimeoutMs,
-            },
-            idempotencyKey: crypto.randomUUID(),
-          })) as { payload?: unknown };
-          return jsonResult(raw?.payload ?? {});
-        }
-        default:
-          throw new Error(`Unknown action: ${action}`);
-      }
-    },
-  };
-}

src/agents/tools/nodes-utils.ts

@@ -1,148 +0,0 @@
-import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
-
-type NodeListNode = {
-  nodeId: string;
-  displayName?: string;
-  platform?: string;
-  remoteIp?: string;
-  deviceFamily?: string;
-  modelIdentifier?: string;
-  caps?: string[];
-  commands?: string[];
-  permissions?: Record<string, boolean>;
-  paired?: boolean;
-  connected?: boolean;
-};
-
-type PendingRequest = {
-  requestId: string;
-  nodeId: string;
-  displayName?: string;
-  platform?: string;
-  version?: string;
-  remoteIp?: string;
-  isRepair?: boolean;
-  ts: number;
-};
-
-type PairedNode = {
-  nodeId: string;
-  token?: string;
-  displayName?: string;
-  platform?: string;
-  version?: string;
-  remoteIp?: string;
-  permissions?: Record<string, boolean>;
-  createdAtMs?: number;
-  approvedAtMs?: number;
-};
-
-type PairingList = {
-  pending: PendingRequest[];
-  paired: PairedNode[];
-};
-
-function parseNodeList(value: unknown): NodeListNode[] {
-  const obj =
-    typeof value === "object" && value !== null
-      ? (value as Record<string, unknown>)
-      : {};
-  return Array.isArray(obj.nodes) ? (obj.nodes as NodeListNode[]) : [];
-}
-
-function parsePairingList(value: unknown): PairingList {
-  const obj =
-    typeof value === "object" && value !== null
-      ? (value as Record<string, unknown>)
-      : {};
-  const pending = Array.isArray(obj.pending)
-    ? (obj.pending as PendingRequest[])
-    : [];
-  const paired = Array.isArray(obj.paired) ? (obj.paired as PairedNode[]) : [];
-  return { pending, paired };
-}
-
-function normalizeNodeKey(value: string) {
-  return value
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+/, "")
-    .replace(/-+$/, "");
-}
-
-async function loadNodes(opts: GatewayCallOptions): Promise<NodeListNode[]> {
-  try {
-    const res = (await callGatewayTool("node.list", opts, {})) as unknown;
-    return parseNodeList(res);
-  } catch {
-    const res = (await callGatewayTool("node.pair.list", opts, {})) as unknown;
-    const { paired } = parsePairingList(res);
-    return paired.map((n) => ({
-      nodeId: n.nodeId,
-      displayName: n.displayName,
-      platform: n.platform,
-      remoteIp: n.remoteIp,
-    }));
-  }
-}
-
-function pickDefaultNode(nodes: NodeListNode[]): NodeListNode | null {
-  const withCanvas = nodes.filter((n) =>
-    Array.isArray(n.caps) ? n.caps.includes("canvas") : true,
-  );
-  if (withCanvas.length === 0) return null;
-
-  const connected = withCanvas.filter((n) => n.connected);
-  const candidates = connected.length > 0 ? connected : withCanvas;
-  if (candidates.length === 1) return candidates[0];
-
-  const local = candidates.filter(
-    (n) =>
-      n.platform?.toLowerCase().startsWith("mac") &&
-      typeof n.nodeId === "string" &&
-      n.nodeId.startsWith("mac-"),
-  );
-  if (local.length === 1) return local[0];
-
-  return null;
-}
-
-export async function resolveNodeId(
-  opts: GatewayCallOptions,
-  query?: string,
-  allowDefault = false,
-) {
-  const nodes = await loadNodes(opts);
-  const q = String(query ?? "").trim();
-  if (!q) {
-    if (allowDefault) {
-      const picked = pickDefaultNode(nodes);
-      if (picked) return picked.nodeId;
-    }
-    throw new Error("node required");
-  }
-
-  const qNorm = normalizeNodeKey(q);
-  const matches = nodes.filter((n) => {
-    if (n.nodeId === q) return true;
-    if (typeof n.remoteIp === "string" && n.remoteIp === q) return true;
-    const name = typeof n.displayName === "string" ? n.displayName : "";
-    if (name && normalizeNodeKey(name) === qNorm) return true;
-    if (q.length >= 6 && n.nodeId.startsWith(q)) return true;
-    return false;
-  });
-
-  if (matches.length === 1) return matches[0].nodeId;
-  if (matches.length === 0) {
-    const known = nodes
-      .map((n) => n.displayName || n.remoteIp || n.nodeId)
-      .filter(Boolean)
-      .join(", ");
-    throw new Error(`unknown node: ${q}${known ? ` (known: ${known})` : ""}`);
-  }
-  throw new Error(
-    `ambiguous node: ${q} (matches: ${matches
-      .map((n) => n.displayName || n.remoteIp || n.nodeId)
-      .join(", ")})`,
-  );
-}

src/agents/tools/sessions-helpers.ts

@@ -1,105 +0,0 @@
-import type { ClawdisConfig } from "../../config/config.js";
-
-export type SessionKind = "main" | "group" | "cron" | "hook" | "node" | "other";
-
-function normalizeKey(value?: string) {
-  const trimmed = value?.trim();
-  return trimmed ? trimmed : undefined;
-}
-
-export function resolveMainSessionAlias(cfg: ClawdisConfig) {
-  const mainKey = normalizeKey(cfg.session?.mainKey) ?? "main";
-  const scope = cfg.session?.scope ?? "per-sender";
-  const alias = scope === "global" ? "global" : mainKey;
-  return { mainKey, alias, scope };
-}
-
-export function resolveDisplaySessionKey(params: {
-  key: string;
-  alias: string;
-  mainKey: string;
-}) {
-  if (params.key === params.alias) return "main";
-  if (params.key === params.mainKey) return "main";
-  return params.key;
-}
-
-export function resolveInternalSessionKey(params: {
-  key: string;
-  alias: string;
-  mainKey: string;
-}) {
-  if (params.key === "main") return params.alias;
-  return params.key;
-}
-
-export function classifySessionKind(params: {
-  key: string;
-  gatewayKind?: string | null;
-  alias: string;
-  mainKey: string;
-}): SessionKind {
-  const key = params.key;
-  if (key === params.alias || key === params.mainKey) return "main";
-  if (key.startsWith("cron:")) return "cron";
-  if (key.startsWith("hook:")) return "hook";
-  if (key.startsWith("node-") || key.startsWith("node:")) return "node";
-  if (params.gatewayKind === "group") return "group";
-  if (
-    key.startsWith("group:") ||
-    key.includes(":group:") ||
-    key.includes(":channel:")
-  ) {
-    return "group";
-  }
-  return "other";
-}
-
-export function deriveProvider(params: {
-  key: string;
-  kind: SessionKind;
-  surface?: string | null;
-  lastChannel?: string | null;
-}): string {
-  if (
-    params.kind === "cron" ||
-    params.kind === "hook" ||
-    params.kind === "node"
-  )
-    return "internal";
-  const surface = normalizeKey(params.surface ?? undefined);
-  if (surface) return surface;
-  const lastChannel = normalizeKey(params.lastChannel ?? undefined);
-  if (lastChannel) return lastChannel;
-  const parts = params.key.split(":").filter(Boolean);
-  if (parts.length >= 3 && (parts[1] === "group" || parts[1] === "channel")) {
-    return parts[0];
-  }
-  return "unknown";
-}
-
-export function stripToolMessages(messages: unknown[]): unknown[] {
-  return messages.filter((msg) => {
-    if (!msg || typeof msg !== "object") return true;
-    const role = (msg as { role?: unknown }).role;
-    return role !== "toolResult";
-  });
-}
-
-export function extractAssistantText(message: unknown): string | undefined {
-  if (!message || typeof message !== "object") return undefined;
-  if ((message as { role?: unknown }).role !== "assistant") return undefined;
-  const content = (message as { content?: unknown }).content;
-  if (!Array.isArray(content)) return undefined;
-  const chunks: string[] = [];
-  for (const block of content) {
-    if (!block || typeof block !== "object") continue;
-    if ((block as { type?: unknown }).type !== "text") continue;
-    const text = (block as { text?: unknown }).text;
-    if (typeof text === "string" && text.trim()) {
-      chunks.push(text);
-    }
-  }
-  const joined = chunks.join("").trim();
-  return joined ? joined : undefined;
-}

src/agents/tools/sessions-history-tool.ts

@@ -1,63 +0,0 @@
-import { Type } from "@sinclair/typebox";
-
-import { loadConfig } from "../../config/config.js";
-import { callGateway } from "../../gateway/call.js";
-import type { AnyAgentTool } from "./common.js";
-import { jsonResult, readStringParam } from "./common.js";
-import {
-  resolveDisplaySessionKey,
-  resolveInternalSessionKey,
-  resolveMainSessionAlias,
-  stripToolMessages,
-} from "./sessions-helpers.js";
-
-const SessionsHistoryToolSchema = Type.Object({
-  sessionKey: Type.String(),
-  limit: Type.Optional(Type.Integer({ minimum: 1 })),
-  includeTools: Type.Optional(Type.Boolean()),
-});
-
-export function createSessionsHistoryTool(): AnyAgentTool {
-  return {
-    label: "Session History",
-    name: "sessions_history",
-    description: "Fetch message history for a session.",
-    parameters: SessionsHistoryToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const sessionKey = readStringParam(params, "sessionKey", {
-        required: true,
-      });
-      const cfg = loadConfig();
-      const { mainKey, alias } = resolveMainSessionAlias(cfg);
-      const resolvedKey = resolveInternalSessionKey({
-        key: sessionKey,
-        alias,
-        mainKey,
-      });
-      const limit =
-        typeof params.limit === "number" && Number.isFinite(params.limit)
-          ? Math.max(1, Math.floor(params.limit))
-          : undefined;
-      const includeTools = Boolean(params.includeTools);
-      const result = (await callGateway({
-        method: "chat.history",
-        params: { sessionKey: resolvedKey, limit },
-      })) as { messages?: unknown[] };
-      const rawMessages = Array.isArray(result?.messages)
-        ? result.messages
-        : [];
-      const messages = includeTools
-        ? rawMessages
-        : stripToolMessages(rawMessages);
-      return jsonResult({
-        sessionKey: resolveDisplaySessionKey({
-          key: sessionKey,
-          alias,
-          mainKey,
-        }),
-        messages,
-      });
-    },
-  };
-}

src/agents/tools/sessions-list-tool.ts

@@ -1,209 +0,0 @@
-import path from "node:path";
-
-import { Type } from "@sinclair/typebox";
-
-import { loadConfig } from "../../config/config.js";
-import { callGateway } from "../../gateway/call.js";
-import type { AnyAgentTool } from "./common.js";
-import { jsonResult, readStringArrayParam } from "./common.js";
-import {
-  classifySessionKind,
-  deriveProvider,
-  resolveDisplaySessionKey,
-  resolveInternalSessionKey,
-  resolveMainSessionAlias,
-  type SessionKind,
-  stripToolMessages,
-} from "./sessions-helpers.js";
-
-type SessionListRow = {
-  key: string;
-  kind: SessionKind;
-  provider: string;
-  displayName?: string;
-  updatedAt?: number | null;
-  sessionId?: string;
-  model?: string;
-  contextTokens?: number | null;
-  totalTokens?: number | null;
-  thinkingLevel?: string;
-  verboseLevel?: string;
-  systemSent?: boolean;
-  abortedLastRun?: boolean;
-  sendPolicy?: string;
-  lastChannel?: string;
-  lastTo?: string;
-  transcriptPath?: string;
-  messages?: unknown[];
-};
-
-const SessionsListToolSchema = Type.Object({
-  kinds: Type.Optional(Type.Array(Type.String())),
-  limit: Type.Optional(Type.Integer({ minimum: 1 })),
-  activeMinutes: Type.Optional(Type.Integer({ minimum: 1 })),
-  messageLimit: Type.Optional(Type.Integer({ minimum: 0 })),
-});
-
-export function createSessionsListTool(): AnyAgentTool {
-  return {
-    label: "Sessions",
-    name: "sessions_list",
-    description: "List sessions with optional filters and last messages.",
-    parameters: SessionsListToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const cfg = loadConfig();
-      const { mainKey, alias } = resolveMainSessionAlias(cfg);
-
-      const kindsRaw = readStringArrayParam(params, "kinds")?.map((value) =>
-        value.trim().toLowerCase(),
-      );
-      const allowedKindsList = (kindsRaw ?? []).filter((value) =>
-        ["main", "group", "cron", "hook", "node", "other"].includes(value),
-      );
-      const allowedKinds = allowedKindsList.length
-        ? new Set(allowedKindsList)
-        : undefined;
-
-      const limit =
-        typeof params.limit === "number" && Number.isFinite(params.limit)
-          ? Math.max(1, Math.floor(params.limit))
-          : undefined;
-      const activeMinutes =
-        typeof params.activeMinutes === "number" &&
-        Number.isFinite(params.activeMinutes)
-          ? Math.max(1, Math.floor(params.activeMinutes))
-          : undefined;
-      const messageLimitRaw =
-        typeof params.messageLimit === "number" &&
-        Number.isFinite(params.messageLimit)
-          ? Math.max(0, Math.floor(params.messageLimit))
-          : 0;
-      const messageLimit = Math.min(messageLimitRaw, 20);
-
-      const list = (await callGateway({
-        method: "sessions.list",
-        params: {
-          limit,
-          activeMinutes,
-          includeGlobal: true,
-          includeUnknown: true,
-        },
-      })) as {
-        path?: string;
-        sessions?: Array<Record<string, unknown>>;
-      };
-
-      const sessions = Array.isArray(list?.sessions) ? list.sessions : [];
-      const storePath = typeof list?.path === "string" ? list.path : undefined;
-      const rows: SessionListRow[] = [];
-
-      for (const entry of sessions) {
-        if (!entry || typeof entry !== "object") continue;
-        const key = typeof entry.key === "string" ? entry.key : "";
-        if (!key) continue;
-        if (key === "unknown") continue;
-        if (key === "global" && alias !== "global") continue;
-
-        const gatewayKind =
-          typeof entry.kind === "string" ? entry.kind : undefined;
-        const kind = classifySessionKind({ key, gatewayKind, alias, mainKey });
-        if (allowedKinds && !allowedKinds.has(kind)) continue;
-
-        const displayKey = resolveDisplaySessionKey({
-          key,
-          alias,
-          mainKey,
-        });
-
-        const surface =
-          typeof entry.surface === "string" ? entry.surface : undefined;
-        const lastChannel =
-          typeof entry.lastChannel === "string" ? entry.lastChannel : undefined;
-        const provider = deriveProvider({
-          key,
-          kind,
-          surface,
-          lastChannel,
-        });
-
-        const sessionId =
-          typeof entry.sessionId === "string" ? entry.sessionId : undefined;
-        const transcriptPath =
-          sessionId && storePath
-            ? path.join(path.dirname(storePath), `${sessionId}.jsonl`)
-            : undefined;
-
-        const row: SessionListRow = {
-          key: displayKey,
-          kind,
-          provider,
-          displayName:
-            typeof entry.displayName === "string"
-              ? entry.displayName
-              : undefined,
-          updatedAt:
-            typeof entry.updatedAt === "number" ? entry.updatedAt : undefined,
-          sessionId,
-          model: typeof entry.model === "string" ? entry.model : undefined,
-          contextTokens:
-            typeof entry.contextTokens === "number"
-              ? entry.contextTokens
-              : undefined,
-          totalTokens:
-            typeof entry.totalTokens === "number"
-              ? entry.totalTokens
-              : undefined,
-          thinkingLevel:
-            typeof entry.thinkingLevel === "string"
-              ? entry.thinkingLevel
-              : undefined,
-          verboseLevel:
-            typeof entry.verboseLevel === "string"
-              ? entry.verboseLevel
-              : undefined,
-          systemSent:
-            typeof entry.systemSent === "boolean"
-              ? entry.systemSent
-              : undefined,
-          abortedLastRun:
-            typeof entry.abortedLastRun === "boolean"
-              ? entry.abortedLastRun
-              : undefined,
-          sendPolicy:
-            typeof entry.sendPolicy === "string" ? entry.sendPolicy : undefined,
-          lastChannel,
-          lastTo: typeof entry.lastTo === "string" ? entry.lastTo : undefined,
-          transcriptPath,
-        };
-
-        if (messageLimit > 0) {
-          const resolvedKey = resolveInternalSessionKey({
-            key: displayKey,
-            alias,
-            mainKey,
-          });
-          const history = (await callGateway({
-            method: "chat.history",
-            params: { sessionKey: resolvedKey, limit: messageLimit },
-          })) as { messages?: unknown[] };
-          const rawMessages = Array.isArray(history?.messages)
-            ? history.messages
-            : [];
-          const filtered = stripToolMessages(rawMessages);
-          row.messages =
-            filtered.length > messageLimit
-              ? filtered.slice(-messageLimit)
-              : filtered;
-        }
-
-        rows.push(row);
-      }
-
-      return jsonResult({
-        count: rows.length,
-        sessions: rows,
-      });
-    },
-  };
-}

src/agents/tools/sessions-send-helpers.ts

@@ -1,132 +0,0 @@
-import type { ClawdisConfig } from "../../config/config.js";
-
-const ANNOUNCE_SKIP_TOKEN = "ANNOUNCE_SKIP";
-const REPLY_SKIP_TOKEN = "REPLY_SKIP";
-const DEFAULT_PING_PONG_TURNS = 5;
-const MAX_PING_PONG_TURNS = 5;
-
-export type AnnounceTarget = {
-  channel: string;
-  to: string;
-};
-
-export function resolveAnnounceTargetFromKey(
-  sessionKey: string,
-): AnnounceTarget | null {
-  const parts = sessionKey.split(":").filter(Boolean);
-  if (parts.length < 3) return null;
-  const [surface, kind, ...rest] = parts;
-  if (kind !== "group" && kind !== "channel") return null;
-  const id = rest.join(":").trim();
-  if (!id) return null;
-  if (!surface) return null;
-  const channel = surface.toLowerCase();
-  if (channel === "discord") {
-    return { channel, to: `channel:${id}` };
-  }
-  if (channel === "signal") {
-    return { channel, to: `group:${id}` };
-  }
-  return { channel, to: id };
-}
-
-export function buildAgentToAgentMessageContext(params: {
-  requesterSessionKey?: string;
-  requesterSurface?: string;
-  targetSessionKey: string;
-}) {
-  const lines = [
-    "Agent-to-agent message context:",
-    params.requesterSessionKey
-      ? `Agent 1 (requester) session: ${params.requesterSessionKey}.`
-      : undefined,
-    params.requesterSurface
-      ? `Agent 1 (requester) surface: ${params.requesterSurface}.`
-      : undefined,
-    `Agent 2 (target) session: ${params.targetSessionKey}.`,
-  ].filter(Boolean);
-  return lines.join("\n");
-}
-
-export function buildAgentToAgentReplyContext(params: {
-  requesterSessionKey?: string;
-  requesterSurface?: string;
-  targetSessionKey: string;
-  targetChannel?: string;
-  currentRole: "requester" | "target";
-  turn: number;
-  maxTurns: number;
-}) {
-  const currentLabel =
-    params.currentRole === "requester"
-      ? "Agent 1 (requester)"
-      : "Agent 2 (target)";
-  const lines = [
-    "Agent-to-agent reply step:",
-    `Current agent: ${currentLabel}.`,
-    `Turn ${params.turn} of ${params.maxTurns}.`,
-    params.requesterSessionKey
-      ? `Agent 1 (requester) session: ${params.requesterSessionKey}.`
-      : undefined,
-    params.requesterSurface
-      ? `Agent 1 (requester) surface: ${params.requesterSurface}.`
-      : undefined,
-    `Agent 2 (target) session: ${params.targetSessionKey}.`,
-    params.targetChannel
-      ? `Agent 2 (target) surface: ${params.targetChannel}.`
-      : undefined,
-    `If you want to stop the ping-pong, reply exactly "${REPLY_SKIP_TOKEN}".`,
-  ].filter(Boolean);
-  return lines.join("\n");
-}
-
-export function buildAgentToAgentAnnounceContext(params: {
-  requesterSessionKey?: string;
-  requesterSurface?: string;
-  targetSessionKey: string;
-  targetChannel?: string;
-  originalMessage: string;
-  roundOneReply?: string;
-  latestReply?: string;
-}) {
-  const lines = [
-    "Agent-to-agent announce step:",
-    params.requesterSessionKey
-      ? `Agent 1 (requester) session: ${params.requesterSessionKey}.`
-      : undefined,
-    params.requesterSurface
-      ? `Agent 1 (requester) surface: ${params.requesterSurface}.`
-      : undefined,
-    `Agent 2 (target) session: ${params.targetSessionKey}.`,
-    params.targetChannel
-      ? `Agent 2 (target) surface: ${params.targetChannel}.`
-      : undefined,
-    `Original request: ${params.originalMessage}`,
-    params.roundOneReply
-      ? `Round 1 reply: ${params.roundOneReply}`
-      : "Round 1 reply: (not available).",
-    params.latestReply
-      ? `Latest reply: ${params.latestReply}`
-      : "Latest reply: (not available).",
-    `If you want to remain silent, reply exactly "${ANNOUNCE_SKIP_TOKEN}".`,
-    "Any other reply will be posted to the target channel.",
-    "After this reply, the agent-to-agent conversation is over.",
-  ].filter(Boolean);
-  return lines.join("\n");
-}
-
-export function isAnnounceSkip(text?: string) {
-  return (text ?? "").trim() === ANNOUNCE_SKIP_TOKEN;
-}
-
-export function isReplySkip(text?: string) {
-  return (text ?? "").trim() === REPLY_SKIP_TOKEN;
-}
-
-export function resolvePingPongTurns(cfg?: ClawdisConfig) {
-  const raw = cfg?.session?.agentToAgent?.maxPingPongTurns;
-  const fallback = DEFAULT_PING_PONG_TURNS;
-  if (typeof raw !== "number" || !Number.isFinite(raw)) return fallback;
-  const rounded = Math.floor(raw);
-  return Math.max(0, Math.min(MAX_PING_PONG_TURNS, rounded));
-}

src/agents/tools/sessions-send-tool.ts

@@ -1,403 +0,0 @@
-import crypto from "node:crypto";
-
-import { Type } from "@sinclair/typebox";
-
-import { loadConfig } from "../../config/config.js";
-import { callGateway } from "../../gateway/call.js";
-import type { AnyAgentTool } from "./common.js";
-import { jsonResult, readStringParam } from "./common.js";
-import {
-  extractAssistantText,
-  resolveDisplaySessionKey,
-  resolveInternalSessionKey,
-  resolveMainSessionAlias,
-  stripToolMessages,
-} from "./sessions-helpers.js";
-import {
-  type AnnounceTarget,
-  buildAgentToAgentAnnounceContext,
-  buildAgentToAgentMessageContext,
-  buildAgentToAgentReplyContext,
-  isAnnounceSkip,
-  isReplySkip,
-  resolveAnnounceTargetFromKey,
-  resolvePingPongTurns,
-} from "./sessions-send-helpers.js";
-
-const SessionsSendToolSchema = Type.Object({
-  sessionKey: Type.String(),
-  message: Type.String(),
-  timeoutSeconds: Type.Optional(Type.Integer({ minimum: 0 })),
-});
-
-export function createSessionsSendTool(opts?: {
-  agentSessionKey?: string;
-  agentSurface?: string;
-}): AnyAgentTool {
-  return {
-    label: "Session Send",
-    name: "sessions_send",
-    description: "Send a message into another session.",
-    parameters: SessionsSendToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const sessionKey = readStringParam(params, "sessionKey", {
-        required: true,
-      });
-      const message = readStringParam(params, "message", { required: true });
-      const cfg = loadConfig();
-      const { mainKey, alias } = resolveMainSessionAlias(cfg);
-      const resolvedKey = resolveInternalSessionKey({
-        key: sessionKey,
-        alias,
-        mainKey,
-      });
-      const timeoutSeconds =
-        typeof params.timeoutSeconds === "number" &&
-        Number.isFinite(params.timeoutSeconds)
-          ? Math.max(0, Math.floor(params.timeoutSeconds))
-          : 30;
-      const timeoutMs = timeoutSeconds * 1000;
-      const announceTimeoutMs = timeoutSeconds === 0 ? 30_000 : timeoutMs;
-      const idempotencyKey = crypto.randomUUID();
-      let runId: string = idempotencyKey;
-      const displayKey = resolveDisplaySessionKey({
-        key: sessionKey,
-        alias,
-        mainKey,
-      });
-      const agentMessageContext = buildAgentToAgentMessageContext({
-        requesterSessionKey: opts?.agentSessionKey,
-        requesterSurface: opts?.agentSurface,
-        targetSessionKey: displayKey,
-      });
-      const sendParams = {
-        message,
-        sessionKey: resolvedKey,
-        idempotencyKey,
-        deliver: false,
-        lane: "nested",
-        extraSystemPrompt: agentMessageContext,
-      };
-      const requesterSessionKey = opts?.agentSessionKey;
-      const requesterSurface = opts?.agentSurface;
-      const maxPingPongTurns = resolvePingPongTurns(cfg);
-
-      const resolveAnnounceTarget =
-        async (): Promise<AnnounceTarget | null> => {
-          const parsed = resolveAnnounceTargetFromKey(resolvedKey);
-          if (parsed) return parsed;
-          try {
-            const list = (await callGateway({
-              method: "sessions.list",
-              params: {
-                includeGlobal: true,
-                includeUnknown: true,
-                limit: 200,
-              },
-            })) as { sessions?: Array<Record<string, unknown>> };
-            const sessions = Array.isArray(list?.sessions) ? list.sessions : [];
-            const match =
-              sessions.find((entry) => entry?.key === resolvedKey) ??
-              sessions.find((entry) => entry?.key === displayKey);
-            const channel =
-              typeof match?.lastChannel === "string"
-                ? match.lastChannel
-                : undefined;
-            const to =
-              typeof match?.lastTo === "string" ? match.lastTo : undefined;
-            if (channel && to) return { channel, to };
-          } catch {
-            // ignore; fall through to null
-          }
-          return null;
-        };
-
-      const readLatestAssistantReply = async (
-        sessionKeyToRead: string,
-      ): Promise<string | undefined> => {
-        const history = (await callGateway({
-          method: "chat.history",
-          params: { sessionKey: sessionKeyToRead, limit: 50 },
-        })) as { messages?: unknown[] };
-        const filtered = stripToolMessages(
-          Array.isArray(history?.messages) ? history.messages : [],
-        );
-        const last =
-          filtered.length > 0 ? filtered[filtered.length - 1] : undefined;
-        return last ? extractAssistantText(last) : undefined;
-      };
-
-      const runAgentStep = async (step: {
-        sessionKey: string;
-        message: string;
-        extraSystemPrompt: string;
-        timeoutMs: number;
-      }): Promise<string | undefined> => {
-        const stepIdem = crypto.randomUUID();
-        const response = (await callGateway({
-          method: "agent",
-          params: {
-            message: step.message,
-            sessionKey: step.sessionKey,
-            idempotencyKey: stepIdem,
-            deliver: false,
-            lane: "nested",
-            extraSystemPrompt: step.extraSystemPrompt,
-          },
-          timeoutMs: 10_000,
-        })) as { runId?: string; acceptedAt?: number };
-        const stepRunId =
-          typeof response?.runId === "string" && response.runId
-            ? response.runId
-            : stepIdem;
-        const stepAcceptedAt =
-          typeof response?.acceptedAt === "number"
-            ? response.acceptedAt
-            : undefined;
-        const stepWaitMs = Math.min(step.timeoutMs, 60_000);
-        const wait = (await callGateway({
-          method: "agent.wait",
-          params: {
-            runId: stepRunId,
-            afterMs: stepAcceptedAt,
-            timeoutMs: stepWaitMs,
-          },
-          timeoutMs: stepWaitMs + 2000,
-        })) as { status?: string };
-        if (wait?.status !== "ok") return undefined;
-        return readLatestAssistantReply(step.sessionKey);
-      };
-
-      const runAgentToAgentFlow = async (
-        roundOneReply?: string,
-        runInfo?: { runId: string; acceptedAt?: number },
-      ) => {
-        try {
-          let primaryReply = roundOneReply;
-          let latestReply = roundOneReply;
-          if (!primaryReply && runInfo?.runId) {
-            const waitMs = Math.min(announceTimeoutMs, 60_000);
-            const wait = (await callGateway({
-              method: "agent.wait",
-              params: {
-                runId: runInfo.runId,
-                afterMs: runInfo.acceptedAt,
-                timeoutMs: waitMs,
-              },
-              timeoutMs: waitMs + 2000,
-            })) as { status?: string };
-            if (wait?.status === "ok") {
-              primaryReply = await readLatestAssistantReply(resolvedKey);
-              latestReply = primaryReply;
-            }
-          }
-          if (!latestReply) return;
-          const announceTarget = await resolveAnnounceTarget();
-          const targetChannel = announceTarget?.channel ?? "unknown";
-          if (
-            maxPingPongTurns > 0 &&
-            requesterSessionKey &&
-            requesterSessionKey !== resolvedKey
-          ) {
-            let currentSessionKey = requesterSessionKey;
-            let nextSessionKey = resolvedKey;
-            let incomingMessage = latestReply;
-            for (let turn = 1; turn <= maxPingPongTurns; turn += 1) {
-              const currentRole =
-                currentSessionKey === requesterSessionKey
-                  ? "requester"
-                  : "target";
-              const replyPrompt = buildAgentToAgentReplyContext({
-                requesterSessionKey,
-                requesterSurface,
-                targetSessionKey: displayKey,
-                targetChannel,
-                currentRole,
-                turn,
-                maxTurns: maxPingPongTurns,
-              });
-              const replyText = await runAgentStep({
-                sessionKey: currentSessionKey,
-                message: incomingMessage,
-                extraSystemPrompt: replyPrompt,
-                timeoutMs: announceTimeoutMs,
-              });
-              if (!replyText || isReplySkip(replyText)) {
-                break;
-              }
-              latestReply = replyText;
-              incomingMessage = replyText;
-              const swap = currentSessionKey;
-              currentSessionKey = nextSessionKey;
-              nextSessionKey = swap;
-            }
-          }
-          const announcePrompt = buildAgentToAgentAnnounceContext({
-            requesterSessionKey,
-            requesterSurface,
-            targetSessionKey: displayKey,
-            targetChannel,
-            originalMessage: message,
-            roundOneReply: primaryReply,
-            latestReply,
-          });
-          const announceReply = await runAgentStep({
-            sessionKey: resolvedKey,
-            message: "Agent-to-agent announce step.",
-            extraSystemPrompt: announcePrompt,
-            timeoutMs: announceTimeoutMs,
-          });
-          if (
-            announceTarget &&
-            announceReply &&
-            announceReply.trim() &&
-            !isAnnounceSkip(announceReply)
-          ) {
-            await callGateway({
-              method: "send",
-              params: {
-                to: announceTarget.to,
-                message: announceReply.trim(),
-                provider: announceTarget.channel,
-                idempotencyKey: crypto.randomUUID(),
-              },
-              timeoutMs: 10_000,
-            });
-          }
-        } catch {
-          // Best-effort follow-ups; ignore failures to avoid breaking the caller response.
-        }
-      };
-
-      if (timeoutSeconds === 0) {
-        try {
-          const response = (await callGateway({
-            method: "agent",
-            params: sendParams,
-            timeoutMs: 10_000,
-          })) as { runId?: string; acceptedAt?: number };
-          const acceptedAt =
-            typeof response?.acceptedAt === "number"
-              ? response.acceptedAt
-              : undefined;
-          if (typeof response?.runId === "string" && response.runId) {
-            runId = response.runId;
-          }
-          void runAgentToAgentFlow(undefined, { runId, acceptedAt });
-          return jsonResult({
-            runId,
-            status: "accepted",
-            sessionKey: displayKey,
-          });
-        } catch (err) {
-          const messageText =
-            err instanceof Error
-              ? err.message
-              : typeof err === "string"
-                ? err
-                : "error";
-          return jsonResult({
-            runId,
-            status: "error",
-            error: messageText,
-            sessionKey: displayKey,
-          });
-        }
-      }
-
-      let acceptedAt: number | undefined;
-      try {
-        const response = (await callGateway({
-          method: "agent",
-          params: sendParams,
-          timeoutMs: 10_000,
-        })) as { runId?: string; acceptedAt?: number };
-        if (typeof response?.runId === "string" && response.runId) {
-          runId = response.runId;
-        }
-        if (typeof response?.acceptedAt === "number") {
-          acceptedAt = response.acceptedAt;
-        }
-      } catch (err) {
-        const messageText =
-          err instanceof Error
-            ? err.message
-            : typeof err === "string"
-              ? err
-              : "error";
-        return jsonResult({
-          runId,
-          status: "error",
-          error: messageText,
-          sessionKey: displayKey,
-        });
-      }
-
-      let waitStatus: string | undefined;
-      let waitError: string | undefined;
-      try {
-        const wait = (await callGateway({
-          method: "agent.wait",
-          params: {
-            runId,
-            afterMs: acceptedAt,
-            timeoutMs,
-          },
-          timeoutMs: timeoutMs + 2000,
-        })) as { status?: string; error?: string };
-        waitStatus = typeof wait?.status === "string" ? wait.status : undefined;
-        waitError = typeof wait?.error === "string" ? wait.error : undefined;
-      } catch (err) {
-        const messageText =
-          err instanceof Error
-            ? err.message
-            : typeof err === "string"
-              ? err
-              : "error";
-        return jsonResult({
-          runId,
-          status: messageText.includes("gateway timeout") ? "timeout" : "error",
-          error: messageText,
-          sessionKey: displayKey,
-        });
-      }
-
-      if (waitStatus === "timeout") {
-        return jsonResult({
-          runId,
-          status: "timeout",
-          error: waitError,
-          sessionKey: displayKey,
-        });
-      }
-      if (waitStatus === "error") {
-        return jsonResult({
-          runId,
-          status: "error",
-          error: waitError ?? "agent error",
-          sessionKey: displayKey,
-        });
-      }
-
-      const history = (await callGateway({
-        method: "chat.history",
-        params: { sessionKey: resolvedKey, limit: 50 },
-      })) as { messages?: unknown[] };
-      const filtered = stripToolMessages(
-        Array.isArray(history?.messages) ? history.messages : [],
-      );
-      const last =
-        filtered.length > 0 ? filtered[filtered.length - 1] : undefined;
-      const reply = last ? extractAssistantText(last) : undefined;
-      void runAgentToAgentFlow(reply ?? undefined);
-
-      return jsonResult({
-        runId,
-        status: "ok",
-        reply,
-        sessionKey: displayKey,
-      });
-    },
-  };
-}

src/agents/tools/slack-actions.ts

@@ -1,161 +0,0 @@
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-
-import type { ClawdisConfig, SlackActionConfig } from "../../config/config.js";
-import {
-  deleteSlackMessage,
-  editSlackMessage,
-  getSlackMemberInfo,
-  listSlackEmojis,
-  listSlackPins,
-  listSlackReactions,
-  pinSlackMessage,
-  reactSlackMessage,
-  readSlackMessages,
-  sendSlackMessage,
-  unpinSlackMessage,
-} from "../../slack/actions.js";
-import { jsonResult, readStringParam } from "./common.js";
-
-const messagingActions = new Set([
-  "sendMessage",
-  "editMessage",
-  "deleteMessage",
-  "readMessages",
-]);
-
-const reactionsActions = new Set(["react", "reactions"]);
-const pinActions = new Set(["pinMessage", "unpinMessage", "listPins"]);
-
-type ActionGate = (
-  key: keyof SlackActionConfig,
-  defaultValue?: boolean,
-) => boolean;
-
-export async function handleSlackAction(
-  params: Record<string, unknown>,
-  cfg: ClawdisConfig,
-): Promise<AgentToolResult<unknown>> {
-  const action = readStringParam(params, "action", { required: true });
-  const isActionEnabled: ActionGate = (key, defaultValue = true) => {
-    const value = cfg.slack?.actions?.[key];
-    if (value === undefined) return defaultValue;
-    return value !== false;
-  };
-
-  if (reactionsActions.has(action)) {
-    if (!isActionEnabled("reactions")) {
-      throw new Error("Slack reactions are disabled.");
-    }
-    const channelId = readStringParam(params, "channelId", { required: true });
-    const messageId = readStringParam(params, "messageId", { required: true });
-    if (action === "react") {
-      const emoji = readStringParam(params, "emoji", { required: true });
-      await reactSlackMessage(channelId, messageId, emoji);
-      return jsonResult({ ok: true });
-    }
-    const reactions = await listSlackReactions(channelId, messageId);
-    return jsonResult({ ok: true, reactions });
-  }
-
-  if (messagingActions.has(action)) {
-    if (!isActionEnabled("messages")) {
-      throw new Error("Slack messages are disabled.");
-    }
-    switch (action) {
-      case "sendMessage": {
-        const to = readStringParam(params, "to", { required: true });
-        const content = readStringParam(params, "content", { required: true });
-        const mediaUrl = readStringParam(params, "mediaUrl");
-        const result = await sendSlackMessage(to, content, {
-          mediaUrl: mediaUrl ?? undefined,
-        });
-        return jsonResult({ ok: true, result });
-      }
-      case "editMessage": {
-        const channelId = readStringParam(params, "channelId", {
-          required: true,
-        });
-        const messageId = readStringParam(params, "messageId", {
-          required: true,
-        });
-        const content = readStringParam(params, "content", {
-          required: true,
-        });
-        await editSlackMessage(channelId, messageId, content);
-        return jsonResult({ ok: true });
-      }
-      case "deleteMessage": {
-        const channelId = readStringParam(params, "channelId", {
-          required: true,
-        });
-        const messageId = readStringParam(params, "messageId", {
-          required: true,
-        });
-        await deleteSlackMessage(channelId, messageId);
-        return jsonResult({ ok: true });
-      }
-      case "readMessages": {
-        const channelId = readStringParam(params, "channelId", {
-          required: true,
-        });
-        const limitRaw = params.limit;
-        const limit =
-          typeof limitRaw === "number" && Number.isFinite(limitRaw)
-            ? limitRaw
-            : undefined;
-        const before = readStringParam(params, "before");
-        const after = readStringParam(params, "after");
-        const result = await readSlackMessages(channelId, {
-          limit,
-          before: before ?? undefined,
-          after: after ?? undefined,
-        });
-        return jsonResult({ ok: true, ...result });
-      }
-      default:
-        break;
-    }
-  }
-
-  if (pinActions.has(action)) {
-    if (!isActionEnabled("pins")) {
-      throw new Error("Slack pins are disabled.");
-    }
-    const channelId = readStringParam(params, "channelId", { required: true });
-    if (action === "pinMessage") {
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      await pinSlackMessage(channelId, messageId);
-      return jsonResult({ ok: true });
-    }
-    if (action === "unpinMessage") {
-      const messageId = readStringParam(params, "messageId", {
-        required: true,
-      });
-      await unpinSlackMessage(channelId, messageId);
-      return jsonResult({ ok: true });
-    }
-    const pins = await listSlackPins(channelId);
-    return jsonResult({ ok: true, pins });
-  }
-
-  if (action === "memberInfo") {
-    if (!isActionEnabled("memberInfo")) {
-      throw new Error("Slack member info is disabled.");
-    }
-    const userId = readStringParam(params, "userId", { required: true });
-    const info = await getSlackMemberInfo(userId);
-    return jsonResult({ ok: true, info });
-  }
-
-  if (action === "emojiList") {
-    if (!isActionEnabled("emojiList")) {
-      throw new Error("Slack emoji list is disabled.");
-    }
-    const emojis = await listSlackEmojis();
-    return jsonResult({ ok: true, emojis });
-  }
-
-  throw new Error(`Unknown action: ${action}`);
-}

src/agents/tools/slack-schema.ts

@@ -1,60 +0,0 @@
-import { Type } from "@sinclair/typebox";
-
-export const SlackToolSchema = Type.Union([
-  Type.Object({
-    action: Type.Literal("react"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-    emoji: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("reactions"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("sendMessage"),
-    to: Type.String(),
-    content: Type.String(),
-    mediaUrl: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("editMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-    content: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("deleteMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("readMessages"),
-    channelId: Type.String(),
-    limit: Type.Optional(Type.Number()),
-    before: Type.Optional(Type.String()),
-    after: Type.Optional(Type.String()),
-  }),
-  Type.Object({
-    action: Type.Literal("pinMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("unpinMessage"),
-    channelId: Type.String(),
-    messageId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("listPins"),
-    channelId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("memberInfo"),
-    userId: Type.String(),
-  }),
-  Type.Object({
-    action: Type.Literal("emojiList"),
-  }),
-]);

src/agents/tools/slack-tool.ts

@@ -1,18 +0,0 @@
-import { loadConfig } from "../../config/config.js";
-import type { AnyAgentTool } from "./common.js";
-import { handleSlackAction } from "./slack-actions.js";
-import { SlackToolSchema } from "./slack-schema.js";
-
-export function createSlackTool(): AnyAgentTool {
-  return {
-    label: "Slack",
-    name: "slack",
-    description: "Manage Slack messages, reactions, and pins.",
-    parameters: SlackToolSchema,
-    execute: async (_toolCallId, args) => {
-      const params = args as Record<string, unknown>;
-      const cfg = loadConfig();
-      return await handleSlackAction(params, cfg);
-    },
-  };
-}

src/auto-reply/chunk.test.ts

@@ -50,7 +50,6 @@ describe("resolveTextChunkLimit", () => {
   it("uses per-surface defaults", () => {
     expect(resolveTextChunkLimit(undefined, "whatsapp")).toBe(4000);
     expect(resolveTextChunkLimit(undefined, "telegram")).toBe(4000);
-    expect(resolveTextChunkLimit(undefined, "slack")).toBe(4000);
     expect(resolveTextChunkLimit(undefined, "signal")).toBe(4000);
     expect(resolveTextChunkLimit(undefined, "imessage")).toBe(4000);
     expect(resolveTextChunkLimit(undefined, "discord")).toBe(2000);
@@ -63,12 +62,8 @@ describe("resolveTextChunkLimit", () => {
   });
 
   it("uses the matching provider override", () => {
-    const cfg = {
-      discord: { textChunkLimit: 111 },
-      slack: { textChunkLimit: 222 },
-    };
+    const cfg = { discord: { textChunkLimit: 111 } };
     expect(resolveTextChunkLimit(cfg, "discord")).toBe(111);
-    expect(resolveTextChunkLimit(cfg, "slack")).toBe(222);
     expect(resolveTextChunkLimit(cfg, "telegram")).toBe(4000);
   });
 });

src/auto-reply/chunk.ts

@@ -8,7 +8,6 @@ export type TextChunkSurface =
   | "whatsapp"
   | "telegram"
   | "discord"
-  | "slack"
   | "signal"
   | "imessage"
   | "webchat";
@@ -17,7 +16,6 @@ const DEFAULT_CHUNK_LIMIT_BY_SURFACE: Record<TextChunkSurface, number> = {
   whatsapp: 4000,
   telegram: 4000,
   discord: 2000,
-  slack: 4000,
   signal: 4000,
   imessage: 4000,
   webchat: 4000,
@@ -32,7 +30,6 @@ export function resolveTextChunkLimit(
     if (surface === "whatsapp") return cfg?.whatsapp?.textChunkLimit;
     if (surface === "telegram") return cfg?.telegram?.textChunkLimit;
     if (surface === "discord") return cfg?.discord?.textChunkLimit;
-    if (surface === "slack") return cfg?.slack?.textChunkLimit;
     if (surface === "signal") return cfg?.signal?.textChunkLimit;
     if (surface === "imessage") return cfg?.imessage?.textChunkLimit;
     return undefined;

src/auto-reply/reply.directive.test.ts

@@ -13,7 +13,6 @@ import {
 } from "../config/sessions.js";
 import { drainSystemEvents } from "../infra/system-events.js";
 import {
-  extractElevatedDirective,
   extractQueueDirective,
   extractReplyToTag,
   extractThinkDirective,
@@ -86,12 +85,6 @@ describe("directive parsing", () => {
     expect(res.verboseLevel).toBe("on");
   });
 
-  it("matches elevated with leading space", () => {
-    const res = extractElevatedDirective(" please /elevated on now");
-    expect(res.hasDirective).toBe(true);
-    expect(res.elevatedLevel).toBe("on");
-  });
-
   it("matches think at start of line", () => {
     const res = extractThinkDirective("/think:high run slow");
     expect(res.hasDirective).toBe(true);
@@ -299,38 +292,6 @@ describe("directive parsing", () => {
     });
   });
 
-  it("rejects invalid elevated level", async () => {
-    await withTempHome(async (home) => {
-      vi.mocked(runEmbeddedPiAgent).mockReset();
-
-      const res = await getReplyFromConfig(
-        {
-          Body: "/elevated maybe",
-          From: "+1222",
-          To: "+1222",
-          Surface: "whatsapp",
-          SenderE164: "+1222",
-        },
-        {},
-        {
-          agent: {
-            model: "anthropic/claude-opus-4-5",
-            workspace: path.join(home, "clawd"),
-            elevated: {
-              allowFrom: { whatsapp: ["+1222"] },
-            },
-          },
-          whatsapp: { allowFrom: ["+1222"] },
-          session: { store: path.join(home, "sessions.json") },
-        },
-      );
-
-      const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Unrecognized elevated level");
-      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
-    });
-  });
-
   it("acks queue directive and persists override", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
@@ -783,94 +744,4 @@ describe("directive parsing", () => {
       expect(call?.thinkLevel).toBe("low");
     });
   });
-
-  it("passes elevated defaults when sender is approved", async () => {
-    await withTempHome(async (home) => {
-      const storePath = path.join(home, "sessions.json");
-      vi.mocked(runEmbeddedPiAgent).mockResolvedValue({
-        payloads: [{ text: "done" }],
-        meta: {
-          durationMs: 5,
-          agentMeta: { sessionId: "s", provider: "p", model: "m" },
-        },
-      });
-
-      await getReplyFromConfig(
-        {
-          Body: "hello",
-          From: "+1004",
-          To: "+2000",
-          Surface: "whatsapp",
-          SenderE164: "+1004",
-        },
-        {},
-        {
-          agent: {
-            model: "anthropic/claude-opus-4-5",
-            workspace: path.join(home, "clawd"),
-            elevated: {
-              allowFrom: { whatsapp: ["+1004"] },
-            },
-          },
-          whatsapp: {
-            allowFrom: ["*"],
-          },
-          session: { store: storePath },
-        },
-      );
-
-      expect(runEmbeddedPiAgent).toHaveBeenCalledOnce();
-      const call = vi.mocked(runEmbeddedPiAgent).mock.calls[0]?.[0];
-      expect(call?.bashElevated).toEqual({
-        enabled: true,
-        allowed: true,
-        defaultLevel: "on",
-      });
-    });
-  });
-  it("defaults elevated to off when sender is not approved", async () => {
-    await withTempHome(async (home) => {
-      const storePath = path.join(home, "sessions.json");
-      vi.mocked(runEmbeddedPiAgent).mockResolvedValue({
-        payloads: [{ text: "done" }],
-        meta: {
-          durationMs: 5,
-          agentMeta: { sessionId: "s", provider: "p", model: "m" },
-        },
-      });
-
-      await getReplyFromConfig(
-        {
-          Body: "hello",
-          From: "+1004",
-          To: "+2000",
-          Surface: "whatsapp",
-          SenderE164: "+1004",
-        },
-        {},
-        {
-          agent: {
-            model: "anthropic/claude-opus-4-5",
-            workspace: path.join(home, "clawd"),
-            elevatedDefault: "on",
-            elevated: {
-              allowFrom: { whatsapp: ["+1999"] },
-            },
-          },
-          whatsapp: {
-            allowFrom: ["*"],
-          },
-          session: { store: storePath },
-        },
-      );
-
-      expect(runEmbeddedPiAgent).toHaveBeenCalledOnce();
-      const call = vi.mocked(runEmbeddedPiAgent).mock.calls[0]?.[0];
-      expect(call?.bashElevated).toEqual({
-        enabled: true,
-        allowed: false,
-        defaultLevel: "off",
-      });
-    });
-  });
 });

src/auto-reply/reply.triggers.test.ts

@@ -143,193 +143,6 @@ describe("trigger handling", () => {
     });
   });
 
-  it("allows approved sender to toggle elevated mode", async () => {
-    await withTempHome(async (home) => {
-      const cfg = {
-        agent: {
-          model: "anthropic/claude-opus-4-5",
-          workspace: join(home, "clawd"),
-          elevated: {
-            allowFrom: { whatsapp: ["+1000"] },
-          },
-        },
-        whatsapp: {
-          allowFrom: ["+1000"],
-        },
-        session: { store: join(home, "sessions.json") },
-      };
-
-      const res = await getReplyFromConfig(
-        {
-          Body: "/elevated on",
-          From: "+1000",
-          To: "+2000",
-          Surface: "whatsapp",
-          SenderE164: "+1000",
-        },
-        {},
-        cfg,
-      );
-      const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Elevated mode enabled");
-
-      const storeRaw = await fs.readFile(cfg.session.store, "utf-8");
-      const store = JSON.parse(storeRaw) as Record<
-        string,
-        { elevatedLevel?: string }
-      >;
-      expect(store.main?.elevatedLevel).toBe("on");
-    });
-  });
-
-  it("rejects elevated toggles when disabled", async () => {
-    await withTempHome(async (home) => {
-      const cfg = {
-        agent: {
-          model: "anthropic/claude-opus-4-5",
-          workspace: join(home, "clawd"),
-          elevated: {
-            enabled: false,
-            allowFrom: { whatsapp: ["+1000"] },
-          },
-        },
-        whatsapp: {
-          allowFrom: ["+1000"],
-        },
-        session: { store: join(home, "sessions.json") },
-      };
-
-      const res = await getReplyFromConfig(
-        {
-          Body: "/elevated on",
-          From: "+1000",
-          To: "+2000",
-          Surface: "whatsapp",
-          SenderE164: "+1000",
-        },
-        {},
-        cfg,
-      );
-      const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toBe("elevated is not available right now.");
-
-      const storeRaw = await fs.readFile(cfg.session.store, "utf-8");
-      const store = JSON.parse(storeRaw) as Record<
-        string,
-        { elevatedLevel?: string }
-      >;
-      expect(store.main?.elevatedLevel).toBeUndefined();
-    });
-  });
-
-  it("rejects elevated inline directive for unapproved sender", async () => {
-    await withTempHome(async (home) => {
-      const cfg = {
-        agent: {
-          model: "anthropic/claude-opus-4-5",
-          workspace: join(home, "clawd"),
-          elevated: {
-            allowFrom: { whatsapp: ["+1000"] },
-          },
-        },
-        whatsapp: {
-          allowFrom: ["+1000"],
-        },
-        session: { store: join(home, "sessions.json") },
-      };
-
-      const res = await getReplyFromConfig(
-        {
-          Body: "please /elevated on now",
-          From: "+2000",
-          To: "+2000",
-          Surface: "whatsapp",
-          SenderE164: "+2000",
-        },
-        {},
-        cfg,
-      );
-      const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toBe("elevated is not available right now.");
-      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
-    });
-  });
-
-  it("falls back to discord dm allowFrom for elevated approval", async () => {
-    await withTempHome(async (home) => {
-      const cfg = {
-        agent: {
-          model: "anthropic/claude-opus-4-5",
-          workspace: join(home, "clawd"),
-        },
-        discord: {
-          dm: {
-            allowFrom: ["steipete"],
-          },
-        },
-        session: { store: join(home, "sessions.json") },
-      };
-
-      const res = await getReplyFromConfig(
-        {
-          Body: "/elevated on",
-          From: "discord:123",
-          To: "user:123",
-          Surface: "discord",
-          SenderName: "Peter Steinberger",
-          SenderUsername: "steipete",
-          SenderTag: "steipete",
-        },
-        {},
-        cfg,
-      );
-      const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Elevated mode enabled");
-
-      const storeRaw = await fs.readFile(cfg.session.store, "utf-8");
-      const store = JSON.parse(storeRaw) as Record<
-        string,
-        { elevatedLevel?: string }
-      >;
-      expect(store.main?.elevatedLevel).toBe("on");
-    });
-  });
-
-  it("treats explicit discord elevated allowlist as override", async () => {
-    await withTempHome(async (home) => {
-      const cfg = {
-        agent: {
-          model: "anthropic/claude-opus-4-5",
-          workspace: join(home, "clawd"),
-          elevated: {
-            allowFrom: { discord: [] },
-          },
-        },
-        discord: {
-          dm: {
-            allowFrom: ["steipete"],
-          },
-        },
-        session: { store: join(home, "sessions.json") },
-      };
-
-      const res = await getReplyFromConfig(
-        {
-          Body: "/elevated on",
-          From: "discord:123",
-          To: "user:123",
-          Surface: "discord",
-          SenderName: "steipete",
-        },
-        {},
-        cfg,
-      );
-      const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toBe("elevated is not available right now.");
-      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
-    });
-  });
-
   it("returns a context overflow fallback when the embedded agent throws", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockRejectedValue(

src/auto-reply/reply/abort.ts

@@ -1,16 +0,0 @@
-const ABORT_TRIGGERS = new Set(["stop", "esc", "abort", "wait", "exit"]);
-const ABORT_MEMORY = new Map<string, boolean>();
-
-export function isAbortTrigger(text?: string): boolean {
-  if (!text) return false;
-  const normalized = text.trim().toLowerCase();
-  return ABORT_TRIGGERS.has(normalized);
-}
-
-export function getAbortMemory(key: string): boolean | undefined {
-  return ABORT_MEMORY.get(key);
-}
-
-export function setAbortMemory(key: string, value: boolean): void {
-  ABORT_MEMORY.set(key, value);
-}

src/auto-reply/reply/agent-runner.ts

@@ -1,450 +0,0 @@
-import crypto from "node:crypto";
-import { lookupContextTokens } from "../../agents/context.js";
-import { DEFAULT_CONTEXT_TOKENS } from "../../agents/defaults.js";
-import {
-  queueEmbeddedPiMessage,
-  runEmbeddedPiAgent,
-} from "../../agents/pi-embedded.js";
-import {
-  loadSessionStore,
-  type SessionEntry,
-  saveSessionStore,
-} from "../../config/sessions.js";
-import { logVerbose } from "../../globals.js";
-import { registerAgentRunContext } from "../../infra/agent-events.js";
-import { defaultRuntime } from "../../runtime.js";
-import { stripHeartbeatToken } from "../heartbeat.js";
-import type { TemplateContext } from "../templating.js";
-import { normalizeVerboseLevel, type VerboseLevel } from "../thinking.js";
-import { SILENT_REPLY_TOKEN } from "../tokens.js";
-import type { GetReplyOptions, ReplyPayload } from "../types.js";
-import { createFollowupRunner } from "./followup-runner.js";
-import {
-  enqueueFollowupRun,
-  type FollowupRun,
-  type QueueSettings,
-  scheduleFollowupDrain,
-} from "./queue.js";
-import { extractReplyToTag } from "./reply-tags.js";
-import type { TypingController } from "./typing.js";
-
-export async function runReplyAgent(params: {
-  commandBody: string;
-  followupRun: FollowupRun;
-  queueKey: string;
-  resolvedQueue: QueueSettings;
-  shouldSteer: boolean;
-  shouldFollowup: boolean;
-  isActive: boolean;
-  isStreaming: boolean;
-  opts?: GetReplyOptions;
-  typing: TypingController;
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  defaultModel: string;
-  agentCfgContextTokens?: number;
-  resolvedVerboseLevel: VerboseLevel;
-  isNewSession: boolean;
-  blockStreamingEnabled: boolean;
-  blockReplyChunking?: {
-    minChars: number;
-    maxChars: number;
-    breakPreference: "paragraph" | "newline" | "sentence";
-  };
-  resolvedBlockStreamingBreak: "text_end" | "message_end";
-  sessionCtx: TemplateContext;
-  shouldInjectGroupIntro: boolean;
-}): Promise<ReplyPayload | ReplyPayload[] | undefined> {
-  const {
-    commandBody,
-    followupRun,
-    queueKey,
-    resolvedQueue,
-    shouldSteer,
-    shouldFollowup,
-    isActive,
-    isStreaming,
-    opts,
-    typing,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    defaultModel,
-    agentCfgContextTokens,
-    resolvedVerboseLevel,
-    isNewSession,
-    blockStreamingEnabled,
-    blockReplyChunking,
-    resolvedBlockStreamingBreak,
-    sessionCtx,
-    shouldInjectGroupIntro,
-  } = params;
-
-  const shouldEmitToolResult = () => {
-    if (!sessionKey || !storePath) {
-      return resolvedVerboseLevel === "on";
-    }
-    try {
-      const store = loadSessionStore(storePath);
-      const entry = store[sessionKey];
-      const current = normalizeVerboseLevel(entry?.verboseLevel);
-      if (current) return current === "on";
-    } catch {
-      // ignore store read failures
-    }
-    return resolvedVerboseLevel === "on";
-  };
-
-  const streamedPayloadKeys = new Set<string>();
-  const pendingStreamedPayloadKeys = new Set<string>();
-  const pendingBlockTasks = new Set<Promise<void>>();
-  let didStreamBlockReply = false;
-  const buildPayloadKey = (payload: ReplyPayload) => {
-    const text = payload.text?.trim() ?? "";
-    const mediaList = payload.mediaUrls?.length
-      ? payload.mediaUrls
-      : payload.mediaUrl
-        ? [payload.mediaUrl]
-        : [];
-    return JSON.stringify({
-      text,
-      mediaList,
-      replyToId: payload.replyToId ?? null,
-    });
-  };
-
-  if (shouldSteer && isStreaming) {
-    const steered = queueEmbeddedPiMessage(
-      followupRun.run.sessionId,
-      followupRun.prompt,
-    );
-    if (steered && !shouldFollowup) {
-      if (sessionEntry && sessionStore && sessionKey) {
-        sessionEntry.updatedAt = Date.now();
-        sessionStore[sessionKey] = sessionEntry;
-        if (storePath) {
-          await saveSessionStore(storePath, sessionStore);
-        }
-      }
-      typing.cleanup();
-      return undefined;
-    }
-  }
-
-  if (isActive && (shouldFollowup || resolvedQueue.mode === "steer")) {
-    enqueueFollowupRun(queueKey, followupRun, resolvedQueue);
-    if (sessionEntry && sessionStore && sessionKey) {
-      sessionEntry.updatedAt = Date.now();
-      sessionStore[sessionKey] = sessionEntry;
-      if (storePath) {
-        await saveSessionStore(storePath, sessionStore);
-      }
-    }
-    typing.cleanup();
-    return undefined;
-  }
-
-  const runFollowupTurn = createFollowupRunner({
-    opts,
-    typing,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    defaultModel,
-    agentCfgContextTokens,
-  });
-
-  const finalizeWithFollowup = <T>(value: T): T => {
-    scheduleFollowupDrain(queueKey, runFollowupTurn);
-    return value;
-  };
-
-  let didLogHeartbeatStrip = false;
-  try {
-    const runId = crypto.randomUUID();
-    if (sessionKey) {
-      registerAgentRunContext(runId, { sessionKey });
-    }
-    let runResult: Awaited<ReturnType<typeof runEmbeddedPiAgent>>;
-    try {
-      runResult = await runEmbeddedPiAgent({
-        sessionId: followupRun.run.sessionId,
-        sessionKey,
-        surface: sessionCtx.Surface?.trim().toLowerCase() || undefined,
-        sessionFile: followupRun.run.sessionFile,
-        workspaceDir: followupRun.run.workspaceDir,
-        config: followupRun.run.config,
-        skillsSnapshot: followupRun.run.skillsSnapshot,
-        prompt: commandBody,
-        extraSystemPrompt: followupRun.run.extraSystemPrompt,
-        ownerNumbers: followupRun.run.ownerNumbers,
-        enforceFinalTag: followupRun.run.enforceFinalTag,
-        provider: followupRun.run.provider,
-        model: followupRun.run.model,
-        thinkLevel: followupRun.run.thinkLevel,
-        verboseLevel: followupRun.run.verboseLevel,
-        bashElevated: followupRun.run.bashElevated,
-        timeoutMs: followupRun.run.timeoutMs,
-        runId,
-        blockReplyBreak: resolvedBlockStreamingBreak,
-        blockReplyChunking,
-        onPartialReply: opts?.onPartialReply
-          ? async (payload) => {
-              let text = payload.text;
-              if (!opts?.isHeartbeat && text?.includes("HEARTBEAT_OK")) {
-                const stripped = stripHeartbeatToken(text, { mode: "message" });
-                if (stripped.didStrip && !didLogHeartbeatStrip) {
-                  didLogHeartbeatStrip = true;
-                  logVerbose("Stripped stray HEARTBEAT_OK token from reply");
-                }
-                if (
-                  stripped.shouldSkip &&
-                  (payload.mediaUrls?.length ?? 0) === 0
-                ) {
-                  return;
-                }
-                text = stripped.text;
-              }
-              await typing.startTypingOnText(text);
-              await opts.onPartialReply?.({
-                text,
-                mediaUrls: payload.mediaUrls,
-              });
-            }
-          : undefined,
-        onBlockReply:
-          blockStreamingEnabled && opts?.onBlockReply
-            ? async (payload) => {
-                let text = payload.text;
-                if (!opts?.isHeartbeat && text?.includes("HEARTBEAT_OK")) {
-                  const stripped = stripHeartbeatToken(text, {
-                    mode: "message",
-                  });
-                  if (stripped.didStrip && !didLogHeartbeatStrip) {
-                    didLogHeartbeatStrip = true;
-                    logVerbose("Stripped stray HEARTBEAT_OK token from reply");
-                  }
-                  const hasMedia = (payload.mediaUrls?.length ?? 0) > 0;
-                  if (stripped.shouldSkip && !hasMedia) return;
-                  text = stripped.text;
-                }
-                const tagResult = extractReplyToTag(
-                  text,
-                  sessionCtx.MessageSid,
-                );
-                const cleaned = tagResult.cleaned || undefined;
-                const hasMedia = (payload.mediaUrls?.length ?? 0) > 0;
-                if (!cleaned && !hasMedia) return;
-                if (cleaned?.trim() === SILENT_REPLY_TOKEN && !hasMedia) return;
-                const blockPayload: ReplyPayload = {
-                  text: cleaned,
-                  mediaUrls: payload.mediaUrls,
-                  mediaUrl: payload.mediaUrls?.[0],
-                  replyToId: tagResult.replyToId,
-                };
-                const payloadKey = buildPayloadKey(blockPayload);
-                if (
-                  streamedPayloadKeys.has(payloadKey) ||
-                  pendingStreamedPayloadKeys.has(payloadKey)
-                ) {
-                  return;
-                }
-                pendingStreamedPayloadKeys.add(payloadKey);
-                const task = (async () => {
-                  await typing.startTypingOnText(cleaned);
-                  await opts.onBlockReply?.(blockPayload);
-                })()
-                  .then(() => {
-                    streamedPayloadKeys.add(payloadKey);
-                    didStreamBlockReply = true;
-                  })
-                  .catch((err) => {
-                    logVerbose(`block reply delivery failed: ${String(err)}`);
-                  })
-                  .finally(() => {
-                    pendingStreamedPayloadKeys.delete(payloadKey);
-                  });
-                pendingBlockTasks.add(task);
-                void task.finally(() => pendingBlockTasks.delete(task));
-              }
-            : undefined,
-        shouldEmitToolResult,
-        onToolResult: opts?.onToolResult
-          ? async (payload) => {
-              let text = payload.text;
-              if (!opts?.isHeartbeat && text?.includes("HEARTBEAT_OK")) {
-                const stripped = stripHeartbeatToken(text, { mode: "message" });
-                if (stripped.didStrip && !didLogHeartbeatStrip) {
-                  didLogHeartbeatStrip = true;
-                  logVerbose("Stripped stray HEARTBEAT_OK token from reply");
-                }
-                if (
-                  stripped.shouldSkip &&
-                  (payload.mediaUrls?.length ?? 0) === 0
-                ) {
-                  return;
-                }
-                text = stripped.text;
-              }
-              await typing.startTypingOnText(text);
-              await opts.onToolResult?.({ text, mediaUrls: payload.mediaUrls });
-            }
-          : undefined,
-      });
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      const isContextOverflow =
-        /context.*overflow|too large|context window/i.test(message);
-      defaultRuntime.error(`Embedded agent failed before reply: ${message}`);
-      return finalizeWithFollowup({
-        text: isContextOverflow
-          ? "⚠️ Context overflow - conversation too long. Starting fresh might help!"
-          : `⚠️ Agent failed before reply: ${message}. Check gateway logs for details.`,
-      });
-    }
-
-    if (
-      shouldInjectGroupIntro &&
-      sessionEntry &&
-      sessionStore &&
-      sessionKey &&
-      sessionEntry.groupActivationNeedsSystemIntro
-    ) {
-      sessionEntry.groupActivationNeedsSystemIntro = false;
-      sessionEntry.updatedAt = Date.now();
-      sessionStore[sessionKey] = sessionEntry;
-      if (storePath) {
-        await saveSessionStore(storePath, sessionStore);
-      }
-    }
-
-    const payloadArray = runResult.payloads ?? [];
-    if (payloadArray.length === 0) return finalizeWithFollowup(undefined);
-    if (pendingBlockTasks.size > 0) {
-      await Promise.allSettled(pendingBlockTasks);
-    }
-
-    const sanitizedPayloads = opts?.isHeartbeat
-      ? payloadArray
-      : payloadArray.flatMap((payload) => {
-          const text = payload.text;
-          if (!text || !text.includes("HEARTBEAT_OK")) return [payload];
-          const stripped = stripHeartbeatToken(text, { mode: "message" });
-          if (stripped.didStrip && !didLogHeartbeatStrip) {
-            didLogHeartbeatStrip = true;
-            logVerbose("Stripped stray HEARTBEAT_OK token from reply");
-          }
-          const hasMedia =
-            Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
-          if (stripped.shouldSkip && !hasMedia) return [];
-          return [{ ...payload, text: stripped.text }];
-        });
-
-    const replyTaggedPayloads: ReplyPayload[] = sanitizedPayloads
-      .map((payload) => {
-        const { cleaned, replyToId } = extractReplyToTag(
-          payload.text,
-          sessionCtx.MessageSid,
-        );
-        return {
-          ...payload,
-          text: cleaned ? cleaned : undefined,
-          replyToId: replyToId ?? payload.replyToId,
-        };
-      })
-      .filter(
-        (payload) =>
-          payload.text ||
-          payload.mediaUrl ||
-          (payload.mediaUrls && payload.mediaUrls.length > 0),
-      );
-
-    const shouldDropFinalPayloads =
-      blockStreamingEnabled && didStreamBlockReply;
-    const filteredPayloads = shouldDropFinalPayloads
-      ? []
-      : blockStreamingEnabled
-        ? replyTaggedPayloads.filter(
-            (payload) => !streamedPayloadKeys.has(buildPayloadKey(payload)),
-          )
-        : replyTaggedPayloads;
-
-    if (filteredPayloads.length === 0) return finalizeWithFollowup(undefined);
-
-    const shouldSignalTyping = filteredPayloads.some((payload) => {
-      const trimmed = payload.text?.trim();
-      if (trimmed && trimmed !== SILENT_REPLY_TOKEN) return true;
-      if (payload.mediaUrl) return true;
-      if (payload.mediaUrls && payload.mediaUrls.length > 0) return true;
-      return false;
-    });
-    if (shouldSignalTyping) {
-      await typing.startTypingLoop();
-    }
-
-    if (sessionStore && sessionKey) {
-      const usage = runResult.meta.agentMeta?.usage;
-      const modelUsed = runResult.meta.agentMeta?.model ?? defaultModel;
-      const contextTokensUsed =
-        agentCfgContextTokens ??
-        lookupContextTokens(modelUsed) ??
-        sessionEntry?.contextTokens ??
-        DEFAULT_CONTEXT_TOKENS;
-
-      if (usage) {
-        const entry = sessionEntry ?? sessionStore[sessionKey];
-        if (entry) {
-          const input = usage.input ?? 0;
-          const output = usage.output ?? 0;
-          const promptTokens =
-            input + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
-          const nextEntry = {
-            ...entry,
-            inputTokens: input,
-            outputTokens: output,
-            totalTokens:
-              promptTokens > 0 ? promptTokens : (usage.total ?? input),
-            model: modelUsed,
-            contextTokens: contextTokensUsed ?? entry.contextTokens,
-            updatedAt: Date.now(),
-          };
-          sessionStore[sessionKey] = nextEntry;
-          if (storePath) {
-            await saveSessionStore(storePath, sessionStore);
-          }
-        }
-      } else if (modelUsed || contextTokensUsed) {
-        const entry = sessionEntry ?? sessionStore[sessionKey];
-        if (entry) {
-          sessionStore[sessionKey] = {
-            ...entry,
-            model: modelUsed ?? entry.model,
-            contextTokens: contextTokensUsed ?? entry.contextTokens,
-          };
-          if (storePath) {
-            await saveSessionStore(storePath, sessionStore);
-          }
-        }
-      }
-    }
-
-    // If verbose is enabled and this is a new session, prepend a session hint.
-    let finalPayloads = filteredPayloads;
-    if (resolvedVerboseLevel === "on" && isNewSession) {
-      finalPayloads = [
-        { text: `🧭 New session: ${followupRun.run.sessionId}` },
-        ...finalPayloads,
-      ];
-    }
-
-    return finalizeWithFollowup(
-      finalPayloads.length === 1 ? finalPayloads[0] : finalPayloads,
-    );
-  } finally {
-    typing.cleanup();
-  }
-}

src/auto-reply/reply/block-streaming.ts

@@ -1,52 +0,0 @@
-import type { ClawdisConfig } from "../../config/config.js";
-import { resolveTextChunkLimit, type TextChunkSurface } from "../chunk.js";
-
-const DEFAULT_BLOCK_STREAM_MIN = 800;
-const DEFAULT_BLOCK_STREAM_MAX = 1200;
-
-const BLOCK_CHUNK_SURFACES = new Set<TextChunkSurface>([
-  "whatsapp",
-  "telegram",
-  "discord",
-  "slack",
-  "signal",
-  "imessage",
-  "webchat",
-]);
-
-function normalizeChunkSurface(surface?: string): TextChunkSurface | undefined {
-  if (!surface) return undefined;
-  const cleaned = surface.trim().toLowerCase();
-  return BLOCK_CHUNK_SURFACES.has(cleaned as TextChunkSurface)
-    ? (cleaned as TextChunkSurface)
-    : undefined;
-}
-
-export function resolveBlockStreamingChunking(
-  cfg: ClawdisConfig | undefined,
-  surface?: string,
-): {
-  minChars: number;
-  maxChars: number;
-  breakPreference: "paragraph" | "newline" | "sentence";
-} {
-  const surfaceKey = normalizeChunkSurface(surface);
-  const textLimit = resolveTextChunkLimit(cfg, surfaceKey);
-  const chunkCfg = cfg?.agent?.blockStreamingChunk;
-  const maxRequested = Math.max(
-    1,
-    Math.floor(chunkCfg?.maxChars ?? DEFAULT_BLOCK_STREAM_MAX),
-  );
-  const maxChars = Math.max(1, Math.min(maxRequested, textLimit));
-  const minRequested = Math.max(
-    1,
-    Math.floor(chunkCfg?.minChars ?? DEFAULT_BLOCK_STREAM_MIN),
-  );
-  const minChars = Math.min(minRequested, maxChars);
-  const breakPreference =
-    chunkCfg?.breakPreference === "newline" ||
-    chunkCfg?.breakPreference === "sentence"
-      ? chunkCfg.breakPreference
-      : "paragraph";
-  return { minChars, maxChars, breakPreference };
-}

src/auto-reply/reply/body.ts

@@ -1,41 +0,0 @@
-import type { SessionEntry } from "../../config/sessions.js";
-import { saveSessionStore } from "../../config/sessions.js";
-import { setAbortMemory } from "./abort.js";
-
-export async function applySessionHints(params: {
-  baseBody: string;
-  abortedLastRun: boolean;
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  abortKey?: string;
-  messageId?: string;
-}): Promise<string> {
-  let prefixedBodyBase = params.baseBody;
-  const abortedHint = params.abortedLastRun
-    ? "Note: The previous agent run was aborted by the user. Resume carefully or ask for clarification."
-    : "";
-  if (abortedHint) {
-    prefixedBodyBase = `${abortedHint}\n\n${prefixedBodyBase}`;
-    if (params.sessionEntry && params.sessionStore && params.sessionKey) {
-      params.sessionEntry.abortedLastRun = false;
-      params.sessionEntry.updatedAt = Date.now();
-      params.sessionStore[params.sessionKey] = params.sessionEntry;
-      if (params.storePath) {
-        await saveSessionStore(params.storePath, params.sessionStore);
-      }
-    } else if (params.abortKey) {
-      setAbortMemory(params.abortKey, false);
-    }
-  }
-
-  const messageIdHint = params.messageId?.trim()
-    ? `[message_id: ${params.messageId.trim()}]`
-    : "";
-  if (messageIdHint) {
-    prefixedBodyBase = `${prefixedBodyBase}\n${messageIdHint}`;
-  }
-
-  return prefixedBodyBase;
-}

src/auto-reply/reply/commands.ts

@@ -1,307 +0,0 @@
-import type { ClawdisConfig } from "../../config/config.js";
-import {
-  type SessionEntry,
-  type SessionScope,
-  saveSessionStore,
-} from "../../config/sessions.js";
-import { logVerbose } from "../../globals.js";
-import { triggerClawdisRestart } from "../../infra/restart.js";
-import { resolveSendPolicy } from "../../sessions/send-policy.js";
-import { normalizeE164 } from "../../utils.js";
-import { resolveHeartbeatSeconds } from "../../web/reconnect.js";
-import { getWebAuthAgeMs, webAuthExists } from "../../web/session.js";
-import {
-  normalizeGroupActivation,
-  parseActivationCommand,
-} from "../group-activation.js";
-import { parseSendPolicyCommand } from "../send-policy.js";
-import { buildStatusMessage } from "../status.js";
-import type { MsgContext } from "../templating.js";
-import type { ThinkLevel, VerboseLevel } from "../thinking.js";
-import type { ReplyPayload } from "../types.js";
-import { isAbortTrigger, setAbortMemory } from "./abort.js";
-import { stripMentions } from "./mentions.js";
-
-export type CommandContext = {
-  surface: string;
-  isWhatsAppSurface: boolean;
-  ownerList: string[];
-  isOwnerSender: boolean;
-  senderE164?: string;
-  abortKey?: string;
-  rawBodyNormalized: string;
-  commandBodyNormalized: string;
-  from?: string;
-  to?: string;
-};
-
-export function buildCommandContext(params: {
-  ctx: MsgContext;
-  cfg: ClawdisConfig;
-  sessionKey?: string;
-  isGroup: boolean;
-  triggerBodyNormalized: string;
-}): CommandContext {
-  const { ctx, cfg, sessionKey, isGroup, triggerBodyNormalized } = params;
-  const surface = (ctx.Surface ?? "").trim().toLowerCase();
-  const isWhatsAppSurface =
-    surface === "whatsapp" ||
-    (ctx.From ?? "").startsWith("whatsapp:") ||
-    (ctx.To ?? "").startsWith("whatsapp:");
-
-  const configuredAllowFrom = isWhatsAppSurface
-    ? cfg.whatsapp?.allowFrom
-    : undefined;
-  const from = (ctx.From ?? "").replace(/^whatsapp:/, "");
-  const to = (ctx.To ?? "").replace(/^whatsapp:/, "");
-  const defaultAllowFrom =
-    isWhatsAppSurface &&
-    (!configuredAllowFrom || configuredAllowFrom.length === 0) &&
-    to
-      ? [to]
-      : undefined;
-  const allowFrom =
-    configuredAllowFrom && configuredAllowFrom.length > 0
-      ? configuredAllowFrom
-      : defaultAllowFrom;
-
-  const abortKey = sessionKey ?? (from || undefined) ?? (to || undefined);
-  const rawBodyNormalized = triggerBodyNormalized;
-  const commandBodyNormalized = isGroup
-    ? stripMentions(rawBodyNormalized, ctx, cfg)
-    : rawBodyNormalized;
-  const senderE164 = normalizeE164(ctx.SenderE164 ?? "");
-  const ownerCandidates = isWhatsAppSurface
-    ? (allowFrom ?? []).filter((entry) => entry && entry !== "*")
-    : [];
-  if (isWhatsAppSurface && ownerCandidates.length === 0 && to) {
-    ownerCandidates.push(to);
-  }
-  const ownerList = ownerCandidates
-    .map((entry) => normalizeE164(entry))
-    .filter((entry): entry is string => Boolean(entry));
-  const isOwnerSender =
-    Boolean(senderE164) && ownerList.includes(senderE164 ?? "");
-
-  return {
-    surface,
-    isWhatsAppSurface,
-    ownerList,
-    isOwnerSender,
-    senderE164: senderE164 || undefined,
-    abortKey,
-    rawBodyNormalized,
-    commandBodyNormalized,
-    from: from || undefined,
-    to: to || undefined,
-  };
-}
-
-export async function handleCommands(params: {
-  ctx: MsgContext;
-  cfg: ClawdisConfig;
-  command: CommandContext;
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  sessionScope?: SessionScope;
-  workspaceDir: string;
-  defaultGroupActivation: () => "always" | "mention";
-  resolvedThinkLevel?: ThinkLevel;
-  resolvedVerboseLevel: VerboseLevel;
-  resolveDefaultThinkingLevel: () => Promise<ThinkLevel | undefined>;
-  provider: string;
-  model: string;
-  contextTokens: number;
-  isGroup: boolean;
-}): Promise<{
-  reply?: ReplyPayload;
-  shouldContinue: boolean;
-}> {
-  const {
-    cfg,
-    command,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    sessionScope,
-    workspaceDir,
-    defaultGroupActivation,
-    resolvedThinkLevel,
-    resolvedVerboseLevel,
-    resolveDefaultThinkingLevel,
-    model,
-    contextTokens,
-    isGroup,
-  } = params;
-
-  const activationCommand = parseActivationCommand(
-    command.commandBodyNormalized,
-  );
-  const sendPolicyCommand = parseSendPolicyCommand(
-    command.commandBodyNormalized,
-  );
-
-  if (activationCommand.hasCommand) {
-    if (!isGroup) {
-      return {
-        shouldContinue: false,
-        reply: { text: "⚙️ Group activation only applies to group chats." },
-      };
-    }
-    if (!command.isOwnerSender) {
-      logVerbose(
-        `Ignoring /activation from non-owner in group: ${command.senderE164 || "<unknown>"}`,
-      );
-      return { shouldContinue: false };
-    }
-    if (!activationCommand.mode) {
-      return {
-        shouldContinue: false,
-        reply: { text: "⚙️ Usage: /activation mention|always" },
-      };
-    }
-    if (sessionEntry && sessionStore && sessionKey) {
-      sessionEntry.groupActivation = activationCommand.mode;
-      sessionEntry.groupActivationNeedsSystemIntro = true;
-      sessionEntry.updatedAt = Date.now();
-      sessionStore[sessionKey] = sessionEntry;
-      if (storePath) {
-        await saveSessionStore(storePath, sessionStore);
-      }
-    }
-    return {
-      shouldContinue: false,
-      reply: { text: `⚙️ Group activation set to ${activationCommand.mode}.` },
-    };
-  }
-
-  if (sendPolicyCommand.hasCommand) {
-    if (!command.isOwnerSender) {
-      logVerbose(
-        `Ignoring /send from non-owner: ${command.senderE164 || "<unknown>"}`,
-      );
-      return { shouldContinue: false };
-    }
-    if (!sendPolicyCommand.mode) {
-      return {
-        shouldContinue: false,
-        reply: { text: "⚙️ Usage: /send on|off|inherit" },
-      };
-    }
-    if (sessionEntry && sessionStore && sessionKey) {
-      if (sendPolicyCommand.mode === "inherit") {
-        delete sessionEntry.sendPolicy;
-      } else {
-        sessionEntry.sendPolicy = sendPolicyCommand.mode;
-      }
-      sessionEntry.updatedAt = Date.now();
-      sessionStore[sessionKey] = sessionEntry;
-      if (storePath) {
-        await saveSessionStore(storePath, sessionStore);
-      }
-    }
-    const label =
-      sendPolicyCommand.mode === "inherit"
-        ? "inherit"
-        : sendPolicyCommand.mode === "allow"
-          ? "on"
-          : "off";
-    return {
-      shouldContinue: false,
-      reply: { text: `⚙️ Send policy set to ${label}.` },
-    };
-  }
-
-  if (
-    command.commandBodyNormalized === "/restart" ||
-    command.commandBodyNormalized === "restart" ||
-    command.commandBodyNormalized.startsWith("/restart ")
-  ) {
-    if (isGroup && !command.isOwnerSender) {
-      logVerbose(
-        `Ignoring /restart from non-owner in group: ${command.senderE164 || "<unknown>"}`,
-      );
-      return { shouldContinue: false };
-    }
-    const restartMethod = triggerClawdisRestart();
-    return {
-      shouldContinue: false,
-      reply: {
-        text: `⚙️ Restarting clawdis via ${restartMethod}; give me a few seconds to come back online.`,
-      },
-    };
-  }
-
-  if (
-    command.commandBodyNormalized === "/status" ||
-    command.commandBodyNormalized === "status" ||
-    command.commandBodyNormalized.startsWith("/status ")
-  ) {
-    if (isGroup && !command.isOwnerSender) {
-      logVerbose(
-        `Ignoring /status from non-owner in group: ${command.senderE164 || "<unknown>"}`,
-      );
-      return { shouldContinue: false };
-    }
-    const webLinked = await webAuthExists();
-    const webAuthAgeMs = getWebAuthAgeMs();
-    const heartbeatSeconds = resolveHeartbeatSeconds(cfg, undefined);
-    const groupActivation = isGroup
-      ? (normalizeGroupActivation(sessionEntry?.groupActivation) ??
-        defaultGroupActivation())
-      : undefined;
-    const statusText = buildStatusMessage({
-      agent: {
-        model,
-        contextTokens,
-        thinkingDefault: cfg.agent?.thinkingDefault,
-        verboseDefault: cfg.agent?.verboseDefault,
-      },
-      workspaceDir,
-      sessionEntry,
-      sessionKey,
-      sessionScope,
-      storePath,
-      groupActivation,
-      resolvedThink:
-        resolvedThinkLevel ?? (await resolveDefaultThinkingLevel()),
-      resolvedVerbose: resolvedVerboseLevel,
-      webLinked,
-      webAuthAgeMs,
-      heartbeatSeconds,
-    });
-    return { shouldContinue: false, reply: { text: statusText } };
-  }
-
-  const abortRequested = isAbortTrigger(command.rawBodyNormalized);
-  if (abortRequested) {
-    if (sessionEntry && sessionStore && sessionKey) {
-      sessionEntry.abortedLastRun = true;
-      sessionEntry.updatedAt = Date.now();
-      sessionStore[sessionKey] = sessionEntry;
-      if (storePath) {
-        await saveSessionStore(storePath, sessionStore);
-      }
-    } else if (command.abortKey) {
-      setAbortMemory(command.abortKey, true);
-    }
-    return { shouldContinue: false, reply: { text: "⚙️ Agent was aborted." } };
-  }
-
-  const sendPolicy = resolveSendPolicy({
-    cfg,
-    entry: sessionEntry,
-    sessionKey,
-    surface: sessionEntry?.surface ?? command.surface,
-    chatType: sessionEntry?.chatType,
-  });
-  if (sendPolicy === "deny") {
-    logVerbose(`Send blocked by policy for session ${sessionKey ?? "unknown"}`);
-    return { shouldContinue: false };
-  }
-
-  return { shouldContinue: true };
-}

src/auto-reply/reply/directive-handling.ts

@@ -1,571 +0,0 @@
-import { lookupContextTokens } from "../../agents/context.js";
-import {
-  DEFAULT_CONTEXT_TOKENS,
-  DEFAULT_MODEL,
-  DEFAULT_PROVIDER,
-} from "../../agents/defaults.js";
-import {
-  buildModelAliasIndex,
-  type ModelAliasIndex,
-  modelKey,
-  resolveConfiguredModelRef,
-  resolveModelRefFromString,
-} from "../../agents/model-selection.js";
-import type { ClawdisConfig } from "../../config/config.js";
-import { type SessionEntry, saveSessionStore } from "../../config/sessions.js";
-import { enqueueSystemEvent } from "../../infra/system-events.js";
-import { extractModelDirective } from "../model.js";
-import type { MsgContext } from "../templating.js";
-import type { ReplyPayload } from "../types.js";
-import {
-  type ElevatedLevel,
-  extractElevatedDirective,
-  extractThinkDirective,
-  extractVerboseDirective,
-  type ThinkLevel,
-  type VerboseLevel,
-} from "./directives.js";
-import { stripMentions, stripStructuralPrefixes } from "./mentions.js";
-import {
-  type ModelDirectiveSelection,
-  resolveModelDirectiveSelection,
-} from "./model-selection.js";
-import {
-  extractQueueDirective,
-  type QueueDropPolicy,
-  type QueueMode,
-} from "./queue.js";
-
-const SYSTEM_MARK = "⚙️";
-
-export type InlineDirectives = {
-  cleaned: string;
-  hasThinkDirective: boolean;
-  thinkLevel?: ThinkLevel;
-  rawThinkLevel?: string;
-  hasVerboseDirective: boolean;
-  verboseLevel?: VerboseLevel;
-  rawVerboseLevel?: string;
-  hasElevatedDirective: boolean;
-  elevatedLevel?: ElevatedLevel;
-  rawElevatedLevel?: string;
-  hasModelDirective: boolean;
-  rawModelDirective?: string;
-  hasQueueDirective: boolean;
-  queueMode?: QueueMode;
-  queueReset: boolean;
-  rawQueueMode?: string;
-  debounceMs?: number;
-  cap?: number;
-  dropPolicy?: QueueDropPolicy;
-  rawDebounce?: string;
-  rawCap?: string;
-  rawDrop?: string;
-  hasQueueOptions: boolean;
-};
-
-export function parseInlineDirectives(body: string): InlineDirectives {
-  const {
-    cleaned: thinkCleaned,
-    thinkLevel,
-    rawLevel: rawThinkLevel,
-    hasDirective: hasThinkDirective,
-  } = extractThinkDirective(body);
-  const {
-    cleaned: verboseCleaned,
-    verboseLevel,
-    rawLevel: rawVerboseLevel,
-    hasDirective: hasVerboseDirective,
-  } = extractVerboseDirective(thinkCleaned);
-  const {
-    cleaned: elevatedCleaned,
-    elevatedLevel,
-    rawLevel: rawElevatedLevel,
-    hasDirective: hasElevatedDirective,
-  } = extractElevatedDirective(verboseCleaned);
-  const {
-    cleaned: modelCleaned,
-    rawModel,
-    hasDirective: hasModelDirective,
-  } = extractModelDirective(elevatedCleaned);
-  const {
-    cleaned: queueCleaned,
-    queueMode,
-    queueReset,
-    rawMode,
-    debounceMs,
-    cap,
-    dropPolicy,
-    rawDebounce,
-    rawCap,
-    rawDrop,
-    hasDirective: hasQueueDirective,
-    hasOptions: hasQueueOptions,
-  } = extractQueueDirective(modelCleaned);
-
-  return {
-    cleaned: queueCleaned,
-    hasThinkDirective,
-    thinkLevel,
-    rawThinkLevel,
-    hasVerboseDirective,
-    verboseLevel,
-    rawVerboseLevel,
-    hasElevatedDirective,
-    elevatedLevel,
-    rawElevatedLevel,
-    hasModelDirective,
-    rawModelDirective: rawModel,
-    hasQueueDirective,
-    queueMode,
-    queueReset,
-    rawQueueMode: rawMode,
-    debounceMs,
-    cap,
-    dropPolicy,
-    rawDebounce,
-    rawCap,
-    rawDrop,
-    hasQueueOptions,
-  };
-}
-
-export function isDirectiveOnly(params: {
-  directives: InlineDirectives;
-  cleanedBody: string;
-  ctx: MsgContext;
-  cfg: ClawdisConfig;
-  isGroup: boolean;
-}): boolean {
-  const { directives, cleanedBody, ctx, cfg, isGroup } = params;
-  if (
-    !directives.hasThinkDirective &&
-    !directives.hasVerboseDirective &&
-    !directives.hasElevatedDirective &&
-    !directives.hasModelDirective &&
-    !directives.hasQueueDirective
-  )
-    return false;
-  const stripped = stripStructuralPrefixes(cleanedBody ?? "");
-  const noMentions = isGroup ? stripMentions(stripped, ctx, cfg) : stripped;
-  return noMentions.length === 0;
-}
-
-export async function handleDirectiveOnly(params: {
-  directives: InlineDirectives;
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  elevatedEnabled: boolean;
-  elevatedAllowed: boolean;
-  defaultProvider: string;
-  defaultModel: string;
-  aliasIndex: ModelAliasIndex;
-  allowedModelKeys: Set<string>;
-  allowedModelCatalog: Awaited<
-    ReturnType<typeof import("../../agents/model-catalog.js").loadModelCatalog>
-  >;
-  resetModelOverride: boolean;
-  provider: string;
-  model: string;
-  initialModelLabel: string;
-  formatModelSwitchEvent: (label: string, alias?: string) => string;
-}): Promise<ReplyPayload | undefined> {
-  const {
-    directives,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    elevatedEnabled,
-    elevatedAllowed,
-    defaultProvider,
-    defaultModel,
-    aliasIndex,
-    allowedModelKeys,
-    allowedModelCatalog,
-    resetModelOverride,
-    initialModelLabel,
-    formatModelSwitchEvent,
-  } = params;
-
-  if (directives.hasModelDirective) {
-    const isModelListAlias =
-      directives.rawModelDirective?.trim().toLowerCase() === "status";
-    if (!directives.rawModelDirective || isModelListAlias) {
-      if (allowedModelCatalog.length === 0) {
-        return { text: "No models available." };
-      }
-      const current = `${params.provider}/${params.model}`;
-      const defaultLabel = `${defaultProvider}/${defaultModel}`;
-      const header =
-        current === defaultLabel
-          ? `Models (current: ${current}):`
-          : `Models (current: ${current}, default: ${defaultLabel}):`;
-      const lines = [header];
-      if (resetModelOverride) {
-        lines.push(`(previous selection reset to default)`);
-      }
-      for (const entry of allowedModelCatalog) {
-        const label = `${entry.provider}/${entry.id}`;
-        const aliases = aliasIndex.byKey.get(label);
-        const aliasSuffix =
-          aliases && aliases.length > 0
-            ? ` (alias: ${aliases.join(", ")})`
-            : "";
-        const suffix =
-          entry.name && entry.name !== entry.id ? ` — ${entry.name}` : "";
-        lines.push(`- ${label}${aliasSuffix}${suffix}`);
-      }
-      return { text: lines.join("\n") };
-    }
-  }
-
-  if (directives.hasThinkDirective && !directives.thinkLevel) {
-    return {
-      text: `Unrecognized thinking level "${directives.rawThinkLevel ?? ""}". Valid levels: off, minimal, low, medium, high.`,
-    };
-  }
-  if (directives.hasVerboseDirective && !directives.verboseLevel) {
-    return {
-      text: `Unrecognized verbose level "${directives.rawVerboseLevel ?? ""}". Valid levels: off, on.`,
-    };
-  }
-  if (directives.hasElevatedDirective && !directives.elevatedLevel) {
-    return {
-      text: `Unrecognized elevated level "${directives.rawElevatedLevel ?? ""}". Valid levels: off, on.`,
-    };
-  }
-  if (
-    directives.hasElevatedDirective &&
-    (!elevatedEnabled || !elevatedAllowed)
-  ) {
-    return { text: "elevated is not available right now." };
-  }
-
-  const queueModeInvalid =
-    directives.hasQueueDirective &&
-    !directives.queueMode &&
-    !directives.queueReset &&
-    Boolean(directives.rawQueueMode);
-  const queueDebounceInvalid =
-    directives.hasQueueDirective &&
-    directives.rawDebounce !== undefined &&
-    typeof directives.debounceMs !== "number";
-  const queueCapInvalid =
-    directives.hasQueueDirective &&
-    directives.rawCap !== undefined &&
-    typeof directives.cap !== "number";
-  const queueDropInvalid =
-    directives.hasQueueDirective &&
-    directives.rawDrop !== undefined &&
-    !directives.dropPolicy;
-  if (
-    queueModeInvalid ||
-    queueDebounceInvalid ||
-    queueCapInvalid ||
-    queueDropInvalid
-  ) {
-    const errors: string[] = [];
-    if (queueModeInvalid) {
-      errors.push(
-        `Unrecognized queue mode "${directives.rawQueueMode ?? ""}". Valid modes: steer, followup, collect, steer+backlog, interrupt.`,
-      );
-    }
-    if (queueDebounceInvalid) {
-      errors.push(
-        `Invalid debounce "${directives.rawDebounce ?? ""}". Use ms/s/m (e.g. debounce:1500ms, debounce:2s).`,
-      );
-    }
-    if (queueCapInvalid) {
-      errors.push(
-        `Invalid cap "${directives.rawCap ?? ""}". Use a positive integer (e.g. cap:10).`,
-      );
-    }
-    if (queueDropInvalid) {
-      errors.push(
-        `Invalid drop policy "${directives.rawDrop ?? ""}". Use drop:old, drop:new, or drop:summarize.`,
-      );
-    }
-    return { text: errors.join(" ") };
-  }
-
-  let modelSelection: ModelDirectiveSelection | undefined;
-  if (directives.hasModelDirective && directives.rawModelDirective) {
-    const resolved = resolveModelDirectiveSelection({
-      raw: directives.rawModelDirective,
-      defaultProvider,
-      defaultModel,
-      aliasIndex,
-      allowedModelKeys,
-    });
-    if (resolved.error) {
-      return { text: resolved.error };
-    }
-    modelSelection = resolved.selection;
-    if (modelSelection) {
-      const nextLabel = `${modelSelection.provider}/${modelSelection.model}`;
-      if (nextLabel !== initialModelLabel) {
-        enqueueSystemEvent(
-          formatModelSwitchEvent(nextLabel, modelSelection.alias),
-          {
-            contextKey: `model:${nextLabel}`,
-          },
-        );
-      }
-    }
-  }
-
-  if (sessionEntry && sessionStore && sessionKey) {
-    if (directives.hasThinkDirective && directives.thinkLevel) {
-      if (directives.thinkLevel === "off") delete sessionEntry.thinkingLevel;
-      else sessionEntry.thinkingLevel = directives.thinkLevel;
-    }
-    if (directives.hasVerboseDirective && directives.verboseLevel) {
-      if (directives.verboseLevel === "off") delete sessionEntry.verboseLevel;
-      else sessionEntry.verboseLevel = directives.verboseLevel;
-    }
-    if (directives.hasElevatedDirective && directives.elevatedLevel) {
-      if (directives.elevatedLevel === "off") delete sessionEntry.elevatedLevel;
-      else sessionEntry.elevatedLevel = directives.elevatedLevel;
-    }
-    if (modelSelection) {
-      if (modelSelection.isDefault) {
-        delete sessionEntry.providerOverride;
-        delete sessionEntry.modelOverride;
-      } else {
-        sessionEntry.providerOverride = modelSelection.provider;
-        sessionEntry.modelOverride = modelSelection.model;
-      }
-    }
-    if (directives.hasQueueDirective && directives.queueReset) {
-      delete sessionEntry.queueMode;
-      delete sessionEntry.queueDebounceMs;
-      delete sessionEntry.queueCap;
-      delete sessionEntry.queueDrop;
-    } else if (directives.hasQueueDirective) {
-      if (directives.queueMode) sessionEntry.queueMode = directives.queueMode;
-      if (typeof directives.debounceMs === "number") {
-        sessionEntry.queueDebounceMs = directives.debounceMs;
-      }
-      if (typeof directives.cap === "number") {
-        sessionEntry.queueCap = directives.cap;
-      }
-      if (directives.dropPolicy) {
-        sessionEntry.queueDrop = directives.dropPolicy;
-      }
-    }
-    sessionEntry.updatedAt = Date.now();
-    sessionStore[sessionKey] = sessionEntry;
-    if (storePath) {
-      await saveSessionStore(storePath, sessionStore);
-    }
-  }
-
-  const parts: string[] = [];
-  if (directives.hasThinkDirective && directives.thinkLevel) {
-    parts.push(
-      directives.thinkLevel === "off"
-        ? "Thinking disabled."
-        : `Thinking level set to ${directives.thinkLevel}.`,
-    );
-  }
-  if (directives.hasVerboseDirective && directives.verboseLevel) {
-    parts.push(
-      directives.verboseLevel === "off"
-        ? `${SYSTEM_MARK} Verbose logging disabled.`
-        : `${SYSTEM_MARK} Verbose logging enabled.`,
-    );
-  }
-  if (directives.hasElevatedDirective && directives.elevatedLevel) {
-    parts.push(
-      directives.elevatedLevel === "off"
-        ? `${SYSTEM_MARK} Elevated mode disabled.`
-        : `${SYSTEM_MARK} Elevated mode enabled.`,
-    );
-  }
-  if (modelSelection) {
-    const label = `${modelSelection.provider}/${modelSelection.model}`;
-    const labelWithAlias = modelSelection.alias
-      ? `${modelSelection.alias} (${label})`
-      : label;
-    parts.push(
-      modelSelection.isDefault
-        ? `Model reset to default (${labelWithAlias}).`
-        : `Model set to ${labelWithAlias}.`,
-    );
-  }
-  if (directives.hasQueueDirective && directives.queueMode) {
-    parts.push(`${SYSTEM_MARK} Queue mode set to ${directives.queueMode}.`);
-  } else if (directives.hasQueueDirective && directives.queueReset) {
-    parts.push(`${SYSTEM_MARK} Queue mode reset to default.`);
-  }
-  if (
-    directives.hasQueueDirective &&
-    typeof directives.debounceMs === "number"
-  ) {
-    parts.push(
-      `${SYSTEM_MARK} Queue debounce set to ${directives.debounceMs}ms.`,
-    );
-  }
-  if (directives.hasQueueDirective && typeof directives.cap === "number") {
-    parts.push(`${SYSTEM_MARK} Queue cap set to ${directives.cap}.`);
-  }
-  if (directives.hasQueueDirective && directives.dropPolicy) {
-    parts.push(`${SYSTEM_MARK} Queue drop set to ${directives.dropPolicy}.`);
-  }
-  const ack = parts.join(" ").trim();
-  return { text: ack || "OK." };
-}
-
-export async function persistInlineDirectives(params: {
-  directives: InlineDirectives;
-  effectiveModelDirective?: string;
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  elevatedEnabled: boolean;
-  elevatedAllowed: boolean;
-  defaultProvider: string;
-  defaultModel: string;
-  aliasIndex: ModelAliasIndex;
-  allowedModelKeys: Set<string>;
-  provider: string;
-  model: string;
-  initialModelLabel: string;
-  formatModelSwitchEvent: (label: string, alias?: string) => string;
-  agentCfg: ClawdisConfig["agent"] | undefined;
-}): Promise<{ provider: string; model: string; contextTokens: number }> {
-  const {
-    directives,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    elevatedEnabled,
-    elevatedAllowed,
-    defaultProvider,
-    defaultModel,
-    aliasIndex,
-    allowedModelKeys,
-    initialModelLabel,
-    formatModelSwitchEvent,
-    agentCfg,
-  } = params;
-  let { provider, model } = params;
-
-  if (sessionEntry && sessionStore && sessionKey) {
-    let updated = false;
-    if (directives.hasThinkDirective && directives.thinkLevel) {
-      if (directives.thinkLevel === "off") {
-        delete sessionEntry.thinkingLevel;
-      } else {
-        sessionEntry.thinkingLevel = directives.thinkLevel;
-      }
-      updated = true;
-    }
-    if (directives.hasVerboseDirective && directives.verboseLevel) {
-      if (directives.verboseLevel === "off") {
-        delete sessionEntry.verboseLevel;
-      } else {
-        sessionEntry.verboseLevel = directives.verboseLevel;
-      }
-      updated = true;
-    }
-    if (
-      directives.hasElevatedDirective &&
-      directives.elevatedLevel &&
-      elevatedEnabled &&
-      elevatedAllowed
-    ) {
-      if (directives.elevatedLevel === "off") {
-        delete sessionEntry.elevatedLevel;
-      } else {
-        sessionEntry.elevatedLevel = directives.elevatedLevel;
-      }
-      updated = true;
-    }
-    const modelDirective =
-      directives.hasModelDirective && params.effectiveModelDirective
-        ? params.effectiveModelDirective
-        : undefined;
-    if (modelDirective) {
-      const resolved = resolveModelRefFromString({
-        raw: modelDirective,
-        defaultProvider,
-        aliasIndex,
-      });
-      if (resolved) {
-        const key = modelKey(resolved.ref.provider, resolved.ref.model);
-        if (allowedModelKeys.size === 0 || allowedModelKeys.has(key)) {
-          const isDefault =
-            resolved.ref.provider === defaultProvider &&
-            resolved.ref.model === defaultModel;
-          if (isDefault) {
-            delete sessionEntry.providerOverride;
-            delete sessionEntry.modelOverride;
-          } else {
-            sessionEntry.providerOverride = resolved.ref.provider;
-            sessionEntry.modelOverride = resolved.ref.model;
-          }
-          provider = resolved.ref.provider;
-          model = resolved.ref.model;
-          const nextLabel = `${provider}/${model}`;
-          if (nextLabel !== initialModelLabel) {
-            enqueueSystemEvent(
-              formatModelSwitchEvent(nextLabel, resolved.alias),
-              {
-                contextKey: `model:${nextLabel}`,
-              },
-            );
-          }
-          updated = true;
-        }
-      }
-    }
-    if (directives.hasQueueDirective && directives.queueReset) {
-      delete sessionEntry.queueMode;
-      delete sessionEntry.queueDebounceMs;
-      delete sessionEntry.queueCap;
-      delete sessionEntry.queueDrop;
-      updated = true;
-    }
-    if (updated) {
-      sessionEntry.updatedAt = Date.now();
-      sessionStore[sessionKey] = sessionEntry;
-      if (storePath) {
-        await saveSessionStore(storePath, sessionStore);
-      }
-    }
-  }
-
-  return {
-    provider,
-    model,
-    contextTokens:
-      agentCfg?.contextTokens ??
-      lookupContextTokens(model) ??
-      DEFAULT_CONTEXT_TOKENS,
-  };
-}
-
-export function resolveDefaultModel(params: { cfg: ClawdisConfig }): {
-  defaultProvider: string;
-  defaultModel: string;
-  aliasIndex: ModelAliasIndex;
-} {
-  const mainModel = resolveConfiguredModelRef({
-    cfg: params.cfg,
-    defaultProvider: DEFAULT_PROVIDER,
-    defaultModel: DEFAULT_MODEL,
-  });
-  const defaultProvider = mainModel.provider;
-  const defaultModel = mainModel.model;
-  const aliasIndex = buildModelAliasIndex({
-    cfg: params.cfg,
-    defaultProvider,
-  });
-  return { defaultProvider, defaultModel, aliasIndex };
-}

src/auto-reply/reply/directives.ts

@@ -1,77 +0,0 @@
-import {
-  type ElevatedLevel,
-  normalizeElevatedLevel,
-  normalizeThinkLevel,
-  normalizeVerboseLevel,
-  type ThinkLevel,
-  type VerboseLevel,
-} from "../thinking.js";
-
-export function extractThinkDirective(body?: string): {
-  cleaned: string;
-  thinkLevel?: ThinkLevel;
-  rawLevel?: string;
-  hasDirective: boolean;
-} {
-  if (!body) return { cleaned: "", hasDirective: false };
-  // Match the longest keyword first to avoid partial captures (e.g. "/think:high")
-  const match = body.match(
-    /(?:^|\s)\/(?:thinking|think|t)\s*:?\s*([a-zA-Z-]+)\b/i,
-  );
-  const thinkLevel = normalizeThinkLevel(match?.[1]);
-  const cleaned = match
-    ? body.replace(match[0], "").replace(/\s+/g, " ").trim()
-    : body.trim();
-  return {
-    cleaned,
-    thinkLevel,
-    rawLevel: match?.[1],
-    hasDirective: !!match,
-  };
-}
-
-export function extractVerboseDirective(body?: string): {
-  cleaned: string;
-  verboseLevel?: VerboseLevel;
-  rawLevel?: string;
-  hasDirective: boolean;
-} {
-  if (!body) return { cleaned: "", hasDirective: false };
-  const match = body.match(
-    /(?:^|\s)\/(?:verbose|v)(?=$|\s|:)\s*:?\s*([a-zA-Z-]+)\b/i,
-  );
-  const verboseLevel = normalizeVerboseLevel(match?.[1]);
-  const cleaned = match
-    ? body.replace(match[0], "").replace(/\s+/g, " ").trim()
-    : body.trim();
-  return {
-    cleaned,
-    verboseLevel,
-    rawLevel: match?.[1],
-    hasDirective: !!match,
-  };
-}
-
-export function extractElevatedDirective(body?: string): {
-  cleaned: string;
-  elevatedLevel?: ElevatedLevel;
-  rawLevel?: string;
-  hasDirective: boolean;
-} {
-  if (!body) return { cleaned: "", hasDirective: false };
-  const match = body.match(
-    /(?:^|\s)\/(?:elevated|elev)(?=$|\s|:)\s*:?\s*([a-zA-Z-]+)\b/i,
-  );
-  const elevatedLevel = normalizeElevatedLevel(match?.[1]);
-  const cleaned = match
-    ? body.replace(match[0], "").replace(/\s+/g, " ").trim()
-    : body.trim();
-  return {
-    cleaned,
-    elevatedLevel,
-    rawLevel: match?.[1],
-    hasDirective: !!match,
-  };
-}
-
-export type { ElevatedLevel, ThinkLevel, VerboseLevel };

src/auto-reply/reply/followup-runner.ts

@@ -1,169 +0,0 @@
-import crypto from "node:crypto";
-import { lookupContextTokens } from "../../agents/context.js";
-import { DEFAULT_CONTEXT_TOKENS } from "../../agents/defaults.js";
-import { runEmbeddedPiAgent } from "../../agents/pi-embedded.js";
-import { type SessionEntry, saveSessionStore } from "../../config/sessions.js";
-import { logVerbose } from "../../globals.js";
-import { registerAgentRunContext } from "../../infra/agent-events.js";
-import { defaultRuntime } from "../../runtime.js";
-import { stripHeartbeatToken } from "../heartbeat.js";
-import { SILENT_REPLY_TOKEN } from "../tokens.js";
-import type { GetReplyOptions, ReplyPayload } from "../types.js";
-import type { FollowupRun } from "./queue.js";
-import { extractReplyToTag } from "./reply-tags.js";
-import type { TypingController } from "./typing.js";
-
-export function createFollowupRunner(params: {
-  opts?: GetReplyOptions;
-  typing: TypingController;
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  defaultModel: string;
-  agentCfgContextTokens?: number;
-}): (queued: FollowupRun) => Promise<void> {
-  const {
-    opts,
-    typing,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    defaultModel,
-    agentCfgContextTokens,
-  } = params;
-
-  const sendFollowupPayloads = async (payloads: ReplyPayload[]) => {
-    if (!opts?.onBlockReply) {
-      logVerbose("followup queue: no onBlockReply handler; dropping payloads");
-      return;
-    }
-    for (const payload of payloads) {
-      if (!payload?.text && !payload?.mediaUrl && !payload?.mediaUrls?.length) {
-        continue;
-      }
-      if (
-        payload.text?.trim() === SILENT_REPLY_TOKEN &&
-        !payload.mediaUrl &&
-        !payload.mediaUrls?.length
-      ) {
-        continue;
-      }
-      await typing.startTypingOnText(payload.text);
-      await opts.onBlockReply(payload);
-    }
-  };
-
-  return async (queued: FollowupRun) => {
-    const runId = crypto.randomUUID();
-    if (queued.run.sessionKey) {
-      registerAgentRunContext(runId, { sessionKey: queued.run.sessionKey });
-    }
-    let runResult: Awaited<ReturnType<typeof runEmbeddedPiAgent>>;
-    try {
-      runResult = await runEmbeddedPiAgent({
-        sessionId: queued.run.sessionId,
-        sessionKey: queued.run.sessionKey,
-        surface: queued.run.surface,
-        sessionFile: queued.run.sessionFile,
-        workspaceDir: queued.run.workspaceDir,
-        config: queued.run.config,
-        skillsSnapshot: queued.run.skillsSnapshot,
-        prompt: queued.prompt,
-        extraSystemPrompt: queued.run.extraSystemPrompt,
-        ownerNumbers: queued.run.ownerNumbers,
-        enforceFinalTag: queued.run.enforceFinalTag,
-        provider: queued.run.provider,
-        model: queued.run.model,
-        thinkLevel: queued.run.thinkLevel,
-        verboseLevel: queued.run.verboseLevel,
-        bashElevated: queued.run.bashElevated,
-        timeoutMs: queued.run.timeoutMs,
-        runId,
-        blockReplyBreak: queued.run.blockReplyBreak,
-      });
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      defaultRuntime.error?.(`Followup agent failed before reply: ${message}`);
-      return;
-    }
-
-    const payloadArray = runResult.payloads ?? [];
-    if (payloadArray.length === 0) return;
-    const sanitizedPayloads = payloadArray.flatMap((payload) => {
-      const text = payload.text;
-      if (!text || !text.includes("HEARTBEAT_OK")) return [payload];
-      const stripped = stripHeartbeatToken(text, { mode: "message" });
-      const hasMedia =
-        Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
-      if (stripped.shouldSkip && !hasMedia) return [];
-      return [{ ...payload, text: stripped.text }];
-    });
-
-    const replyTaggedPayloads: ReplyPayload[] = sanitizedPayloads
-      .map((payload) => {
-        const { cleaned, replyToId } = extractReplyToTag(payload.text);
-        return {
-          ...payload,
-          text: cleaned ? cleaned : undefined,
-          replyToId: replyToId ?? payload.replyToId,
-        };
-      })
-      .filter(
-        (payload) =>
-          payload.text ||
-          payload.mediaUrl ||
-          (payload.mediaUrls && payload.mediaUrls.length > 0),
-      );
-
-    if (replyTaggedPayloads.length === 0) return;
-
-    if (sessionStore && sessionKey) {
-      const usage = runResult.meta.agentMeta?.usage;
-      const modelUsed = runResult.meta.agentMeta?.model ?? defaultModel;
-      const contextTokensUsed =
-        agentCfgContextTokens ??
-        lookupContextTokens(modelUsed) ??
-        sessionEntry?.contextTokens ??
-        DEFAULT_CONTEXT_TOKENS;
-
-      if (usage) {
-        const entry = sessionStore[sessionKey];
-        if (entry) {
-          const input = usage.input ?? 0;
-          const output = usage.output ?? 0;
-          const promptTokens =
-            input + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
-          sessionStore[sessionKey] = {
-            ...entry,
-            inputTokens: input,
-            outputTokens: output,
-            totalTokens:
-              promptTokens > 0 ? promptTokens : (usage.total ?? input),
-            model: modelUsed,
-            contextTokens: contextTokensUsed ?? entry.contextTokens,
-            updatedAt: Date.now(),
-          };
-          if (storePath) {
-            await saveSessionStore(storePath, sessionStore);
-          }
-        }
-      } else if (modelUsed || contextTokensUsed) {
-        const entry = sessionStore[sessionKey];
-        if (entry) {
-          sessionStore[sessionKey] = {
-            ...entry,
-            model: modelUsed ?? entry.model,
-            contextTokens: contextTokensUsed ?? entry.contextTokens,
-          };
-          if (storePath) {
-            await saveSessionStore(storePath, sessionStore);
-          }
-        }
-      }
-    }
-
-    await sendFollowupPayloads(replyTaggedPayloads);
-  };
-}

src/auto-reply/reply/groups.ts

@@ -1,108 +0,0 @@
-import type { ClawdisConfig } from "../../config/config.js";
-import type {
-  GroupKeyResolution,
-  SessionEntry,
-} from "../../config/sessions.js";
-import { normalizeGroupActivation } from "../group-activation.js";
-import type { TemplateContext } from "../templating.js";
-
-export function resolveGroupRequireMention(params: {
-  cfg: ClawdisConfig;
-  ctx: TemplateContext;
-  groupResolution?: GroupKeyResolution;
-}): boolean {
-  const { cfg, ctx, groupResolution } = params;
-  const surface = groupResolution?.surface ?? ctx.Surface?.trim().toLowerCase();
-  const groupId = groupResolution?.id ?? ctx.From?.replace(/^group:/, "");
-  if (surface === "telegram") {
-    if (groupId) {
-      const groupConfig = cfg.telegram?.groups?.[groupId];
-      if (typeof groupConfig?.requireMention === "boolean") {
-        return groupConfig.requireMention;
-      }
-    }
-    const groupDefault = cfg.telegram?.groups?.["*"]?.requireMention;
-    if (typeof groupDefault === "boolean") return groupDefault;
-    return true;
-  }
-  if (surface === "whatsapp") {
-    if (groupId) {
-      const groupConfig = cfg.whatsapp?.groups?.[groupId];
-      if (typeof groupConfig?.requireMention === "boolean") {
-        return groupConfig.requireMention;
-      }
-    }
-    const groupDefault = cfg.whatsapp?.groups?.["*"]?.requireMention;
-    if (typeof groupDefault === "boolean") return groupDefault;
-    return true;
-  }
-  if (surface === "imessage") {
-    if (groupId) {
-      const groupConfig = cfg.imessage?.groups?.[groupId];
-      if (typeof groupConfig?.requireMention === "boolean") {
-        return groupConfig.requireMention;
-      }
-    }
-    const groupDefault = cfg.imessage?.groups?.["*"]?.requireMention;
-    if (typeof groupDefault === "boolean") return groupDefault;
-    return true;
-  }
-  return true;
-}
-
-export function defaultGroupActivation(
-  requireMention: boolean,
-): "always" | "mention" {
-  return requireMention === false ? "always" : "mention";
-}
-
-export function buildGroupIntro(params: {
-  sessionCtx: TemplateContext;
-  sessionEntry?: SessionEntry;
-  defaultActivation: "always" | "mention";
-  silentToken: string;
-}): string {
-  const activation =
-    normalizeGroupActivation(params.sessionEntry?.groupActivation) ??
-    params.defaultActivation;
-  const subject = params.sessionCtx.GroupSubject?.trim();
-  const members = params.sessionCtx.GroupMembers?.trim();
-  const surface = params.sessionCtx.Surface?.trim().toLowerCase();
-  const surfaceLabel = (() => {
-    if (!surface) return "chat";
-    if (surface === "whatsapp") return "WhatsApp";
-    if (surface === "telegram") return "Telegram";
-    if (surface === "discord") return "Discord";
-    if (surface === "webchat") return "WebChat";
-    return `${surface.at(0)?.toUpperCase() ?? ""}${surface.slice(1)}`;
-  })();
-  const subjectLine = subject
-    ? `You are replying inside the ${surfaceLabel} group "${subject}".`
-    : `You are replying inside a ${surfaceLabel} group chat.`;
-  const membersLine = members ? `Group members: ${members}.` : undefined;
-  const activationLine =
-    activation === "always"
-      ? "Activation: always-on (you receive every group message)."
-      : "Activation: trigger-only (you are invoked only when explicitly mentioned; recent context may be included).";
-  const silenceLine =
-    activation === "always"
-      ? `If no response is needed, reply with exactly "${params.silentToken}" (no other text) so Clawdis stays silent.`
-      : undefined;
-  const cautionLine =
-    activation === "always"
-      ? "Be extremely selective: reply only when you are directly addressed, asked a question, or can add clear value. Otherwise stay silent."
-      : undefined;
-  const lurkLine =
-    "Be a good group participant: lurk and follow the conversation, but only chime in when you have something genuinely helpful or relevant to add. Don't feel obligated to respond to every message — quality over quantity. Even when lurking silently, you can use emoji reactions to acknowledge messages, show support, or react to humor — reactions are always appreciated and don't clutter the chat.";
-  return [
-    subjectLine,
-    membersLine,
-    activationLine,
-    silenceLine,
-    cautionLine,
-    lurkLine,
-  ]
-    .filter(Boolean)
-    .join(" ")
-    .concat(" Address the specific sender noted in the message context.");
-}

src/auto-reply/reply/mentions.ts

@@ -1,45 +0,0 @@
-import type { ClawdisConfig } from "../../config/config.js";
-import type { MsgContext } from "../templating.js";
-
-export function stripStructuralPrefixes(text: string): string {
-  // Ignore wrapper labels, timestamps, and sender prefixes so directive-only
-  // detection still works in group batches that include history/context.
-  const marker = "[Current message - respond to this]";
-  const afterMarker = text.includes(marker)
-    ? text.slice(text.indexOf(marker) + marker.length)
-    : text;
-  return afterMarker
-    .replace(/\[[^\]]+\]\s*/g, "")
-    .replace(/^[ \t]*[A-Za-z0-9+()\-_. ]+:\s*/gm, "")
-    .replace(/\s+/g, " ")
-    .trim();
-}
-
-export function stripMentions(
-  text: string,
-  ctx: MsgContext,
-  cfg: ClawdisConfig | undefined,
-): string {
-  let result = text;
-  const patterns = cfg?.routing?.groupChat?.mentionPatterns ?? [];
-  for (const p of patterns) {
-    try {
-      const re = new RegExp(p, "gi");
-      result = result.replace(re, " ");
-    } catch {
-      // ignore invalid regex
-    }
-  }
-  const selfE164 = (ctx.To ?? "").replace(/^whatsapp:/, "");
-  if (selfE164) {
-    const esc = selfE164.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    result = result
-      .replace(new RegExp(esc, "gi"), " ")
-      .replace(new RegExp(`@${esc}`, "gi"), " ");
-  }
-  // Generic mention patterns like @123456789 or plain digits
-  result = result.replace(/@[0-9+]{5,}/g, " ");
-  // Discord-style mentions (<@123> or <@!123>)
-  result = result.replace(/<@!?\d+>/g, " ");
-  return result.replace(/\s+/g, " ").trim();
-}

src/auto-reply/reply/model-selection.ts

@@ -1,188 +0,0 @@
-import { lookupContextTokens } from "../../agents/context.js";
-import { DEFAULT_CONTEXT_TOKENS } from "../../agents/defaults.js";
-import { loadModelCatalog } from "../../agents/model-catalog.js";
-import {
-  buildAllowedModelSet,
-  type ModelAliasIndex,
-  modelKey,
-  resolveModelRefFromString,
-  resolveThinkingDefault,
-} from "../../agents/model-selection.js";
-import type { ClawdisConfig } from "../../config/config.js";
-import { type SessionEntry, saveSessionStore } from "../../config/sessions.js";
-import type { ThinkLevel } from "./directives.js";
-
-export type ModelDirectiveSelection = {
-  provider: string;
-  model: string;
-  isDefault: boolean;
-  alias?: string;
-};
-
-type ModelCatalog = Awaited<ReturnType<typeof loadModelCatalog>>;
-
-type ModelSelectionState = {
-  provider: string;
-  model: string;
-  allowedModelKeys: Set<string>;
-  allowedModelCatalog: ModelCatalog;
-  resetModelOverride: boolean;
-  resolveDefaultThinkingLevel: () => Promise<ThinkLevel | undefined>;
-  needsModelCatalog: boolean;
-};
-
-export async function createModelSelectionState(params: {
-  cfg: ClawdisConfig;
-  agentCfg: ClawdisConfig["agent"] | undefined;
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  defaultProvider: string;
-  defaultModel: string;
-  provider: string;
-  model: string;
-  hasModelDirective: boolean;
-}): Promise<ModelSelectionState> {
-  const {
-    cfg,
-    agentCfg,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    defaultProvider,
-  } = params;
-
-  let provider = params.provider;
-  let model = params.model;
-
-  const hasAllowlist = (agentCfg?.allowedModels?.length ?? 0) > 0;
-  const hasStoredOverride = Boolean(
-    sessionEntry?.modelOverride || sessionEntry?.providerOverride,
-  );
-  const needsModelCatalog =
-    params.hasModelDirective || hasAllowlist || hasStoredOverride;
-
-  let allowedModelKeys = new Set<string>();
-  let allowedModelCatalog: ModelCatalog = [];
-  let modelCatalog: ModelCatalog | null = null;
-  let resetModelOverride = false;
-
-  if (needsModelCatalog) {
-    modelCatalog = await loadModelCatalog({ config: cfg });
-    const allowed = buildAllowedModelSet({
-      cfg,
-      catalog: modelCatalog,
-      defaultProvider,
-    });
-    allowedModelCatalog = allowed.allowedCatalog;
-    allowedModelKeys = allowed.allowedKeys;
-  }
-
-  if (sessionEntry && sessionStore && sessionKey && hasStoredOverride) {
-    const overrideProvider =
-      sessionEntry.providerOverride?.trim() || defaultProvider;
-    const overrideModel = sessionEntry.modelOverride?.trim();
-    if (overrideModel) {
-      const key = modelKey(overrideProvider, overrideModel);
-      if (allowedModelKeys.size > 0 && !allowedModelKeys.has(key)) {
-        delete sessionEntry.providerOverride;
-        delete sessionEntry.modelOverride;
-        sessionEntry.updatedAt = Date.now();
-        sessionStore[sessionKey] = sessionEntry;
-        if (storePath) {
-          await saveSessionStore(storePath, sessionStore);
-        }
-        resetModelOverride = true;
-      }
-    }
-  }
-
-  const storedProviderOverride = sessionEntry?.providerOverride?.trim();
-  const storedModelOverride = sessionEntry?.modelOverride?.trim();
-  if (storedModelOverride) {
-    const candidateProvider = storedProviderOverride || defaultProvider;
-    const key = modelKey(candidateProvider, storedModelOverride);
-    if (allowedModelKeys.size === 0 || allowedModelKeys.has(key)) {
-      provider = candidateProvider;
-      model = storedModelOverride;
-    }
-  }
-
-  let defaultThinkingLevel: ThinkLevel | undefined;
-  const resolveDefaultThinkingLevel = async () => {
-    if (defaultThinkingLevel) return defaultThinkingLevel;
-    let catalogForThinking = modelCatalog ?? allowedModelCatalog;
-    if (!catalogForThinking || catalogForThinking.length === 0) {
-      modelCatalog = await loadModelCatalog({ config: cfg });
-      catalogForThinking = modelCatalog;
-    }
-    defaultThinkingLevel = resolveThinkingDefault({
-      cfg,
-      provider,
-      model,
-      catalog: catalogForThinking,
-    });
-    return defaultThinkingLevel;
-  };
-
-  return {
-    provider,
-    model,
-    allowedModelKeys,
-    allowedModelCatalog,
-    resetModelOverride,
-    resolveDefaultThinkingLevel,
-    needsModelCatalog,
-  };
-}
-
-export function resolveModelDirectiveSelection(params: {
-  raw: string;
-  defaultProvider: string;
-  defaultModel: string;
-  aliasIndex: ModelAliasIndex;
-  allowedModelKeys: Set<string>;
-}): { selection?: ModelDirectiveSelection; error?: string } {
-  const { raw, defaultProvider, defaultModel, aliasIndex, allowedModelKeys } =
-    params;
-  const resolved = resolveModelRefFromString({
-    raw,
-    defaultProvider,
-    aliasIndex,
-  });
-  if (!resolved) {
-    return {
-      error: `Unrecognized model "${raw}". Use /model to list available models.`,
-    };
-  }
-  const key = modelKey(resolved.ref.provider, resolved.ref.model);
-  if (allowedModelKeys.size > 0 && !allowedModelKeys.has(key)) {
-    return {
-      error: `Model "${resolved.ref.provider}/${resolved.ref.model}" is not allowed. Use /model to list available models.`,
-    };
-  }
-  const isDefault =
-    resolved.ref.provider === defaultProvider &&
-    resolved.ref.model === defaultModel;
-  return {
-    selection: {
-      provider: resolved.ref.provider,
-      model: resolved.ref.model,
-      isDefault,
-      alias: resolved.alias,
-    },
-  };
-}
-
-export function resolveContextTokens(params: {
-  agentCfg: ClawdisConfig["agent"] | undefined;
-  model: string;
-}): number {
-  return (
-    params.agentCfg?.contextTokens ??
-    lookupContextTokens(params.model) ??
-    DEFAULT_CONTEXT_TOKENS
-  );
-}

src/auto-reply/reply/queue.ts

@@ -1,479 +0,0 @@
-import type { SkillSnapshot } from "../../agents/skills.js";
-import { parseDurationMs } from "../../cli/parse-duration.js";
-import type { ClawdisConfig } from "../../config/config.js";
-import type { SessionEntry } from "../../config/sessions.js";
-import { defaultRuntime } from "../../runtime.js";
-import type { ElevatedLevel, ThinkLevel, VerboseLevel } from "./directives.js";
-export type QueueMode =
-  | "steer"
-  | "followup"
-  | "collect"
-  | "steer-backlog"
-  | "interrupt"
-  | "queue";
-export type QueueDropPolicy = "old" | "new" | "summarize";
-export type QueueSettings = {
-  mode: QueueMode;
-  debounceMs?: number;
-  cap?: number;
-  dropPolicy?: QueueDropPolicy;
-};
-export type FollowupRun = {
-  prompt: string;
-  summaryLine?: string;
-  enqueuedAt: number;
-  run: {
-    sessionId: string;
-    sessionKey?: string;
-    surface?: string;
-    sessionFile: string;
-    workspaceDir: string;
-    config: ClawdisConfig;
-    skillsSnapshot?: SkillSnapshot;
-    provider: string;
-    model: string;
-    thinkLevel?: ThinkLevel;
-    verboseLevel?: VerboseLevel;
-    elevatedLevel?: ElevatedLevel;
-    bashElevated?: {
-      enabled: boolean;
-      allowed: boolean;
-      defaultLevel: ElevatedLevel;
-    };
-    timeoutMs: number;
-    blockReplyBreak: "text_end" | "message_end";
-    ownerNumbers?: string[];
-    extraSystemPrompt?: string;
-    enforceFinalTag?: boolean;
-  };
-};
-type FollowupQueueState = {
-  items: FollowupRun[];
-  draining: boolean;
-  lastEnqueuedAt: number;
-  mode: QueueMode;
-  debounceMs: number;
-  cap: number;
-  dropPolicy: QueueDropPolicy;
-  droppedCount: number;
-  summaryLines: string[];
-  lastRun?: FollowupRun["run"];
-};
-const DEFAULT_QUEUE_DEBOUNCE_MS = 1000;
-const DEFAULT_QUEUE_CAP = 20;
-const DEFAULT_QUEUE_DROP: QueueDropPolicy = "summarize";
-const FOLLOWUP_QUEUES = new Map<string, FollowupQueueState>();
-function normalizeQueueMode(raw?: string): QueueMode | undefined {
-  if (!raw) return undefined;
-  const cleaned = raw.trim().toLowerCase();
-  if (cleaned === "queue" || cleaned === "queued") return "steer";
-  if (
-    cleaned === "interrupt" ||
-    cleaned === "interrupts" ||
-    cleaned === "abort"
-  )
-    return "interrupt";
-  if (cleaned === "steer" || cleaned === "steering") return "steer";
-  if (
-    cleaned === "followup" ||
-    cleaned === "follow-ups" ||
-    cleaned === "followups"
-  )
-    return "followup";
-  if (cleaned === "collect" || cleaned === "coalesce") return "collect";
-  if (
-    cleaned === "steer+backlog" ||
-    cleaned === "steer-backlog" ||
-    cleaned === "steer_backlog"
-  )
-    return "steer-backlog";
-  return undefined;
-}
-function normalizeQueueDropPolicy(raw?: string): QueueDropPolicy | undefined {
-  if (!raw) return undefined;
-  const cleaned = raw.trim().toLowerCase();
-  if (cleaned === "old" || cleaned === "oldest") return "old";
-  if (cleaned === "new" || cleaned === "newest") return "new";
-  if (cleaned === "summarize" || cleaned === "summary") return "summarize";
-  return undefined;
-}
-function parseQueueDebounce(raw?: string): number | undefined {
-  if (!raw) return undefined;
-  try {
-    const parsed = parseDurationMs(raw.trim(), { defaultUnit: "ms" });
-    if (!parsed || parsed < 0) return undefined;
-    return Math.round(parsed);
-  } catch {
-    return undefined;
-  }
-}
-function parseQueueCap(raw?: string): number | undefined {
-  if (!raw) return undefined;
-  const num = Number(raw);
-  if (!Number.isFinite(num)) return undefined;
-  const cap = Math.floor(num);
-  if (cap < 1) return undefined;
-  return cap;
-}
-function parseQueueDirectiveArgs(raw: string): {
-  consumed: number;
-  queueMode?: QueueMode;
-  queueReset: boolean;
-  rawMode?: string;
-  debounceMs?: number;
-  cap?: number;
-  dropPolicy?: QueueDropPolicy;
-  rawDebounce?: string;
-  rawCap?: string;
-  rawDrop?: string;
-  hasOptions: boolean;
-} {
-  let i = 0;
-  const len = raw.length;
-  while (i < len && /\s/.test(raw[i])) i += 1;
-  if (raw[i] === ":") {
-    i += 1;
-    while (i < len && /\s/.test(raw[i])) i += 1;
-  }
-  let consumed = i;
-  let queueMode: QueueMode | undefined;
-  let queueReset = false;
-  let rawMode: string | undefined;
-  let debounceMs: number | undefined;
-  let cap: number | undefined;
-  let dropPolicy: QueueDropPolicy | undefined;
-  let rawDebounce: string | undefined;
-  let rawCap: string | undefined;
-  let rawDrop: string | undefined;
-  let hasOptions = false;
-  const takeToken = (): string | null => {
-    if (i >= len) return null;
-    const start = i;
-    while (i < len && !/\s/.test(raw[i])) i += 1;
-    if (start === i) return null;
-    const token = raw.slice(start, i);
-    while (i < len && /\s/.test(raw[i])) i += 1;
-    return token;
-  };
-  while (i < len) {
-    const token = takeToken();
-    if (!token) break;
-    const lowered = token.trim().toLowerCase();
-    if (lowered === "default" || lowered === "reset" || lowered === "clear") {
-      queueReset = true;
-      consumed = i;
-      break;
-    }
-    if (lowered.startsWith("debounce:") || lowered.startsWith("debounce=")) {
-      rawDebounce = token.split(/[:=]/)[1] ?? "";
-      debounceMs = parseQueueDebounce(rawDebounce);
-      hasOptions = true;
-      consumed = i;
-      continue;
-    }
-    if (lowered.startsWith("cap:") || lowered.startsWith("cap=")) {
-      rawCap = token.split(/[:=]/)[1] ?? "";
-      cap = parseQueueCap(rawCap);
-      hasOptions = true;
-      consumed = i;
-      continue;
-    }
-    if (lowered.startsWith("drop:") || lowered.startsWith("drop=")) {
-      rawDrop = token.split(/[:=]/)[1] ?? "";
-      dropPolicy = normalizeQueueDropPolicy(rawDrop);
-      hasOptions = true;
-      consumed = i;
-      continue;
-    }
-    const mode = normalizeQueueMode(token);
-    if (mode) {
-      queueMode = mode;
-      rawMode = token;
-      consumed = i;
-      continue;
-    }
-    // Stop at first unrecognized token.
-    break;
-  }
-  return {
-    consumed,
-    queueMode,
-    queueReset,
-    rawMode,
-    debounceMs,
-    cap,
-    dropPolicy,
-    rawDebounce,
-    rawCap,
-    rawDrop,
-    hasOptions,
-  };
-}
-export function extractQueueDirective(body?: string): {
-  cleaned: string;
-  queueMode?: QueueMode;
-  queueReset: boolean;
-  rawMode?: string;
-  hasDirective: boolean;
-  debounceMs?: number;
-  cap?: number;
-  dropPolicy?: QueueDropPolicy;
-  rawDebounce?: string;
-  rawCap?: string;
-  rawDrop?: string;
-  hasOptions: boolean;
-} {
-  if (!body)
-    return {
-      cleaned: "",
-      hasDirective: false,
-      queueReset: false,
-      hasOptions: false,
-    };
-  const re = /(?:^|\s)\/queue(?=$|\s|:)/i;
-  const match = re.exec(body);
-  if (!match) {
-    return {
-      cleaned: body.trim(),
-      hasDirective: false,
-      queueReset: false,
-      hasOptions: false,
-    };
-  }
-  const start = match.index + match[0].indexOf("/queue");
-  const argsStart = start + "/queue".length;
-  const args = body.slice(argsStart);
-  const parsed = parseQueueDirectiveArgs(args);
-  const cleanedRaw =
-    body.slice(0, start) + body.slice(argsStart + parsed.consumed);
-  const cleaned = cleanedRaw.replace(/\s+/g, " ").trim();
-  return {
-    cleaned,
-    queueMode: parsed.queueMode,
-    queueReset: parsed.queueReset,
-    rawMode: parsed.rawMode,
-    debounceMs: parsed.debounceMs,
-    cap: parsed.cap,
-    dropPolicy: parsed.dropPolicy,
-    rawDebounce: parsed.rawDebounce,
-    rawCap: parsed.rawCap,
-    rawDrop: parsed.rawDrop,
-    hasDirective: true,
-    hasOptions: parsed.hasOptions,
-  };
-}
-function elideText(text: string, limit = 140): string {
-  if (text.length <= limit) return text;
-  return `${text.slice(0, Math.max(0, limit - 1)).trimEnd()}…`;
-}
-function buildQueueSummaryLine(run: FollowupRun): string {
-  const base = run.summaryLine?.trim() || run.prompt.trim();
-  const cleaned = base.replace(/\s+/g, " ").trim();
-  return elideText(cleaned, 160);
-}
-function getFollowupQueue(
-  key: string,
-  settings: QueueSettings,
-): FollowupQueueState {
-  const existing = FOLLOWUP_QUEUES.get(key);
-  if (existing) {
-    existing.mode = settings.mode;
-    existing.debounceMs =
-      typeof settings.debounceMs === "number"
-        ? Math.max(0, settings.debounceMs)
-        : existing.debounceMs;
-    existing.cap =
-      typeof settings.cap === "number" && settings.cap > 0
-        ? Math.floor(settings.cap)
-        : existing.cap;
-    existing.dropPolicy = settings.dropPolicy ?? existing.dropPolicy;
-    return existing;
-  }
-  const created: FollowupQueueState = {
-    items: [],
-    draining: false,
-    lastEnqueuedAt: 0,
-    mode: settings.mode,
-    debounceMs:
-      typeof settings.debounceMs === "number"
-        ? Math.max(0, settings.debounceMs)
-        : DEFAULT_QUEUE_DEBOUNCE_MS,
-    cap:
-      typeof settings.cap === "number" && settings.cap > 0
-        ? Math.floor(settings.cap)
-        : DEFAULT_QUEUE_CAP,
-    dropPolicy: settings.dropPolicy ?? DEFAULT_QUEUE_DROP,
-    droppedCount: 0,
-    summaryLines: [],
-  };
-  FOLLOWUP_QUEUES.set(key, created);
-  return created;
-}
-export function enqueueFollowupRun(
-  key: string,
-  run: FollowupRun,
-  settings: QueueSettings,
-): boolean {
-  const queue = getFollowupQueue(key, settings);
-  queue.lastEnqueuedAt = Date.now();
-  queue.lastRun = run.run;
-  const cap = queue.cap;
-  if (cap > 0 && queue.items.length >= cap) {
-    if (queue.dropPolicy === "new") {
-      return false;
-    }
-    const dropCount = queue.items.length - cap + 1;
-    const dropped = queue.items.splice(0, dropCount);
-    if (queue.dropPolicy === "summarize") {
-      for (const item of dropped) {
-        queue.droppedCount += 1;
-        queue.summaryLines.push(buildQueueSummaryLine(item));
-      }
-      while (queue.summaryLines.length > cap) queue.summaryLines.shift();
-    }
-  }
-  queue.items.push(run);
-  return true;
-}
-async function waitForQueueDebounce(queue: FollowupQueueState): Promise<void> {
-  const debounceMs = Math.max(0, queue.debounceMs);
-  if (debounceMs <= 0) return;
-  while (true) {
-    const since = Date.now() - queue.lastEnqueuedAt;
-    if (since >= debounceMs) return;
-    await new Promise((resolve) => setTimeout(resolve, debounceMs - since));
-  }
-}
-function buildSummaryPrompt(queue: FollowupQueueState): string | undefined {
-  if (queue.dropPolicy !== "summarize" || queue.droppedCount <= 0) {
-    return undefined;
-  }
-  const lines = [
-    `[Queue overflow] Dropped ${queue.droppedCount} message${queue.droppedCount === 1 ? "" : "s"} due to cap.`,
-  ];
-  if (queue.summaryLines.length > 0) {
-    lines.push("Summary:");
-    for (const line of queue.summaryLines) {
-      lines.push(`- ${line}`);
-    }
-  }
-  queue.droppedCount = 0;
-  queue.summaryLines = [];
-  return lines.join("\n");
-}
-function buildCollectPrompt(items: FollowupRun[], summary?: string): string {
-  const blocks: string[] = ["[Queued messages while agent was busy]"];
-  if (summary) {
-    blocks.push(summary);
-  }
-  items.forEach((item, idx) => {
-    blocks.push(`---\nQueued #${idx + 1}\n${item.prompt}`.trim());
-  });
-  return blocks.join("\n\n");
-}
-export function scheduleFollowupDrain(
-  key: string,
-  runFollowup: (run: FollowupRun) => Promise<void>,
-): void {
-  const queue = FOLLOWUP_QUEUES.get(key);
-  if (!queue || queue.draining) return;
-  queue.draining = true;
-  void (async () => {
-    try {
-      while (queue.items.length > 0 || queue.droppedCount > 0) {
-        await waitForQueueDebounce(queue);
-        if (queue.mode === "collect") {
-          const items = queue.items.splice(0, queue.items.length);
-          const summary = buildSummaryPrompt(queue);
-          const run = items.at(-1)?.run ?? queue.lastRun;
-          if (!run) break;
-          const prompt = buildCollectPrompt(items, summary);
-          await runFollowup({
-            prompt,
-            run,
-            enqueuedAt: Date.now(),
-          });
-          continue;
-        }
-        const summaryPrompt = buildSummaryPrompt(queue);
-        if (summaryPrompt) {
-          const run = queue.lastRun;
-          if (!run) break;
-          await runFollowup({
-            prompt: summaryPrompt,
-            run,
-            enqueuedAt: Date.now(),
-          });
-          continue;
-        }
-        const next = queue.items.shift();
-        if (!next) break;
-        await runFollowup(next);
-      }
-    } catch (err) {
-      defaultRuntime.error?.(
-        `followup queue drain failed for ${key}: ${String(err)}`,
-      );
-    } finally {
-      queue.draining = false;
-      if (queue.items.length === 0 && queue.droppedCount === 0) {
-        FOLLOWUP_QUEUES.delete(key);
-      } else {
-        scheduleFollowupDrain(key, runFollowup);
-      }
-    }
-  })();
-}
-function defaultQueueModeForSurface(surface?: string): QueueMode {
-  const normalized = surface?.trim().toLowerCase();
-  if (normalized === "discord") return "collect";
-  if (normalized === "webchat") return "collect";
-  if (normalized === "whatsapp") return "collect";
-  if (normalized === "telegram") return "collect";
-  if (normalized === "imessage") return "collect";
-  if (normalized === "signal") return "collect";
-  return "collect";
-}
-export function resolveQueueSettings(params: {
-  cfg: ClawdisConfig;
-  surface?: string;
-  sessionEntry?: SessionEntry;
-  inlineMode?: QueueMode;
-  inlineOptions?: Partial<QueueSettings>;
-}): QueueSettings {
-  const surfaceKey = params.surface?.trim().toLowerCase();
-  const queueCfg = params.cfg.routing?.queue;
-  const surfaceModeRaw =
-    surfaceKey && queueCfg?.bySurface
-      ? (queueCfg.bySurface as Record<string, string | undefined>)[surfaceKey]
-      : undefined;
-  const resolvedMode =
-    params.inlineMode ??
-    normalizeQueueMode(params.sessionEntry?.queueMode) ??
-    normalizeQueueMode(surfaceModeRaw) ??
-    normalizeQueueMode(queueCfg?.mode) ??
-    defaultQueueModeForSurface(surfaceKey);
-  const debounceRaw =
-    params.inlineOptions?.debounceMs ??
-    params.sessionEntry?.queueDebounceMs ??
-    queueCfg?.debounceMs ??
-    DEFAULT_QUEUE_DEBOUNCE_MS;
-  const capRaw =
-    params.inlineOptions?.cap ??
-    params.sessionEntry?.queueCap ??
-    queueCfg?.cap ??
-    DEFAULT_QUEUE_CAP;
-  const dropRaw =
-    params.inlineOptions?.dropPolicy ??
-    params.sessionEntry?.queueDrop ??
-    normalizeQueueDropPolicy(queueCfg?.drop) ??
-    DEFAULT_QUEUE_DROP;
-  return {
-    mode: resolvedMode,
-    debounceMs:
-      typeof debounceRaw === "number" ? Math.max(0, debounceRaw) : undefined,
-    cap:
-      typeof capRaw === "number" ? Math.max(1, Math.floor(capRaw)) : undefined,
-    dropPolicy: dropRaw,
-  };
-}

src/auto-reply/reply/reply-tags.ts

@@ -1,35 +0,0 @@
-export function extractReplyToTag(
-  text?: string,
-  currentMessageId?: string,
-): {
-  cleaned: string;
-  replyToId?: string;
-  hasTag: boolean;
-} {
-  if (!text) return { cleaned: "", hasTag: false };
-  let cleaned = text;
-  let replyToId: string | undefined;
-  let hasTag = false;
-
-  const currentMatch = cleaned.match(/\[\[reply_to_current\]\]/i);
-  if (currentMatch) {
-    cleaned = cleaned.replace(/\[\[reply_to_current\]\]/gi, " ");
-    hasTag = true;
-    if (currentMessageId?.trim()) {
-      replyToId = currentMessageId.trim();
-    }
-  }
-
-  const idMatch = cleaned.match(/\[\[reply_to:([^\]\n]+)\]\]/i);
-  if (idMatch?.[1]) {
-    cleaned = cleaned.replace(/\[\[reply_to:[^\]\n]+\]\]/gi, " ");
-    replyToId = idMatch[1].trim();
-    hasTag = true;
-  }
-
-  cleaned = cleaned
-    .replace(/[ \t]+/g, " ")
-    .replace(/[ \t]*\n[ \t]*/g, "\n")
-    .trim();
-  return { cleaned, replyToId, hasTag };
-}

src/auto-reply/reply/session-updates.ts

@@ -1,125 +0,0 @@
-import crypto from "node:crypto";
-
-import { buildWorkspaceSkillSnapshot } from "../../agents/skills.js";
-import type { ClawdisConfig } from "../../config/config.js";
-import { type SessionEntry, saveSessionStore } from "../../config/sessions.js";
-import { buildProviderSummary } from "../../infra/provider-summary.js";
-import { drainSystemEvents } from "../../infra/system-events.js";
-
-export async function prependSystemEvents(params: {
-  cfg: ClawdisConfig;
-  isMainSession: boolean;
-  isNewSession: boolean;
-  prefixedBodyBase: string;
-}): Promise<string> {
-  if (!params.isMainSession) return params.prefixedBodyBase;
-
-  const compactSystemEvent = (line: string): string | null => {
-    const trimmed = line.trim();
-    if (!trimmed) return null;
-    const lower = trimmed.toLowerCase();
-    if (lower.includes("reason periodic")) return null;
-    if (lower.includes("heartbeat")) return null;
-    if (trimmed.startsWith("Node:")) {
-      return trimmed.replace(/ · last input [^·]+/i, "").trim();
-    }
-    return trimmed;
-  };
-
-  const systemLines: string[] = [];
-  const queued = drainSystemEvents();
-  systemLines.push(
-    ...queued.map(compactSystemEvent).filter((v): v is string => Boolean(v)),
-  );
-  if (params.isNewSession) {
-    const summary = await buildProviderSummary(params.cfg);
-    if (summary.length > 0) systemLines.unshift(...summary);
-  }
-  if (systemLines.length === 0) return params.prefixedBodyBase;
-
-  const block = systemLines.map((l) => `System: ${l}`).join("\n");
-  return `${block}\n\n${params.prefixedBodyBase}`;
-}
-
-export async function ensureSkillSnapshot(params: {
-  sessionEntry?: SessionEntry;
-  sessionStore?: Record<string, SessionEntry>;
-  sessionKey?: string;
-  storePath?: string;
-  sessionId?: string;
-  isFirstTurnInSession: boolean;
-  workspaceDir: string;
-  cfg: ClawdisConfig;
-}): Promise<{
-  sessionEntry?: SessionEntry;
-  skillsSnapshot?: SessionEntry["skillsSnapshot"];
-  systemSent: boolean;
-}> {
-  const {
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    storePath,
-    sessionId,
-    isFirstTurnInSession,
-    workspaceDir,
-    cfg,
-  } = params;
-
-  let nextEntry = sessionEntry;
-  let systemSent = sessionEntry?.systemSent ?? false;
-
-  if (isFirstTurnInSession && sessionStore && sessionKey) {
-    const current = nextEntry ??
-      sessionStore[sessionKey] ?? {
-        sessionId: sessionId ?? crypto.randomUUID(),
-        updatedAt: Date.now(),
-      };
-    const skillSnapshot =
-      isFirstTurnInSession || !current.skillsSnapshot
-        ? buildWorkspaceSkillSnapshot(workspaceDir, { config: cfg })
-        : current.skillsSnapshot;
-    nextEntry = {
-      ...current,
-      sessionId: sessionId ?? current.sessionId ?? crypto.randomUUID(),
-      updatedAt: Date.now(),
-      systemSent: true,
-      skillsSnapshot: skillSnapshot,
-    };
-    sessionStore[sessionKey] = nextEntry;
-    if (storePath) {
-      await saveSessionStore(storePath, sessionStore);
-    }
-    systemSent = true;
-  }
-
-  const skillsSnapshot =
-    nextEntry?.skillsSnapshot ??
-    (isFirstTurnInSession
-      ? undefined
-      : buildWorkspaceSkillSnapshot(workspaceDir, { config: cfg }));
-  if (
-    skillsSnapshot &&
-    sessionStore &&
-    sessionKey &&
-    !isFirstTurnInSession &&
-    !nextEntry?.skillsSnapshot
-  ) {
-    const current = nextEntry ?? {
-      sessionId: sessionId ?? crypto.randomUUID(),
-      updatedAt: Date.now(),
-    };
-    nextEntry = {
-      ...current,
-      sessionId: sessionId ?? current.sessionId ?? crypto.randomUUID(),
-      updatedAt: Date.now(),
-      skillsSnapshot,
-    };
-    sessionStore[sessionKey] = nextEntry;
-    if (storePath) {
-      await saveSessionStore(storePath, sessionStore);
-    }
-  }
-
-  return { sessionEntry: nextEntry, skillsSnapshot, systemSent };
-}

src/auto-reply/reply/session.ts

@@ -1,208 +0,0 @@
-import crypto from "node:crypto";
-
-import type { ClawdisConfig } from "../../config/config.js";
-import {
-  buildGroupDisplayName,
-  DEFAULT_IDLE_MINUTES,
-  DEFAULT_RESET_TRIGGERS,
-  type GroupKeyResolution,
-  loadSessionStore,
-  resolveGroupSessionKey,
-  resolveSessionKey,
-  resolveStorePath,
-  type SessionEntry,
-  type SessionScope,
-  saveSessionStore,
-} from "../../config/sessions.js";
-import type { MsgContext, TemplateContext } from "../templating.js";
-import { stripMentions, stripStructuralPrefixes } from "./mentions.js";
-
-export type SessionInitResult = {
-  sessionCtx: TemplateContext;
-  sessionEntry: SessionEntry;
-  sessionStore: Record<string, SessionEntry>;
-  sessionKey: string;
-  sessionId: string;
-  isNewSession: boolean;
-  systemSent: boolean;
-  abortedLastRun: boolean;
-  storePath: string;
-  sessionScope: SessionScope;
-  groupResolution?: GroupKeyResolution;
-  isGroup: boolean;
-  bodyStripped?: string;
-  triggerBodyNormalized: string;
-};
-
-export async function initSessionState(params: {
-  ctx: MsgContext;
-  cfg: ClawdisConfig;
-}): Promise<SessionInitResult> {
-  const { ctx, cfg } = params;
-  const sessionCfg = cfg.session;
-  const mainKey = sessionCfg?.mainKey ?? "main";
-  const resetTriggers = sessionCfg?.resetTriggers?.length
-    ? sessionCfg.resetTriggers
-    : DEFAULT_RESET_TRIGGERS;
-  const idleMinutes = Math.max(
-    sessionCfg?.idleMinutes ?? DEFAULT_IDLE_MINUTES,
-    1,
-  );
-  const sessionScope = sessionCfg?.scope ?? "per-sender";
-  const storePath = resolveStorePath(sessionCfg?.store);
-
-  const sessionStore: Record<string, SessionEntry> =
-    loadSessionStore(storePath);
-  let sessionKey: string | undefined;
-  let sessionEntry: SessionEntry | undefined;
-
-  let sessionId: string | undefined;
-  let isNewSession = false;
-  let bodyStripped: string | undefined;
-  let systemSent = false;
-  let abortedLastRun = false;
-
-  let persistedThinking: string | undefined;
-  let persistedVerbose: string | undefined;
-  let persistedModelOverride: string | undefined;
-  let persistedProviderOverride: string | undefined;
-
-  const groupResolution = resolveGroupSessionKey(ctx) ?? undefined;
-  const isGroup =
-    ctx.ChatType?.trim().toLowerCase() === "group" || Boolean(groupResolution);
-  const triggerBodyNormalized = stripStructuralPrefixes(ctx.Body ?? "")
-    .trim()
-    .toLowerCase();
-
-  const rawBody = ctx.Body ?? "";
-  const trimmedBody = rawBody.trim();
-  // Timestamp/message prefixes (e.g. "[Dec 4 17:35] ") are added by the
-  // web inbox before we get here. They prevented reset triggers like "/new"
-  // from matching, so strip structural wrappers when checking for resets.
-  const strippedForReset = isGroup
-    ? stripMentions(triggerBodyNormalized, ctx, cfg)
-    : triggerBodyNormalized;
-  for (const trigger of resetTriggers) {
-    if (!trigger) continue;
-    if (trimmedBody === trigger || strippedForReset === trigger) {
-      isNewSession = true;
-      bodyStripped = "";
-      break;
-    }
-    const triggerPrefix = `${trigger} `;
-    if (
-      trimmedBody.startsWith(triggerPrefix) ||
-      strippedForReset.startsWith(triggerPrefix)
-    ) {
-      isNewSession = true;
-      bodyStripped = strippedForReset.slice(trigger.length).trimStart();
-      break;
-    }
-  }
-
-  sessionKey = resolveSessionKey(sessionScope, ctx, mainKey);
-  if (groupResolution?.legacyKey && groupResolution.legacyKey !== sessionKey) {
-    const legacyEntry = sessionStore[groupResolution.legacyKey];
-    if (legacyEntry && !sessionStore[sessionKey]) {
-      sessionStore[sessionKey] = legacyEntry;
-      delete sessionStore[groupResolution.legacyKey];
-    }
-  }
-  const entry = sessionStore[sessionKey];
-  const idleMs = idleMinutes * 60_000;
-  const freshEntry = entry && Date.now() - entry.updatedAt <= idleMs;
-
-  if (!isNewSession && freshEntry) {
-    sessionId = entry.sessionId;
-    systemSent = entry.systemSent ?? false;
-    abortedLastRun = entry.abortedLastRun ?? false;
-    persistedThinking = entry.thinkingLevel;
-    persistedVerbose = entry.verboseLevel;
-    persistedModelOverride = entry.modelOverride;
-    persistedProviderOverride = entry.providerOverride;
-  } else {
-    sessionId = crypto.randomUUID();
-    isNewSession = true;
-    systemSent = false;
-    abortedLastRun = false;
-  }
-
-  const baseEntry = !isNewSession && freshEntry ? entry : undefined;
-  sessionEntry = {
-    ...baseEntry,
-    sessionId,
-    updatedAt: Date.now(),
-    systemSent,
-    abortedLastRun,
-    // Persist previously stored thinking/verbose levels when present.
-    thinkingLevel: persistedThinking ?? baseEntry?.thinkingLevel,
-    verboseLevel: persistedVerbose ?? baseEntry?.verboseLevel,
-    modelOverride: persistedModelOverride ?? baseEntry?.modelOverride,
-    providerOverride: persistedProviderOverride ?? baseEntry?.providerOverride,
-    sendPolicy: baseEntry?.sendPolicy,
-    queueMode: baseEntry?.queueMode,
-    queueDebounceMs: baseEntry?.queueDebounceMs,
-    queueCap: baseEntry?.queueCap,
-    queueDrop: baseEntry?.queueDrop,
-    displayName: baseEntry?.displayName,
-    chatType: baseEntry?.chatType,
-    surface: baseEntry?.surface,
-    subject: baseEntry?.subject,
-    room: baseEntry?.room,
-    space: baseEntry?.space,
-  };
-  if (groupResolution?.surface) {
-    const surface = groupResolution.surface;
-    const subject = ctx.GroupSubject?.trim();
-    const space = ctx.GroupSpace?.trim();
-    const explicitRoom = ctx.GroupRoom?.trim();
-    const isRoomSurface = surface === "discord" || surface === "slack";
-    const nextRoom =
-      explicitRoom ??
-      (isRoomSurface && subject && subject.startsWith("#")
-        ? subject
-        : undefined);
-    const nextSubject = nextRoom ? undefined : subject;
-    sessionEntry.chatType = groupResolution.chatType ?? "group";
-    sessionEntry.surface = surface;
-    if (nextSubject) sessionEntry.subject = nextSubject;
-    if (nextRoom) sessionEntry.room = nextRoom;
-    if (space) sessionEntry.space = space;
-    sessionEntry.displayName = buildGroupDisplayName({
-      surface: sessionEntry.surface,
-      subject: sessionEntry.subject,
-      room: sessionEntry.room,
-      space: sessionEntry.space,
-      id: groupResolution.id,
-      key: sessionKey,
-    });
-  } else if (!sessionEntry.chatType) {
-    sessionEntry.chatType = "direct";
-  }
-  sessionStore[sessionKey] = sessionEntry;
-  await saveSessionStore(storePath, sessionStore);
-
-  const sessionCtx: TemplateContext = {
-    ...ctx,
-    BodyStripped: bodyStripped ?? ctx.Body,
-    SessionId: sessionId,
-    IsNewSession: isNewSession ? "true" : "false",
-  };
-
-  return {
-    sessionCtx,
-    sessionEntry,
-    sessionStore,
-    sessionKey,
-    sessionId: sessionId ?? crypto.randomUUID(),
-    isNewSession,
-    systemSent,
-    abortedLastRun,
-    storePath,
-    sessionScope,
-    groupResolution,
-    isGroup,
-    bodyStripped,
-    triggerBodyNormalized,
-  };
-}

src/auto-reply/reply/typing.ts

@@ -1,95 +0,0 @@
-export type TypingController = {
-  onReplyStart: () => Promise<void>;
-  startTypingLoop: () => Promise<void>;
-  startTypingOnText: (text?: string) => Promise<void>;
-  refreshTypingTtl: () => void;
-  cleanup: () => void;
-};
-
-export function createTypingController(params: {
-  onReplyStart?: () => Promise<void> | void;
-  typingIntervalSeconds?: number;
-  typingTtlMs?: number;
-  silentToken?: string;
-  log?: (message: string) => void;
-}): TypingController {
-  const {
-    onReplyStart,
-    typingIntervalSeconds = 6,
-    typingTtlMs = 2 * 60_000,
-    silentToken,
-    log,
-  } = params;
-  let started = false;
-  let typingTimer: NodeJS.Timeout | undefined;
-  let typingTtlTimer: NodeJS.Timeout | undefined;
-  const typingIntervalMs = typingIntervalSeconds * 1000;
-
-  const formatTypingTtl = (ms: number) => {
-    if (ms % 60_000 === 0) return `${ms / 60_000}m`;
-    return `${Math.round(ms / 1000)}s`;
-  };
-
-  const cleanup = () => {
-    if (typingTtlTimer) {
-      clearTimeout(typingTtlTimer);
-      typingTtlTimer = undefined;
-    }
-    if (typingTimer) {
-      clearInterval(typingTimer);
-      typingTimer = undefined;
-    }
-  };
-
-  const refreshTypingTtl = () => {
-    if (!typingIntervalMs || typingIntervalMs <= 0) return;
-    if (typingTtlMs <= 0) return;
-    if (typingTtlTimer) {
-      clearTimeout(typingTtlTimer);
-    }
-    typingTtlTimer = setTimeout(() => {
-      if (!typingTimer) return;
-      log?.(
-        `typing TTL reached (${formatTypingTtl(typingTtlMs)}); stopping typing indicator`,
-      );
-      cleanup();
-    }, typingTtlMs);
-  };
-
-  const triggerTyping = async () => {
-    await onReplyStart?.();
-  };
-
-  const ensureStart = async () => {
-    if (started) return;
-    started = true;
-    await triggerTyping();
-  };
-
-  const startTypingLoop = async () => {
-    if (!onReplyStart) return;
-    if (typingIntervalMs <= 0) return;
-    if (typingTimer) return;
-    await ensureStart();
-    refreshTypingTtl();
-    typingTimer = setInterval(() => {
-      void triggerTyping();
-    }, typingIntervalMs);
-  };
-
-  const startTypingOnText = async (text?: string) => {
-    const trimmed = text?.trim();
-    if (!trimmed) return;
-    if (silentToken && trimmed === silentToken) return;
-    refreshTypingTtl();
-    await startTypingLoop();
-  };
-
-  return {
-    onReplyStart: ensureStart,
-    startTypingLoop,
-    startTypingOnText,
-    refreshTypingTtl,
-    cleanup,
-  };
-}

src/auto-reply/status.ts

@@ -161,8 +161,6 @@ export function buildStatusMessage(args: StatusArgs): string {
   const thinkLevel = args.resolvedThink ?? args.agent?.thinkingDefault ?? "off";
   const verboseLevel =
     args.resolvedVerbose ?? args.agent?.verboseDefault ?? "off";
-  const elevatedLevel =
-    args.sessionEntry?.elevatedLevel ?? args.agent?.elevatedDefault ?? "on";
 
   const webLine = (() => {
     if (args.webLinked === false) {
@@ -202,7 +200,7 @@ export function buildStatusMessage(args: StatusArgs): string {
     contextTokens ?? null,
   )}${entry?.abortedLastRun ? " • last run aborted" : ""}`;
 
-  const optionsLine = `Options: thinking=${thinkLevel} | verbose=${verboseLevel} | elevated=${elevatedLevel} (set with /think <level>, /verbose on|off, /elevated on|off, /model <id>)`;
+  const optionsLine = `Options: thinking=${thinkLevel} | verbose=${verboseLevel} (set with /think <level>, /verbose on|off, /model <id>)`;
 
   const modelLabel = model ? `${resolved.provider}/${model}` : "unknown";
 

src/auto-reply/templating.ts

@@ -17,8 +17,6 @@ export type MsgContext = {
   GroupSpace?: string;
   GroupMembers?: string;
   SenderName?: string;
-  SenderUsername?: string;
-  SenderTag?: string;
   SenderE164?: string;
   Surface?: string;
   WasMentioned?: boolean;

src/auto-reply/thinking.ts

@@ -1,6 +1,5 @@
 export type ThinkLevel = "off" | "minimal" | "low" | "medium" | "high";
 export type VerboseLevel = "off" | "on";
-export type ElevatedLevel = "off" | "on";
 
 // Normalize user-provided thinking level strings to the canonical enum.
 export function normalizeThinkLevel(
@@ -40,14 +39,3 @@ export function normalizeVerboseLevel(
   if (["on", "full", "true", "yes", "1"].includes(key)) return "on";
   return undefined;
 }
-
-// Normalize elevated flags used to toggle elevated bash permissions.
-export function normalizeElevatedLevel(
-  raw?: string | null,
-): ElevatedLevel | undefined {
-  if (!raw) return undefined;
-  const key = raw.toLowerCase();
-  if (["off", "false", "no", "0"].includes(key)) return "off";
-  if (["on", "true", "yes", "1"].includes(key)) return "on";
-  return undefined;
-}

src/browser/bridge-server.ts

@@ -30,12 +30,16 @@ export async function startBrowserBridgeServer(params: {
   const state: BrowserServerState = {
     server: null as unknown as Server,
     port,
+    cdpPort: params.resolved.cdpPort,
+    running: null,
     resolved: params.resolved,
-    profiles: new Map(),
   };
 
   const ctx = createBrowserRouteContext({
     getState: () => state,
+    setRunning: (running) => {
+      state.running = running;
+    },
   });
   registerBrowserRoutes(app, ctx);
 

src/browser/chrome.ts

@@ -8,10 +8,7 @@ import { ensurePortAvailable } from "../infra/ports.js";
 import { createSubsystemLogger } from "../logging.js";
 import { CONFIG_DIR } from "../utils.js";
 import { normalizeCdpWsUrl } from "./cdp.js";
-import type {
-  ResolvedBrowserConfig,
-  ResolvedBrowserProfile,
-} from "./config.js";
+import type { ResolvedBrowserConfig } from "./config.js";
 import {
   DEFAULT_CLAWD_BROWSER_COLOR,
   DEFAULT_CLAWD_BROWSER_PROFILE_NAME,
@@ -119,10 +116,13 @@ function resolveBrowserExecutable(
   return null;
 }
 
-export function resolveClawdUserDataDir(
-  profileName = DEFAULT_CLAWD_BROWSER_PROFILE_NAME,
-) {
-  return path.join(CONFIG_DIR, "browser", profileName, "user-data");
+export function resolveClawdUserDataDir() {
+  return path.join(
+    CONFIG_DIR,
+    "browser",
+    DEFAULT_CLAWD_BROWSER_PROFILE_NAME,
+    "user-data",
+  );
 }
 
 function decoratedMarkerPath(userDataDir: string) {
@@ -255,9 +255,9 @@ function isProfileDecorated(
  */
 export function decorateClawdProfile(
   userDataDir: string,
-  opts?: { name?: string; color?: string },
+  opts?: { color?: string },
 ) {
-  const desiredName = opts?.name ?? DEFAULT_CLAWD_BROWSER_PROFILE_NAME;
+  const desiredName = DEFAULT_CLAWD_BROWSER_PROFILE_NAME;
   const desiredColor = (
     opts?.color ?? DEFAULT_CLAWD_BROWSER_COLOR
   ).toUpperCase();
@@ -433,14 +433,8 @@ export async function isChromeCdpReady(
 
 export async function launchClawdChrome(
   resolved: ResolvedBrowserConfig,
-  profile: ResolvedBrowserProfile,
 ): Promise<RunningChrome> {
-  if (!profile.cdpIsLoopback) {
-    throw new Error(
-      `Profile "${profile.name}" is remote; cannot launch local Chrome.`,
-    );
-  }
-  await ensurePortAvailable(profile.cdpPort);
+  await ensurePortAvailable(resolved.cdpPort);
 
   const exe = resolveBrowserExecutable(resolved);
   if (!exe) {
@@ -449,19 +443,19 @@ export async function launchClawdChrome(
     );
   }
 
-  const userDataDir = resolveClawdUserDataDir(profile.name);
+  const userDataDir = resolveClawdUserDataDir();
   fs.mkdirSync(userDataDir, { recursive: true });
 
   const needsDecorate = !isProfileDecorated(
     userDataDir,
-    profile.name,
-    (profile.color ?? DEFAULT_CLAWD_BROWSER_COLOR).toUpperCase(),
+    DEFAULT_CLAWD_BROWSER_PROFILE_NAME,
+    (resolved.color ?? DEFAULT_CLAWD_BROWSER_COLOR).toUpperCase(),
   );
 
   // First launch to create preference files if missing, then decorate and relaunch.
   const spawnOnce = () => {
     const args: string[] = [
-      `--remote-debugging-port=${profile.cdpPort}`,
+      `--remote-debugging-port=${resolved.cdpPort}`,
       `--user-data-dir=${userDataDir}`,
       "--no-first-run",
       "--no-default-browser-check",
@@ -527,11 +521,8 @@ export async function launchClawdChrome(
 
   if (needsDecorate) {
     try {
-      decorateClawdProfile(userDataDir, {
-        name: profile.name,
-        color: profile.color,
-      });
-      log.info(`🦞 clawd browser profile decorated (${profile.color})`);
+      decorateClawdProfile(userDataDir, { color: resolved.color });
+      log.info(`🦞 clawd browser profile decorated (${resolved.color})`);
     } catch (err) {
       log.warn(`clawd browser profile decoration failed: ${String(err)}`);
     }
@@ -541,31 +532,29 @@ export async function launchClawdChrome(
   // Wait for CDP to come up.
   const readyDeadline = Date.now() + 15_000;
   while (Date.now() < readyDeadline) {
-    if (await isChromeReachable(profile.cdpUrl, 500)) break;
+    if (await isChromeReachable(resolved.cdpUrl, 500)) break;
     await new Promise((r) => setTimeout(r, 200));
   }
 
-  if (!(await isChromeReachable(profile.cdpUrl, 500))) {
+  if (!(await isChromeReachable(resolved.cdpUrl, 500))) {
     try {
       proc.kill("SIGKILL");
     } catch {
       // ignore
     }
-    throw new Error(
-      `Failed to start Chrome CDP on port ${profile.cdpPort} for profile "${profile.name}".`,
-    );
+    throw new Error(`Failed to start Chrome CDP on port ${resolved.cdpPort}.`);
   }
 
   const pid = proc.pid ?? -1;
   log.info(
-    `🦞 clawd browser started (${exe.kind}) profile "${profile.name}" on 127.0.0.1:${profile.cdpPort} (pid ${pid})`,
+    `🦞 clawd browser started (${exe.kind}) on 127.0.0.1:${resolved.cdpPort} (pid ${pid})`,
   );
 
   return {
     pid,
     exe,
     userDataDir,
-    cdpPort: profile.cdpPort,
+    cdpPort: resolved.cdpPort,
     startedAt,
     proc,
   };