fix: align linux service PATH + tests (#1512) (thanks @robbyczgw-cla)

- Test Linux user directories included when HOME is set
- Test Linux user directories excluded when HOME is missing
- Test path ordering (extraDirs > user dirs > system dirs)
- Test platform-specific behavior (Linux vs macOS vs Windows)
- Test buildMinimalServicePath() with HOME in env

Covers getMinimalServicePathParts() and buildMinimalServicePath()
for all Linux user bin directory edge cases.

Test count: 7 → 16 (+9 tests)

AGENTS.md

@@ -7,7 +7,6 @@
 - Tests: colocated `*.test.ts`.
 - Docs: `docs/` (images, queue, Pi config). Built output lives in `dist/`.
 - Plugins/extensions: live under `extensions/*` (workspace packages). Keep plugin-only deps in the extension `package.json`; do not add them to the root `package.json` unless core uses them.
-- Plugins: install runs `npm install --omit=dev` in plugin dir; runtime deps must live in `dependencies`. Avoid `workspace:*` in `dependencies` (npm install breaks); put `clawdbot` in `devDependencies` or `peerDependencies` instead (runtime resolves `clawdbot/plugin-sdk` via jiti alias).
 - Installers served from `https://clawd.bot/*`: live in the sibling repo `../clawd.bot` (`public/install.sh`, `public/install-cli.sh`, `public/install.ps1`).
 - Messaging channels: always consider **all** built-in + extension channels when refactoring shared logic (routing, allowlists, pairing, command gating, onboarding, docs).
   - Core channel docs: `docs/channels/`
@@ -24,14 +23,13 @@
 - Docs content must be generic: no personal device names/hostnames/paths; use placeholders like `user@gateway-host` and “gateway host”.
 
 ## exe.dev VM ops (general)
-- Access: stable path is `ssh exe.dev` then `ssh vm-name` (assume SSH key already set).
+- Access: SSH to the VM directly: `ssh vm-name.exe.xyz` (or use exe.dev web terminal).
-- SSH flaky: use exe.dev web terminal or Shelley (web agent); keep a tmux session for long ops.
+- Updates: `sudo npm i -g clawdbot@latest` (global install needs root on `/usr/lib/node_modules`).
-- Update: `sudo npm i -g clawdbot@latest` (global install needs root on `/usr/lib/node_modules`).
+- Config: use `clawdbot config set ...`; set `gateway.mode=local` if unset.
-- Config: use `clawdbot config set ...`; ensure `gateway.mode=local` is set.
+- Restart: exe.dev often lacks systemd user bus; stop old gateway and run:
-- Discord: store raw token only (no `DISCORD_BOT_TOKEN=` prefix).
-- Restart: stop old gateway and run:
   `pkill -9 -f clawdbot-gateway || true; nohup clawdbot gateway run --bind loopback --port 18789 --force > /tmp/clawdbot-gateway.log 2>&1 &`
-- Verify: `clawdbot channels status --probe`, `ss -ltnp | rg 18789`, `tail -n 120 /tmp/clawdbot-gateway.log`.
+- Verify: `clawdbot --version`, `clawdbot health`, `ss -ltnp | rg 18789`.
+- SSH flaky: use exe.dev web terminal or Shelley (web agent) instead of CLI SSH.
 
 ## Build, Test, and Development Commands
 - Runtime baseline: Node **22+** (keep Node + Bun paths working).
@@ -130,10 +128,6 @@
 - **Multi-agent safety:** do **not** switch branches / check out a different branch unless explicitly requested.
 - **Multi-agent safety:** running multiple agents is OK as long as each agent has its own session.
 - **Multi-agent safety:** when you see unrecognized files, keep going; focus on your changes and commit only those.
-- Lint/format churn:
-  - If staged+unstaged diffs are formatting-only, auto-resolve without asking.
-  - If commit/push already requested, auto-stage and include formatting-only follow-ups in the same commit (or a tiny follow-up commit if needed), no extra confirmation.
-  - Only ask when changes are semantic (logic/data/behavior).
 - Lobster seam: use the shared CLI palette in `src/terminal/palette.ts` (no hardcoded colors); apply palette to onboarding/config prompts and other TTY UI output as needed.
 - **Multi-agent safety:** focus reports on your edits; avoid guard-rail disclaimers unless truly blocked; when multiple agents touch the same file, continue if safe; end with a brief “other files present” note only if relevant.
 - Bug investigations: read source code of relevant npm dependencies and all related local code before concluding; aim for high-confidence root cause.

CHANGELOG.md

@@ -6,27 +6,13 @@ Docs: https://docs.clawd.bot
 
 ### Changes
 - CLI: restart the gateway by default after `clawdbot update`; add `--no-restart` to skip it.
-- CLI: add live auth probes to `clawdbot models status` for per-profile verification.
 - Markdown: add per-channel table conversion (bullets for Signal/WhatsApp, code blocks elsewhere). (#1495) Thanks @odysseus0.
-- Docs: remove the misplaced Google Docs Editor entry from the showcase. (#1547) Thanks @aj47.
 
 ### Fixes
-- Voice wake: auto-save wake words on blur/submit across iOS/Android and align limits with macOS.
-- Tailscale: retry serve/funnel with sudo only for permission errors and keep original failure details. (#1551) Thanks @sweepies.
-- Discord: limit autoThread mention bypass to bot-owned threads; keep ack reactions mention-gated. (#1511) Thanks @pvoo.
-- Gateway: accept null optional fields in exec approval requests. (#1511) Thanks @pvoo.
 - TUI: forward unknown slash commands (for example, `/context`) to the Gateway.
-- TUI: include Gateway slash commands in autocomplete and `/help`.
-- CLI: skip usage lines in `clawdbot models status` when provider usage is unavailable.
-- CLI: suppress diagnostic session/run noise during auth probes.
-- CLI: hide auth probe timeout warnings from embedded runs.
-- CLI: render auth probe results as a table in `clawdbot models status`.
-- Linux: include env-configured user bin roots in systemd PATH and align PATH audits. (#1512) Thanks @robbyczgw-cla.
-- TUI: render Gateway slash-command replies as system output (for example, `/context`).
 - Media: preserve PNG alpha when possible; fall back to JPEG when still over size cap. (#1491) Thanks @robbyczgw-cla.
+- Gateway/Linux: include user + env-configured bin dirs in systemd PATH and align service audit checks. (#1512) Thanks @robbyczgw-cla.
 - Agents: treat plugin-only tool allowlists as opt-ins; keep core tools enabled. (#1467)
-- Exec approvals: persist allowlist entry ids to keep macOS allowlist rows stable. (#1521) Thanks @ngutman.
-- MS Teams (plugin): remove `.default` suffix from Graph scopes to avoid double-appending. (#1507) Thanks @Evizero.
 
 ## 2026.1.22
 

apps/android/app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
     applicationId = "com.clawdbot.android"
     minSdk = 31
     targetSdk = 36
-    versionCode = 202601230
+    versionCode = 202601210
-    versionName = "2026.1.23"
+    versionName = "2026.1.21"
   }
 
   buildTypes {

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

@@ -8,14 +8,10 @@ object WakeWords {
     return input.split(",").map { it.trim() }.filter { it.isNotEmpty() }
   }
 
-  fun parseIfChanged(input: String, current: List<String>): List<String>? {
-    val parsed = parseCommaSeparated(input)
-    return if (parsed == current) null else parsed
-  }
-
   fun sanitize(words: List<String>, defaults: List<String>): List<String> {
     val cleaned =
       words.map { it.trim() }.filter { it.isNotEmpty() }.take(maxWords).map { it.take(maxWordLength) }
     return cleaned.ifEmpty { defaults }
   }
 }
+

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

@@ -28,8 +28,6 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandLess
 import androidx.compose.material.icons.filled.ExpandMore
@@ -51,10 +49,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
@@ -63,7 +58,6 @@ import com.clawdbot.android.LocationMode
 import com.clawdbot.android.MainViewModel
 import com.clawdbot.android.NodeForegroundService
 import com.clawdbot.android.VoiceWakeMode
-import com.clawdbot.android.WakeWords
 
 @Composable
 fun SettingsSheet(viewModel: MainViewModel) {
@@ -92,8 +86,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
   val listState = rememberLazyListState()
   val (wakeWordsText, setWakeWordsText) = remember { mutableStateOf("") }
   val (advancedExpanded, setAdvancedExpanded) = remember { mutableStateOf(false) }
-  val focusManager = LocalFocusManager.current
-  var wakeWordsHadFocus by remember { mutableStateOf(false) }
   val deviceModel =
     remember {
       listOfNotNull(Build.MANUFACTURER, Build.MODEL)
@@ -112,12 +104,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
     }
 
   LaunchedEffect(wakeWords) { setWakeWordsText(wakeWords.joinToString(", ")) }
-  val commitWakeWords = {
-    val parsed = WakeWords.parseIfChanged(wakeWordsText, wakeWords)
-    if (parsed != null) {
-      viewModel.setWakeWords(parsed)
-    }
-  }
 
   val permissionLauncher =
     rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { perms ->
@@ -495,27 +481,25 @@ fun SettingsSheet(viewModel: MainViewModel) {
         value = wakeWordsText,
         onValueChange = setWakeWordsText,
         label = { Text("Wake Words (comma-separated)") },
-        modifier =
+        modifier = Modifier.fillMaxWidth(),
-          Modifier.fillMaxWidth().onFocusChanged { focusState ->
-            if (focusState.isFocused) {
-              wakeWordsHadFocus = true
-            } else if (wakeWordsHadFocus) {
-              wakeWordsHadFocus = false
-              commitWakeWords()
-            }
-          },
         singleLine = true,
-        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-        keyboardActions =
-          KeyboardActions(
-            onDone = {
-              commitWakeWords()
-              focusManager.clearFocus()
-            },
-          ),
       )
     }
-    item { Button(onClick = viewModel::resetWakeWordsDefaults) { Text("Reset defaults") } }
+    item {
+      Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+        Button(
+          onClick = {
+            val parsed = com.clawdbot.android.WakeWords.parseCommaSeparated(wakeWordsText)
+            viewModel.setWakeWords(parsed)
+          },
+          enabled = isConnected,
+        ) {
+          Text("Save + Sync")
+        }
+
+        Button(onClick = viewModel::resetWakeWordsDefaults) { Text("Reset defaults") }
+      }
+    }
     item {
       Text(
         if (isConnected) {

apps/android/app/src/test/java/com/clawdbot/android/WakeWordsTest.kt

@@ -1,7 +1,6 @@
 package com.clawdbot.android
 
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
 import org.junit.Test
 
 class WakeWordsTest {
@@ -33,18 +32,5 @@ class WakeWordsTest {
     assertEquals("w1", sanitized.first())
     assertEquals("w${WakeWords.maxWords}", sanitized.last())
   }
-
-  @Test
-  fun parseIfChangedSkipsWhenUnchanged() {
-    val current = listOf("clawd", "claude")
-    val parsed = WakeWords.parseIfChanged(" clawd , claude ", current)
-    assertNull(parsed)
-  }
-
-  @Test
-  fun parseIfChangedReturnsUpdatedList() {
-    val current = listOf("clawd")
-    val parsed = WakeWords.parseIfChanged(" clawd , jarvis ", current)
-    assertEquals(listOf("clawd", "jarvis"), parsed)
-  }
 }
+

apps/ios/Sources/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.23</string>
+	<string>2026.1.21</string>
 	<key>CFBundleVersion</key>
-	<string>20260123</string>
+	<string>20260121</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoadsInWebContent</key>

apps/ios/Sources/Settings/VoiceWakeWordsSettingsView.swift

@@ -1,10 +1,8 @@
 import SwiftUI
-import Combine
 
 struct VoiceWakeWordsSettingsView: View {
     @Environment(NodeAppModel.self) private var appModel
     @State private var triggerWords: [String] = VoiceWakePreferences.loadTriggerWords()
-    @FocusState private var focusedTriggerIndex: Int?
     @State private var syncTask: Task<Void, Never>?
 
     var body: some View {
@@ -14,10 +12,6 @@ struct VoiceWakeWordsSettingsView: View {
                     TextField("Wake word", text: self.binding(for: index))
                         .textInputAutocapitalization(.never)
                         .autocorrectionDisabled()
-                        .focused(self.$focusedTriggerIndex, equals: index)
-                        .onSubmit {
-                            self.commitTriggerWords()
-                        }
                 }
                 .onDelete(perform: self.removeWords)
 
@@ -45,18 +39,17 @@ struct VoiceWakeWordsSettingsView: View {
         .onAppear {
             if self.triggerWords.isEmpty {
                 self.triggerWords = VoiceWakePreferences.defaultTriggerWords
-                self.commitTriggerWords()
             }
         }
-        .onChange(of: self.focusedTriggerIndex) { oldValue, newValue in
+        .onChange(of: self.triggerWords) { _, newValue in
-            guard oldValue != nil, oldValue != newValue else { return }
+            // Keep local voice wake responsive even if the gateway isn't connected yet.
-            self.commitTriggerWords()
+            VoiceWakePreferences.saveTriggerWords(newValue)
-        }
+
-        .onReceive(NotificationCenter.default.publisher(for: UserDefaults.didChangeNotification)) { _ in
+            let snapshot = VoiceWakePreferences.sanitizeTriggerWords(newValue)
-            guard self.focusedTriggerIndex == nil else { return }
+            self.syncTask?.cancel()
-            let updated = VoiceWakePreferences.loadTriggerWords()
+            self.syncTask = Task { [snapshot, weak appModel = self.appModel] in
-            if updated != self.triggerWords {
+                try? await Task.sleep(nanoseconds: 650_000_000)
-                self.triggerWords = updated
+                await appModel?.setGlobalWakeWords(snapshot)
             }
         }
     }
@@ -70,7 +63,6 @@ struct VoiceWakeWordsSettingsView: View {
         if self.triggerWords.isEmpty {
             self.triggerWords = VoiceWakePreferences.defaultTriggerWords
         }
-        self.commitTriggerWords()
     }
 
     private func binding(for index: Int) -> Binding<String> {
@@ -84,15 +76,4 @@ struct VoiceWakeWordsSettingsView: View {
                 self.triggerWords[index] = newValue
             })
     }
-
-    private func commitTriggerWords() {
-        VoiceWakePreferences.saveTriggerWords(self.triggerWords)
-
-        let snapshot = VoiceWakePreferences.sanitizeTriggerWords(self.triggerWords)
-        self.syncTask?.cancel()
-        self.syncTask = Task { [snapshot, weak appModel = self.appModel] in
-            try? await Task.sleep(nanoseconds: 650_000_000)
-            await appModel?.setGlobalWakeWords(snapshot)
-        }
-    }
 }

apps/ios/Sources/Voice/VoiceWakePreferences.swift

@@ -6,8 +6,6 @@ enum VoiceWakePreferences {
 
     // Keep defaults aligned with the mac app.
     static let defaultTriggerWords: [String] = ["clawd", "claude"]
-    static let maxWords = 32
-    static let maxWordLength = 64
 
     static func decodeGatewayTriggers(from payloadJSON: String) -> [String]? {
         guard let data = payloadJSON.data(using: .utf8) else { return nil }
@@ -32,8 +30,6 @@ enum VoiceWakePreferences {
         let cleaned = words
             .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
             .filter { !$0.isEmpty }
-            .prefix(Self.maxWords)
-            .map { String($0.prefix(Self.maxWordLength)) }
         return cleaned.isEmpty ? Self.defaultTriggerWords : cleaned
     }
 

apps/ios/Tests/Info.plist

@@ -17,8 +17,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.23</string>
+	<string>2026.1.21</string>
 	<key>CFBundleVersion</key>
-	<string>20260123</string>
+	<string>20260121</string>
 </dict>
 </plist>

apps/ios/Tests/VoiceWakePreferencesTests.swift

@@ -11,18 +11,6 @@ import Testing
         #expect(VoiceWakePreferences.sanitizeTriggerWords(["", "  "]) == VoiceWakePreferences.defaultTriggerWords)
     }
 
-    @Test func sanitizeTriggerWordsLimitsWordLength() {
-        let long = String(repeating: "x", count: VoiceWakePreferences.maxWordLength + 5)
-        let cleaned = VoiceWakePreferences.sanitizeTriggerWords(["ok", long])
-        #expect(cleaned[1].count == VoiceWakePreferences.maxWordLength)
-    }
-
-    @Test func sanitizeTriggerWordsLimitsWordCount() {
-        let words = (1...VoiceWakePreferences.maxWords + 3).map { "w\($0)" }
-        let cleaned = VoiceWakePreferences.sanitizeTriggerWords(words)
-        #expect(cleaned.count == VoiceWakePreferences.maxWords)
-    }
-
     @Test func displayStringUsesSanitizedWords() {
         #expect(VoiceWakePreferences.displayString(for: ["", " "]) == "clawd, claude")
     }

apps/ios/project.yml

@@ -81,8 +81,8 @@ targets:
       properties:
         CFBundleDisplayName: Clawdbot
         CFBundleIconName: AppIcon
-        CFBundleShortVersionString: "2026.1.23"
+        CFBundleShortVersionString: "2026.1.21"
-        CFBundleVersion: "20260123"
+        CFBundleVersion: "20260121"
         UILaunchScreen: {}
         UIApplicationSceneManifest:
           UIApplicationSupportsMultipleScenes: false
@@ -130,5 +130,5 @@ targets:
       path: Tests/Info.plist
       properties:
         CFBundleDisplayName: ClawdbotTests
-        CFBundleShortVersionString: "2026.1.23"
+        CFBundleShortVersionString: "2026.1.21"
-        CFBundleVersion: "20260123"
+        CFBundleVersion: "20260121"

apps/macos/Sources/Clawdbot/Constants.swift

@@ -12,8 +12,6 @@ let voiceWakeTriggerChimeKey = "clawdbot.voiceWakeTriggerChime"
 let voiceWakeSendChimeKey = "clawdbot.voiceWakeSendChime"
 let showDockIconKey = "clawdbot.showDockIcon"
 let defaultVoiceWakeTriggers = ["clawd", "claude"]
-let voiceWakeMaxWords = 32
-let voiceWakeMaxWordLength = 64
 let voiceWakeMicKey = "clawdbot.voiceWakeMicID"
 let voiceWakeMicNameKey = "clawdbot.voiceWakeMicName"
 let voiceWakeLocaleKey = "clawdbot.voiceWakeLocaleID"

apps/macos/Sources/Clawdbot/ExecApprovals.swift

@@ -84,52 +84,11 @@ enum ExecApprovalDecision: String, Codable, Sendable {
     case deny
 }
 
-struct ExecAllowlistEntry: Codable, Hashable, Identifiable {
+struct ExecAllowlistEntry: Codable, Hashable {
-    var id: UUID
     var pattern: String
     var lastUsedAt: Double?
     var lastUsedCommand: String?
     var lastResolvedPath: String?
-
-    init(
-        id: UUID = UUID(),
-        pattern: String,
-        lastUsedAt: Double? = nil,
-        lastUsedCommand: String? = nil,
-        lastResolvedPath: String? = nil)
-    {
-        self.id = id
-        self.pattern = pattern
-        self.lastUsedAt = lastUsedAt
-        self.lastUsedCommand = lastUsedCommand
-        self.lastResolvedPath = lastResolvedPath
-    }
-
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case pattern
-        case lastUsedAt
-        case lastUsedCommand
-        case lastResolvedPath
-    }
-
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.id = try container.decodeIfPresent(UUID.self, forKey: .id) ?? UUID()
-        self.pattern = try container.decode(String.self, forKey: .pattern)
-        self.lastUsedAt = try container.decodeIfPresent(Double.self, forKey: .lastUsedAt)
-        self.lastUsedCommand = try container.decodeIfPresent(String.self, forKey: .lastUsedCommand)
-        self.lastResolvedPath = try container.decodeIfPresent(String.self, forKey: .lastResolvedPath)
-    }
-
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(self.id, forKey: .id)
-        try container.encode(self.pattern, forKey: .pattern)
-        try container.encodeIfPresent(self.lastUsedAt, forKey: .lastUsedAt)
-        try container.encodeIfPresent(self.lastUsedCommand, forKey: .lastUsedCommand)
-        try container.encodeIfPresent(self.lastResolvedPath, forKey: .lastResolvedPath)
-    }
 }
 
 struct ExecApprovalsDefaults: Codable {
@@ -336,7 +295,6 @@ enum ExecApprovalsStore {
         let allowlist = ((wildcardEntry.allowlist ?? []) + (agentEntry.allowlist ?? []))
             .map { entry in
                 ExecAllowlistEntry(
-                    id: entry.id,
                     pattern: entry.pattern.trimmingCharacters(in: .whitespacesAndNewlines),
                     lastUsedAt: entry.lastUsedAt,
                     lastUsedCommand: entry.lastUsedCommand,
@@ -421,7 +379,6 @@ enum ExecApprovalsStore {
             let allowlist = (entry.allowlist ?? []).map { item -> ExecAllowlistEntry in
                 guard item.pattern == pattern else { return item }
                 return ExecAllowlistEntry(
-                    id: item.id,
                     pattern: item.pattern,
                     lastUsedAt: Date().timeIntervalSince1970 * 1000,
                     lastUsedCommand: command,
@@ -441,7 +398,6 @@ enum ExecApprovalsStore {
             let cleaned = allowlist
                 .map { item in
                     ExecAllowlistEntry(
-                        id: item.id,
                         pattern: item.pattern.trimmingCharacters(in: .whitespacesAndNewlines),
                         lastUsedAt: item.lastUsedAt,
                         lastUsedCommand: item.lastUsedCommand,

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

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2026.1.23</string>
+    <string>2026.1.21</string>
     <key>CFBundleVersion</key>
-    <string>202601230</string>
+    <string>202601210</string>
     <key>CFBundleIconFile</key>
     <string>Clawdbot</string>
     <key>CFBundleURLTypes</key>

apps/macos/Sources/Clawdbot/SystemRunSettingsView.swift

@@ -123,12 +123,12 @@ struct SystemRunSettingsView: View {
                         .foregroundStyle(.secondary)
                 } else {
                     VStack(alignment: .leading, spacing: 8) {
-                        ForEach(self.model.entries, id: \.id) { entry in
+                        ForEach(Array(self.model.entries.enumerated()), id: \.offset) { index, _ in
                             ExecAllowlistRow(
                                 entry: Binding(
-                                    get: { self.model.entry(for: entry.id) ?? entry },
+                                    get: { self.model.entries[index] },
-                                    set: { self.model.updateEntry($0, id: entry.id) }),
+                                    set: { self.model.updateEntry($0, at: index) }),
-                                onRemove: { self.model.removeEntry(id: entry.id) })
+                                onRemove: { self.model.removeEntry(at: index) })
                         }
                     }
                 }
@@ -373,24 +373,20 @@ final class ExecApprovalsSettingsModel {
         ExecApprovalsStore.updateAllowlist(agentId: self.selectedAgentId, allowlist: self.entries)
     }
 
-    func updateEntry(_ entry: ExecAllowlistEntry, id: UUID) {
+    func updateEntry(_ entry: ExecAllowlistEntry, at index: Int) {
         guard !self.isDefaultsScope else { return }
-        guard let index = self.entries.firstIndex(where: { $0.id == id }) else { return }
+        guard self.entries.indices.contains(index) else { return }
         self.entries[index] = entry
         ExecApprovalsStore.updateAllowlist(agentId: self.selectedAgentId, allowlist: self.entries)
     }
 
-    func removeEntry(id: UUID) {
+    func removeEntry(at index: Int) {
         guard !self.isDefaultsScope else { return }
-        guard let index = self.entries.firstIndex(where: { $0.id == id }) else { return }
+        guard self.entries.indices.contains(index) else { return }
         self.entries.remove(at: index)
         ExecApprovalsStore.updateAllowlist(agentId: self.selectedAgentId, allowlist: self.entries)
     }
 
-    func entry(for id: UUID) -> ExecAllowlistEntry? {
-        self.entries.first(where: { $0.id == id })
-    }
-
     func refreshSkillBins(force: Bool = false) async {
         guard self.autoAllowSkills else {
             self.skillBins = []

apps/macos/Sources/Clawdbot/VoiceWakeHelpers.swift

@@ -4,8 +4,6 @@ func sanitizeVoiceWakeTriggers(_ words: [String]) -> [String] {
     let cleaned = words
         .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
         .filter { !$0.isEmpty }
-        .prefix(voiceWakeMaxWords)
-        .map { String($0.prefix(voiceWakeMaxWordLength)) }
     return cleaned.isEmpty ? defaultVoiceWakeTriggers : cleaned
 }
 

apps/macos/Sources/Clawdbot/VoiceWakeSettings.swift

@@ -21,7 +21,6 @@ struct VoiceWakeSettings: View {
     @State private var micObserver = AudioInputDeviceObserver()
     @State private var micRefreshTask: Task<Void, Never>?
     @State private var availableLocales: [Locale] = []
-    @State private var triggerEntries: [TriggerEntry] = []
     private let fieldLabelWidth: CGFloat = 140
     private let controlWidth: CGFloat = 240
     private let isPreview = ProcessInfo.processInfo.isPreview
@@ -32,9 +31,9 @@ struct VoiceWakeSettings: View {
         var id: String { self.uid }
     }
 
-    private struct TriggerEntry: Identifiable {
+    private struct IndexedWord: Identifiable {
-        let id: UUID
+        let id: Int
-        var value: String
+        let value: String
     }
 
     private var voiceWakeBinding: Binding<Bool> {
@@ -106,7 +105,6 @@ struct VoiceWakeSettings: View {
         .onAppear {
             guard !self.isPreview else { return }
             self.startMicObserver()
-            self.loadTriggerEntries()
         }
         .onChange(of: self.state.voiceWakeMicID) { _, _ in
             guard !self.isPreview else { return }
@@ -124,10 +122,8 @@ struct VoiceWakeSettings: View {
                 self.micRefreshTask = nil
                 Task { await self.meter.stop() }
                 self.micObserver.stop()
-                self.syncTriggerEntriesToState()
             } else {
                 self.startMicObserver()
-                self.loadTriggerEntries()
             }
         }
         .onDisappear {
@@ -140,16 +136,11 @@ struct VoiceWakeSettings: View {
             self.micRefreshTask = nil
             self.micObserver.stop()
             Task { await self.meter.stop() }
-            self.syncTriggerEntriesToState()
         }
     }
 
-    private func loadTriggerEntries() {
+    private var indexedWords: [IndexedWord] {
-        self.triggerEntries = self.state.swabbleTriggerWords.map { TriggerEntry(id: UUID(), value: $0) }
+        self.state.swabbleTriggerWords.enumerated().map { IndexedWord(id: $0.offset, value: $0.element) }
-    }
-
-    private func syncTriggerEntriesToState() {
-        self.state.swabbleTriggerWords = self.triggerEntries.map(\.value)
     }
 
     private var triggerTable: some View {
@@ -163,42 +154,29 @@ struct VoiceWakeSettings: View {
                 } label: {
                     Label("Add word", systemImage: "plus")
                 }
-                .disabled(self.triggerEntries
+                .disabled(self.state.swabbleTriggerWords
-                    .contains(where: { $0.value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }))
+                    .contains(where: { $0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }))
 
-                Button("Reset defaults") {
+                Button("Reset defaults") { self.state.swabbleTriggerWords = defaultVoiceWakeTriggers }
-                    self.triggerEntries = defaultVoiceWakeTriggers.map { TriggerEntry(id: UUID(), value: $0) }
-                    self.syncTriggerEntriesToState()
-                }
             }
 
-            VStack(spacing: 0) {
+            Table(self.indexedWords) {
-                ForEach(self.$triggerEntries) { $entry in
+                TableColumn("Word") { row in
-                    HStack(spacing: 8) {
+                    TextField("Wake word", text: self.binding(for: row.id))
-                        TextField("Wake word", text: $entry.value)
+                        .textFieldStyle(.roundedBorder)
-                            .textFieldStyle(.roundedBorder)
-                            .onSubmit {
-                                self.syncTriggerEntriesToState()
-                            }
-
-                        Button {
-                            self.removeWord(id: entry.id)
-                        } label: {
-                            Image(systemName: "trash")
-                        }
-                        .buttonStyle(.borderless)
-                        .help("Remove trigger word")
-                        .frame(width: 24)
-                    }
-                    .padding(8)
-
-                    if entry.id != self.triggerEntries.last?.id {
-                        Divider()
-                    }
                 }
+                TableColumn("") { row in
+                    Button {
+                        self.removeWord(at: row.id)
+                    } label: {
+                        Image(systemName: "trash")
+                    }
+                    .buttonStyle(.borderless)
+                    .help("Remove trigger word")
+                }
+                .width(36)
             }
-            .frame(maxWidth: .infinity, minHeight: 180, alignment: .topLeading)
+            .frame(minHeight: 180)
-            .background(Color(nsColor: .textBackgroundColor))
             .clipShape(RoundedRectangle(cornerRadius: 6))
             .overlay(
                 RoundedRectangle(cornerRadius: 6)
@@ -233,12 +211,24 @@ struct VoiceWakeSettings: View {
     }
 
     private func addWord() {
-        self.triggerEntries.append(TriggerEntry(id: UUID(), value: ""))
+        self.state.swabbleTriggerWords.append("")
     }
 
-    private func removeWord(id: UUID) {
+    private func removeWord(at index: Int) {
-        self.triggerEntries.removeAll { $0.id == id }
+        guard self.state.swabbleTriggerWords.indices.contains(index) else { return }
-        self.syncTriggerEntriesToState()
+        self.state.swabbleTriggerWords.remove(at: index)
+    }
+
+    private func binding(for index: Int) -> Binding<String> {
+        Binding(
+            get: {
+                guard self.state.swabbleTriggerWords.indices.contains(index) else { return "" }
+                return self.state.swabbleTriggerWords[index]
+            },
+            set: { newValue in
+                guard self.state.swabbleTriggerWords.indices.contains(index) else { return }
+                self.state.swabbleTriggerWords[index] = newValue
+            })
     }
 
     private func toggleTest() {
@@ -648,14 +638,13 @@ extension VoiceWakeSettings {
         state.voicePushToTalkEnabled = true
         state.swabbleTriggerWords = ["Claude", "Hey"]
 
-        var view = VoiceWakeSettings(state: state, isActive: true)
+        let view = VoiceWakeSettings(state: state, isActive: true)
         view.availableMics = [AudioInputDevice(uid: "mic-1", name: "Built-in")]
         view.availableLocales = [Locale(identifier: "en_US")]
         view.meterLevel = 0.42
         view.meterError = "No input"
         view.testState = .detected("ok")
         view.isTesting = true
-        view.triggerEntries = [TriggerEntry(id: UUID(), value: "Claude")]
 
         _ = view.body
         _ = view.localePicker
@@ -665,9 +654,8 @@ extension VoiceWakeSettings {
         _ = view.chimeSection
 
         view.addWord()
-        if let entryId = view.triggerEntries.first?.id {
+        _ = view.binding(for: 0).wrappedValue
-            view.removeWord(id: entryId)
+        view.removeWord(at: 0)
-        }
     }
 }
 #endif

apps/macos/Tests/ClawdbotIPCTests/VoiceWakeHelpersTests.swift

@@ -12,18 +12,6 @@ struct VoiceWakeHelpersTests {
         #expect(cleaned == defaultVoiceWakeTriggers)
     }
 
-    @Test func sanitizeTriggersLimitsWordLength() {
-        let long = String(repeating: "x", count: voiceWakeMaxWordLength + 5)
-        let cleaned = sanitizeVoiceWakeTriggers(["ok", long])
-        #expect(cleaned[1].count == voiceWakeMaxWordLength)
-    }
-
-    @Test func sanitizeTriggersLimitsWordCount() {
-        let words = (1...voiceWakeMaxWords + 3).map { "w\($0)" }
-        let cleaned = sanitizeVoiceWakeTriggers(words)
-        #expect(cleaned.count == voiceWakeMaxWords)
-    }
-
     @Test func normalizeLocaleStripsCollation() {
         #expect(normalizeLocaleIdentifier("en_US@collation=phonebook") == "en_US")
     }

docs/cli/index.md

@@ -700,15 +700,8 @@ Options:
 - `--json`
 - `--plain`
 - `--check` (exit 1=expired/missing, 2=expiring)
-- `--probe` (live probe of configured auth profiles)
-- `--probe-provider <name>`
-- `--probe-profile <id>` (repeat or comma-separated)
-- `--probe-timeout <ms>`
-- `--probe-concurrency <n>`
-- `--probe-max-tokens <n>`
 
 Always includes the auth overview and OAuth expiry status for profiles in the auth store.
-`--probe` runs live requests (may consume tokens and trigger rate limits).
 
 ### `models set <model>`
 Set `agents.defaults.model.primary`.

docs/cli/models.md

@@ -25,26 +25,12 @@ clawdbot models scan
 `clawdbot models status` shows the resolved default/fallbacks plus an auth overview.
 When provider usage snapshots are available, the OAuth/token status section includes
 provider usage headers.
-Add `--probe` to run live auth probes against each configured provider profile.
-Probes are real requests (may consume tokens and trigger rate limits).
 
 Notes:
 - `models set <model-or-alias>` accepts `provider/model` or an alias.
 - Model refs are parsed by splitting on the **first** `/`. If the model ID includes `/` (OpenRouter-style), include the provider prefix (example: `openrouter/moonshotai/kimi-k2`).
 - If you omit the provider, Clawdbot treats the input as an alias or a model for the **default provider** (only works when there is no `/` in the model ID).
 
-### `models status`
-Options:
-- `--json`
-- `--plain`
-- `--check` (exit 1=expired/missing, 2=expiring)
-- `--probe` (live probe of configured auth profiles)
-- `--probe-provider <name>` (probe one provider)
-- `--probe-profile <id>` (repeat or comma-separated profile ids)
-- `--probe-timeout <ms>`
-- `--probe-concurrency <n>`
-- `--probe-max-tokens <n>`
-
 ## Aliases + fallbacks
 
 ```bash

docs/help/troubleshooting.md

@@ -43,14 +43,6 @@ Almost always a Node/npm PATH issue. Start here:
 - [Gateway troubleshooting](/gateway/troubleshooting)
 - [Control UI](/web/control-ui#insecure-http)
 
-### `docs.clawd.bot` shows an SSL error (Comcast/Xfinity)
-
-Some Comcast/Xfinity connections block `docs.clawd.bot` via Xfinity Advanced Security.
-Disable Advanced Security or add `docs.clawd.bot` to the allowlist, then retry.
-
-- Xfinity Advanced Security help: https://www.xfinity.com/support/articles/using-xfinity-xfi-advanced-security
-- Quick sanity checks: try a mobile hotspot or VPN to confirm it’s ISP-level filtering
-
 ### Service says running, but RPC probe fails
 
 - [Gateway troubleshooting](/gateway/troubleshooting)

docs/platforms/mac/release.md

@@ -30,17 +30,17 @@ Notes:
 # From repo root; set release IDs so Sparkle feed is enabled.
 # APP_BUILD must be numeric + monotonic for Sparkle compare.
 BUNDLE_ID=com.clawdbot.mac \
-APP_VERSION=2026.1.23 \
+APP_VERSION=2026.1.21 \
 APP_BUILD="$(git rev-list --count HEAD)" \
 BUILD_CONFIG=release \
 SIGN_IDENTITY="Developer ID Application: <Developer Name> (<TEAMID>)" \
 scripts/package-mac-app.sh
 
 # Zip for distribution (includes resource forks for Sparkle delta support)
-ditto -c -k --sequesterRsrc --keepParent dist/Clawdbot.app dist/Clawdbot-2026.1.23.zip
+ditto -c -k --sequesterRsrc --keepParent dist/Clawdbot.app dist/Clawdbot-2026.1.21.zip
 
 # Optional: also build a styled DMG for humans (drag to /Applications)
-scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.23.dmg
+scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.21.dmg
 
 # Recommended: build + notarize/staple zip + DMG
 # First, create a keychain profile once:
@@ -48,26 +48,26 @@ scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.23.dmg
 #     --apple-id "<apple-id>" --team-id "<team-id>" --password "<app-specific-password>"
 NOTARIZE=1 NOTARYTOOL_PROFILE=clawdbot-notary \
 BUNDLE_ID=com.clawdbot.mac \
-APP_VERSION=2026.1.23 \
+APP_VERSION=2026.1.21 \
 APP_BUILD="$(git rev-list --count HEAD)" \
 BUILD_CONFIG=release \
 SIGN_IDENTITY="Developer ID Application: <Developer Name> (<TEAMID>)" \
 scripts/package-mac-dist.sh
 
 # Optional: ship dSYM alongside the release
-ditto -c -k --keepParent apps/macos/.build/release/Clawdbot.app.dSYM dist/Clawdbot-2026.1.23.dSYM.zip
+ditto -c -k --keepParent apps/macos/.build/release/Clawdbot.app.dSYM dist/Clawdbot-2026.1.21.dSYM.zip
 ```
 
 ## Appcast entry
 Use the release note generator so Sparkle renders formatted HTML notes:
 ```bash
-SPARKLE_PRIVATE_KEY_FILE=/path/to/ed25519-private-key scripts/make_appcast.sh dist/Clawdbot-2026.1.23.zip https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml
+SPARKLE_PRIVATE_KEY_FILE=/path/to/ed25519-private-key scripts/make_appcast.sh dist/Clawdbot-2026.1.21.zip https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml
 ```
 Generates HTML release notes from `CHANGELOG.md` (via [`scripts/changelog-to-html.sh`](https://github.com/clawdbot/clawdbot/blob/main/scripts/changelog-to-html.sh)) and embeds them in the appcast entry.
 Commit the updated `appcast.xml` alongside the release assets (zip + dSYM) when publishing.
 
 ## Publish & verify
-- Upload `Clawdbot-2026.1.23.zip` (and `Clawdbot-2026.1.23.dSYM.zip`) to the GitHub release for tag `v2026.1.23`.
+- Upload `Clawdbot-2026.1.21.zip` (and `Clawdbot-2026.1.21.dSYM.zip`) to the GitHub release for tag `v2026.1.21`.
 - Ensure the raw appcast URL matches the baked feed: `https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml`.
 - Sanity checks:
   - `curl -I https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml` returns 200.

docs/start/faq.md

@@ -324,7 +324,6 @@ brew install <formula>
 ```
 
 If you run Clawdbot via systemd, ensure the service PATH includes `/home/linuxbrew/.linuxbrew/bin` (or your brew prefix) so `brew`-installed tools resolve in non‑login shells.
-Recent builds also prepend common user bin dirs on Linux systemd services (for example `~/.local/bin`, `~/.npm-global/bin`, `~/.local/share/pnpm`, `~/.bun/bin`) and honor `PNPM_HOME`, `NPM_CONFIG_PREFIX`, `BUN_INSTALL`, `VOLTA_HOME`, `ASDF_DATA_DIR`, `NVM_DIR`, and `FNM_DIR` when set.
 
 ### Can I switch between npm and git installs later?
 

docs/start/showcase.md

@@ -331,6 +331,12 @@ Full setup walkthrough (28m) by VelvetShark.
   Multi-lingual audio transcription via OpenRouter (Gemini, etc). Available on ClawdHub.
 </Card>
 
+<Card title="Google Docs Editor" icon="file-word">
+  **Community** • `docs` `editing` `skill`
+  
+  Rich-text Google Docs editing skill. Built rapidly with Claude Code.
+</Card>
+
 </CardGroup>
 
 ## 🏗️ Infrastructure & Deployment

docs/tools/exec-approvals.md

@@ -54,7 +54,6 @@ Example schema:
       "autoAllowSkills": true,
       "allowlist": [
         {
-          "id": "B0C8C0B3-2C2D-4F8A-9A3C-5A4B3C2D1E0F",
           "pattern": "~/Projects/**/bin/rg",
           "lastUsedAt": 1737150000000,
           "lastUsedCommand": "rg -n TODO",
@@ -97,7 +96,6 @@ Examples:
 - `/opt/homebrew/bin/rg`
 
 Each allowlist entry tracks:
-- **id** stable UUID used for UI identity (optional)
 - **last used** timestamp
 - **last used command**
 - **last resolved path**

docs/tui.md

@@ -88,8 +88,6 @@ Session lifecycle:
 - `/settings`
 - `/exit`
 
-Other Gateway slash commands (for example, `/context`) are forwarded to the Gateway and shown as system output. See [Slash commands](/tools/slash-commands).
-
 ## Local shell commands
 - Prefix a line with `!` to run a local shell command on the TUI host.
 - The TUI prompts once per session to allow local execution; declining keeps `!` disabled for the session.

extensions/bluebubbles/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/bluebubbles",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot BlueBubbles channel plugin",
   "clawdbot": {

extensions/bluebubbles/src/monitor.test.ts

@@ -2,7 +2,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { IncomingMessage, ServerResponse } from "node:http";
 import { EventEmitter } from "node:events";
 
-import { removeAckReactionAfterReply, shouldAckReaction } from "clawdbot/plugin-sdk";
 import type { ClawdbotConfig, PluginRuntime } from "clawdbot/plugin-sdk";
 import {
   handleBlueBubblesWebhookRequest,
@@ -129,7 +128,6 @@ function createMockRuntime(): PluginRuntime {
       session: {
         resolveStorePath: mockResolveStorePath as unknown as PluginRuntime["channel"]["session"]["resolveStorePath"],
         readSessionUpdatedAt: mockReadSessionUpdatedAt as unknown as PluginRuntime["channel"]["session"]["readSessionUpdatedAt"],
-        recordInboundSession: vi.fn() as unknown as PluginRuntime["channel"]["session"]["recordInboundSession"],
         recordSessionMetaFromInbound: vi.fn() as unknown as PluginRuntime["channel"]["session"]["recordSessionMetaFromInbound"],
         updateLastRoute: vi.fn() as unknown as PluginRuntime["channel"]["session"]["updateLastRoute"],
       },
@@ -137,10 +135,6 @@ function createMockRuntime(): PluginRuntime {
         buildMentionRegexes: mockBuildMentionRegexes as unknown as PluginRuntime["channel"]["mentions"]["buildMentionRegexes"],
         matchesMentionPatterns: mockMatchesMentionPatterns as unknown as PluginRuntime["channel"]["mentions"]["matchesMentionPatterns"],
       },
-      reactions: {
-        shouldAckReaction,
-        removeAckReactionAfterReply,
-      },
       groups: {
         resolveGroupPolicy: mockResolveGroupPolicy as unknown as PluginRuntime["channel"]["groups"]["resolveGroupPolicy"],
         resolveRequireMention: mockResolveRequireMention as unknown as PluginRuntime["channel"]["groups"]["resolveRequireMention"],

extensions/bluebubbles/src/monitor.ts

@@ -1,13 +1,7 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
 
 import type { ClawdbotConfig } from "clawdbot/plugin-sdk";
-import {
+import { resolveAckReaction } from "clawdbot/plugin-sdk";
-  logAckFailure,
-  logInboundDrop,
-  logTypingFailure,
-  resolveAckReaction,
-  resolveControlCommandGate,
-} from "clawdbot/plugin-sdk";
 import { markBlueBubblesChatRead, sendBlueBubblesTyping } from "./chat.js";
 import { resolveChatGuidForTarget, sendMessageBlueBubbles } from "./send.js";
 import { downloadBlueBubblesAttachment } from "./attachments.js";
@@ -1352,25 +1346,23 @@ async function processMessage(
         })
       : false;
   const dmAuthorized = dmPolicy === "open" || ownerAllowedForCommands;
-  const commandGate = resolveControlCommandGate({
+  const commandAuthorized = isGroup
-    useAccessGroups,
+    ? core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
-    authorizers: [
+        useAccessGroups,
-      { configured: effectiveAllowFrom.length > 0, allowed: ownerAllowedForCommands },
+        authorizers: [
-      { configured: effectiveGroupAllowFrom.length > 0, allowed: groupAllowedForCommands },
+          { configured: effectiveAllowFrom.length > 0, allowed: ownerAllowedForCommands },
-    ],
+          { configured: effectiveGroupAllowFrom.length > 0, allowed: groupAllowedForCommands },
-    allowTextCommands: true,
+        ],
-    hasControlCommand: hasControlCmd,
+      })
-  });
+    : dmAuthorized;
-  const commandAuthorized = isGroup ? commandGate.commandAuthorized : dmAuthorized;
 
   // Block control commands from unauthorized senders in groups
-  if (isGroup && commandGate.shouldBlock) {
+  if (isGroup && hasControlCmd && !commandAuthorized) {
-    logInboundDrop({
+    logVerbose(
-      log: (msg) => logVerbose(core, runtime, msg),
+      core,
-      channel: "bluebubbles",
+      runtime,
-      reason: "control command (unauthorized)",
+      `bluebubbles: drop control command from unauthorized sender ${message.senderId}`,
-      target: message.senderId,
+    );
-    });
     return;
   }
 
@@ -1529,20 +1521,19 @@ async function processMessage(
     core,
     runtime,
   });
-  const shouldAckReaction = () =>
+  const shouldAckReaction = () => {
-    Boolean(
+    if (!ackReactionValue) return false;
-      ackReactionValue &&
+    if (ackReactionScope === "all") return true;
-        core.channel.reactions.shouldAckReaction({
+    if (ackReactionScope === "direct") return !isGroup;
-          scope: ackReactionScope,
+    if (ackReactionScope === "group-all") return isGroup;
-          isDirect: !isGroup,
+    if (ackReactionScope === "group-mentions") {
-          isGroup,
+      if (!isGroup) return false;
-          isMentionableGroup: isGroup,
+      if (!requireMention) return false;
-          requireMention: Boolean(requireMention),
+      if (!canDetectMention) return false;
-          canDetectMention,
+      return effectiveWasMentioned;
-          effectiveWasMentioned,
+    }
-          shouldBypassMention,
+    return false;
-        }),
+  };
-    );
   const ackMessageId = message.messageId?.trim() || "";
   const ackReactionPromise =
     shouldAckReaction() && ackMessageId && chatGuidForActions && ackReactionValue
@@ -1758,27 +1749,29 @@ async function processMessage(
       },
     });
   } finally {
-    if (sentMessage && chatGuidForActions && ackMessageId) {
+    if (
-      core.channel.reactions.removeAckReactionAfterReply({
+      removeAckAfterReply &&
-        removeAfterReply: removeAckAfterReply,
+      sentMessage &&
-        ackReactionPromise,
+      ackReactionPromise &&
-        ackReactionValue: ackReactionValue ?? null,
+      ackReactionValue &&
-        remove: () =>
+      chatGuidForActions &&
-          sendBlueBubblesReaction({
+      ackMessageId
-            chatGuid: chatGuidForActions,
+    ) {
-            messageGuid: ackMessageId,
+      void ackReactionPromise.then((didAck) => {
-            emoji: ackReactionValue ?? "",
+        if (!didAck) return;
-            remove: true,
+        sendBlueBubblesReaction({
-            opts: { cfg: config, accountId: account.accountId },
+          chatGuid: chatGuidForActions,
-          }),
+          messageGuid: ackMessageId,
-        onError: (err) => {
+          emoji: ackReactionValue,
-          logAckFailure({
+          remove: true,
-            log: (msg) => logVerbose(core, runtime, msg),
+          opts: { cfg: config, accountId: account.accountId },
-            channel: "bluebubbles",
+        }).catch((err) => {
-            target: `${chatGuidForActions}/${ackMessageId}`,
+          logVerbose(
-            error: err,
+            core,
-          });
+            runtime,
-        },
+            `ack reaction removal failed chatGuid=${chatGuidForActions} msg=${ackMessageId}: ${String(err)}`,
+          );
+        });
       });
     }
     if (chatGuidForActions && baseUrl && password && !sentMessage) {
@@ -1787,13 +1780,7 @@ async function processMessage(
         cfg: config,
         accountId: account.accountId,
       }).catch((err) => {
-        logTypingFailure({
+        logVerbose(core, runtime, `typing stop (no reply) failed: ${String(err)}`);
-          log: (msg) => logVerbose(core, runtime, msg),
-          channel: "bluebubbles",
-          action: "stop",
-          target: chatGuidForActions,
-          error: err,
-        });
       });
     }
   }

extensions/copilot-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/copilot-proxy",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Copilot Proxy provider plugin",
   "clawdbot": {

extensions/diagnostics-otel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/diagnostics-otel",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot diagnostics OpenTelemetry exporter",
   "clawdbot": {

extensions/discord/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/discord",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Discord channel plugin",
   "clawdbot": {

extensions/google-antigravity-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/google-antigravity-auth",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Google Antigravity OAuth provider plugin",
   "clawdbot": {

extensions/google-gemini-cli-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/google-gemini-cli-auth",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Gemini CLI OAuth provider plugin",
   "clawdbot": {

extensions/imessage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/imessage",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot iMessage channel plugin",
   "clawdbot": {

extensions/lobster/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/lobster",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Lobster workflow tool plugin (typed pipelines + resumable approvals)",
   "clawdbot": {

extensions/matrix/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 2026.1.23
-
-### Changes
-- Version alignment with core Clawdbot release numbers.
-
 ## 2026.1.22
 
 ### Changes

extensions/matrix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/matrix",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Matrix channel plugin",
   "clawdbot": {

extensions/matrix/src/matrix/monitor/handler.ts

@@ -1,12 +1,7 @@
 import type { LocationMessageEventContent, MatrixClient } from "matrix-bot-sdk";
 
 import {
-  createReplyPrefixContext,
-  createTypingCallbacks,
   formatAllowlistMatchMeta,
-  logInboundDrop,
-  logTypingFailure,
-  resolveControlCommandGate,
   type RuntimeEnv,
 } from "clawdbot/plugin-sdk";
 import type { CoreConfig, ReplyToMode } from "../../types.js";
@@ -381,25 +376,21 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
               userName: senderName,
             })
           : false;
-      const hasControlCommandInMessage = core.channel.text.hasControlCommand(bodyText, cfg);
+      const commandAuthorized = core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
-      const commandGate = resolveControlCommandGate({
         useAccessGroups,
         authorizers: [
           { configured: effectiveAllowFrom.length > 0, allowed: senderAllowedForCommands },
           { configured: roomUsers.length > 0, allowed: senderAllowedForRoomUsers },
           { configured: groupAllowConfigured, allowed: senderAllowedForGroup },
         ],
-        allowTextCommands,
-        hasControlCommand: hasControlCommandInMessage,
       });
-      const commandAuthorized = commandGate.commandAuthorized;
+      if (
-      if (isRoom && commandGate.shouldBlock) {
+        isRoom &&
-        logInboundDrop({
+        allowTextCommands &&
-          log: logVerboseMessage,
+        core.channel.text.hasControlCommand(bodyText, cfg) &&
-          channel: "matrix",
+        !commandAuthorized
-          reason: "control command (unauthorized)",
+      ) {
-          target: senderId,
+        logVerboseMessage(`matrix: drop control command from unauthorized sender ${senderId}`);
-        });
         return;
       }
       const shouldRequireMention = isRoom
@@ -418,8 +409,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
         !wasMentioned &&
         !hasExplicitMention &&
         commandAuthorized &&
-        hasControlCommandInMessage;
+        core.channel.text.hasControlCommand(bodyText);
-      const canDetectMention = mentionRegexes.length > 0 || hasExplicitMention;
       if (isRoom && shouldRequireMention && !wasMentioned && !shouldBypassMention) {
         logger.info({ roomId, reason: "no-mention" }, "skipping room message");
         return;
@@ -496,45 +486,47 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
         OriginatingTo: `room:${roomId}`,
       });
 
-      await core.channel.session.recordInboundSession({
+      void core.channel.session
-        storePath,
+        .recordSessionMetaFromInbound({
-        sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
+          storePath,
-        ctx: ctxPayload,
+          sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
-        updateLastRoute: isDirectMessage
+          ctx: ctxPayload,
-          ? {
+        })
-              sessionKey: route.mainSessionKey,
+        .catch((err) => {
-              channel: "matrix",
-              to: `room:${roomId}`,
-              accountId: route.accountId,
-            }
-          : undefined,
-        onRecordError: (err) => {
           logger.warn(
             { error: String(err), storePath, sessionKey: ctxPayload.SessionKey ?? route.sessionKey },
             "failed updating session meta",
           );
-        },
+        });
-      });
+
+      if (isDirectMessage) {
+        await core.channel.session.updateLastRoute({
+          storePath,
+          sessionKey: route.mainSessionKey,
+          channel: "matrix",
+          to: `room:${roomId}`,
+          accountId: route.accountId,
+          ctx: ctxPayload,
+        });
+      }
 
       const preview = bodyText.slice(0, 200).replace(/\n/g, "\\n");
       logVerboseMessage(`matrix inbound: room=${roomId} from=${senderId} preview="${preview}"`);
 
       const ackReaction = (cfg.messages?.ackReaction ?? "").trim();
       const ackScope = cfg.messages?.ackReactionScope ?? "group-mentions";
-      const shouldAckReaction = () =>
+      const shouldAckReaction = () => {
-        Boolean(
+        if (!ackReaction) return false;
-          ackReaction &&
+        if (ackScope === "all") return true;
-            core.channel.reactions.shouldAckReaction({
+        if (ackScope === "direct") return isDirectMessage;
-              scope: ackScope,
+        if (ackScope === "group-all") return isRoom;
-              isDirect: isDirectMessage,
+        if (ackScope === "group-mentions") {
-              isGroup: isRoom,
+          if (!isRoom) return false;
-              isMentionableGroup: isRoom,
+          if (!shouldRequireMention) return false;
-              requireMention: Boolean(shouldRequireMention),
+          return wasMentioned || shouldBypassMention;
-              canDetectMention,
+        }
-              effectiveWasMentioned: wasMentioned || shouldBypassMention,
+        return false;
-              shouldBypassMention,
+      };
-            }),
-        );
       if (shouldAckReaction() && messageId) {
         reactMatrixMessage(roomId, messageId, ackReaction, client).catch((err) => {
           logVerboseMessage(`matrix react failed for room ${roomId}: ${String(err)}`);
@@ -561,33 +553,10 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
         channel: "matrix",
         accountId: route.accountId,
       });
-      const prefixContext = createReplyPrefixContext({ cfg, agentId: route.agentId });
-      const typingCallbacks = createTypingCallbacks({
-        start: () => sendTypingMatrix(roomId, true, undefined, client),
-        stop: () => sendTypingMatrix(roomId, false, undefined, client),
-        onStartError: (err) => {
-          logTypingFailure({
-            log: logVerboseMessage,
-            channel: "matrix",
-            action: "start",
-            target: roomId,
-            error: err,
-          });
-        },
-        onStopError: (err) => {
-          logTypingFailure({
-            log: logVerboseMessage,
-            channel: "matrix",
-            action: "stop",
-            target: roomId,
-            error: err,
-          });
-        },
-      });
       const { dispatcher, replyOptions, markDispatchIdle } =
         core.channel.reply.createReplyDispatcherWithTyping({
-          responsePrefix: prefixContext.responsePrefix,
+          responsePrefix: core.channel.reply.resolveEffectiveMessagesConfig(cfg, route.agentId)
-          responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
+            .responsePrefix,
           humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, route.agentId),
           deliver: async (payload) => {
             await deliverMatrixReplies({
@@ -606,8 +575,10 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
           onError: (err, info) => {
             runtime.error?.(`matrix ${info.kind} reply failed: ${String(err)}`);
           },
-          onReplyStart: typingCallbacks.onReplyStart,
+          onReplyStart: () =>
-          onIdle: typingCallbacks.onIdle,
+            sendTypingMatrix(roomId, true, undefined, client).catch(() => {}),
+          onIdle: () =>
+            sendTypingMatrix(roomId, false, undefined, client).catch(() => {}),
         });
 
       const { queuedFinal, counts } = await core.channel.reply.dispatchReplyFromConfig({
@@ -617,7 +588,6 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
         replyOptions: {
           ...replyOptions,
           skillFilter: roomConfig?.skills,
-          onModelSelected: prefixContext.onModelSelected,
         },
       });
       markDispatchIdle();

extensions/mattermost/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/mattermost",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Mattermost channel plugin",
   "clawdbot": {

extensions/mattermost/src/mattermost/monitor.ts

@@ -7,15 +7,10 @@ import type {
   RuntimeEnv,
 } from "clawdbot/plugin-sdk";
 import {
-  createReplyPrefixContext,
-  createTypingCallbacks,
-  logInboundDrop,
-  logTypingFailure,
   buildPendingHistoryContextFromMap,
-  clearHistoryEntriesIfEnabled,
+  clearHistoryEntries,
   DEFAULT_GROUP_HISTORY_LIMIT,
-  recordPendingHistoryEntryIfEnabled,
+  recordPendingHistoryEntry,
-  resolveControlCommandGate,
   resolveChannelMediaMaxBytes,
   type HistoryEntry,
 } from "clawdbot/plugin-sdk";
@@ -35,9 +30,12 @@ import {
 } from "./client.js";
 import {
   createDedupeCache,
+  extractShortModelName,
   formatInboundFromLabel,
   rawDataToString,
+  resolveIdentityName,
   resolveThreadSessionKeys,
+  type ResponsePrefixContext,
 } from "./monitor-helpers.js";
 import { sendMessageMattermost } from "./send.js";
 
@@ -309,7 +307,11 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
   };
 
   const sendTypingIndicator = async (channelId: string, parentId?: string) => {
-    await sendMattermostTyping(client, { channelId, parentId });
+    try {
+      await sendMattermostTyping(client, { channelId, parentId });
+    } catch (err) {
+      logger.debug?.(`mattermost typing cue failed for channel ${channelId}: ${String(err)}`);
+    }
   };
 
   const resolveChannelInfo = async (channelId: string): Promise<MattermostChannel | null> => {
@@ -401,8 +403,7 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       cfg,
       surface: "mattermost",
     });
-    const hasControlCommand = core.channel.text.hasControlCommand(rawText, cfg);
+    const isControlCommand = allowTextCommands && core.channel.text.hasControlCommand(rawText, cfg);
-    const isControlCommand = allowTextCommands && hasControlCommand;
     const useAccessGroups = cfg.commands?.useAccessGroups !== false;
     const senderAllowedForCommands = isSenderAllowed({
       senderId,
@@ -414,20 +415,19 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       senderName,
       allowFrom: effectiveGroupAllowFrom,
     });
-    const commandGate = resolveControlCommandGate({
-      useAccessGroups,
-      authorizers: [
-        { configured: effectiveAllowFrom.length > 0, allowed: senderAllowedForCommands },
-        {
-          configured: effectiveGroupAllowFrom.length > 0,
-          allowed: groupAllowedForCommands,
-        },
-      ],
-      allowTextCommands,
-      hasControlCommand,
-    });
     const commandAuthorized =
-      kind === "dm" ? dmPolicy === "open" || senderAllowedForCommands : commandGate.commandAuthorized;
+      kind === "dm"
+        ? dmPolicy === "open" || senderAllowedForCommands
+        : core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
+            useAccessGroups,
+            authorizers: [
+              { configured: effectiveAllowFrom.length > 0, allowed: senderAllowedForCommands },
+              {
+                configured: effectiveGroupAllowFrom.length > 0,
+                allowed: groupAllowedForCommands,
+              },
+            ],
+          });
 
     if (kind === "dm") {
       if (dmPolicy === "disabled") {
@@ -488,13 +488,10 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       }
     }
 
-    if (kind !== "dm" && commandGate.shouldBlock) {
+    if (kind !== "dm" && isControlCommand && !commandAuthorized) {
-      logInboundDrop({
+      logVerboseMessage(
-        log: logVerboseMessage,
+        `mattermost: drop control command from unauthorized sender ${senderId}`,
-        channel: "mattermost",
+      );
-        reason: "control command (unauthorized)",
-        target: senderId,
-      });
       return;
     }
 
@@ -537,19 +534,19 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
         : "");
     const pendingSender = senderName;
     const recordPendingHistory = () => {
+      if (!historyKey || historyLimit <= 0) return;
       const trimmed = pendingBody.trim();
-      recordPendingHistoryEntryIfEnabled({
+      if (!trimmed) return;
+      recordPendingHistoryEntry({
         historyMap: channelHistories,
+        historyKey,
         limit: historyLimit,
-        historyKey: historyKey ?? "",
+        entry: {
-        entry: historyKey && trimmed
+          sender: pendingSender,
-          ? {
+          body: trimmed,
-              sender: pendingSender,
+          timestamp: typeof post.create_at === "number" ? post.create_at : undefined,
-              body: trimmed,
+          messageId: post.id ?? undefined,
-              timestamp: typeof post.create_at === "number" ? post.create_at : undefined,
+        },
-              messageId: post.id ?? undefined,
-            }
-          : null,
       });
     };
 
@@ -626,7 +623,7 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       sender: { name: senderName, id: senderId },
     });
     let combinedBody = body;
-    if (historyKey) {
+    if (historyKey && historyLimit > 0) {
       combinedBody = buildPendingHistoryContextFromMap({
         historyMap: channelHistories,
         historyKey,
@@ -716,23 +713,15 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       accountId: account.accountId,
     });
 
-    const prefixContext = createReplyPrefixContext({ cfg, agentId: route.agentId });
+    let prefixContext: ResponsePrefixContext = {
+      identityName: resolveIdentityName(cfg, route.agentId),
+    };
 
-    const typingCallbacks = createTypingCallbacks({
-      start: () => sendTypingIndicator(channelId, threadRootId),
-      onStartError: (err) => {
-        logTypingFailure({
-          log: (message) => logger.debug?.(message),
-          channel: "mattermost",
-          target: channelId,
-          error: err,
-        });
-      },
-    });
     const { dispatcher, replyOptions, markDispatchIdle } =
       core.channel.reply.createReplyDispatcherWithTyping({
-        responsePrefix: prefixContext.responsePrefix,
+        responsePrefix: core.channel.reply.resolveEffectiveMessagesConfig(cfg, route.agentId)
-        responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
+          .responsePrefix,
+        responsePrefixContextProvider: () => prefixContext,
         humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, route.agentId),
         deliver: async (payload: ReplyPayload) => {
           const mediaUrls = payload.mediaUrls ?? (payload.mediaUrl ? [payload.mediaUrl] : []);
@@ -763,7 +752,7 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
         onError: (err, info) => {
           runtime.error?.(`mattermost ${info.kind} reply failed: ${String(err)}`);
         },
-        onReplyStart: typingCallbacks.onReplyStart,
+        onReplyStart: () => sendTypingIndicator(channelId, threadRootId),
       });
 
     await core.channel.reply.dispatchReplyFromConfig({
@@ -774,12 +763,17 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
         ...replyOptions,
         disableBlockStreaming:
           typeof account.blockStreaming === "boolean" ? !account.blockStreaming : undefined,
-        onModelSelected: prefixContext.onModelSelected,
+        onModelSelected: (ctx) => {
+          prefixContext.provider = ctx.provider;
+          prefixContext.model = extractShortModelName(ctx.model);
+          prefixContext.modelFull = `${ctx.provider}/${ctx.model}`;
+          prefixContext.thinkingLevel = ctx.thinkLevel ?? "off";
+        },
       },
     });
     markDispatchIdle();
-    if (historyKey) {
+    if (historyKey && historyLimit > 0) {
-      clearHistoryEntriesIfEnabled({ historyMap: channelHistories, historyKey, limit: historyLimit });
+      clearHistoryEntries({ historyMap: channelHistories, historyKey });
     }
   };
 

extensions/memory-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/memory-core",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot core memory search plugin",
   "clawdbot": {

extensions/memory-lancedb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/memory-lancedb",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot LanceDB-backed long-term memory plugin with auto-recall/capture",
   "dependencies": {

extensions/msteams/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 2026.1.23
-
-### Changes
-- Version alignment with core Clawdbot release numbers.
-
 ## 2026.1.22
 
 ### Changes

extensions/msteams/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/msteams",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Microsoft Teams channel plugin",
   "clawdbot": {

extensions/msteams/src/attachments/download.ts

@@ -68,10 +68,10 @@ function scopeCandidatesForUrl(url: string): string[] {
       host.endsWith("1drv.ms") ||
       host.includes("sharepoint");
     return looksLikeGraph
-      ? ["https://graph.microsoft.com", "https://api.botframework.com"]
+      ? ["https://graph.microsoft.com/.default", "https://api.botframework.com/.default"]
-      : ["https://api.botframework.com", "https://graph.microsoft.com"];
+      : ["https://api.botframework.com/.default", "https://graph.microsoft.com/.default"];
   } catch {
-    return ["https://api.botframework.com", "https://graph.microsoft.com"];
+    return ["https://api.botframework.com/.default", "https://graph.microsoft.com/.default"];
   }
 }
 

extensions/msteams/src/attachments/graph.ts

@@ -198,7 +198,7 @@ export async function downloadMSTeamsGraphMedia(params: {
   const messageUrl = params.messageUrl;
   let accessToken: string;
   try {
-    accessToken = await params.tokenProvider.getAccessToken("https://graph.microsoft.com");
+    accessToken = await params.tokenProvider.getAccessToken("https://graph.microsoft.com/.default");
   } catch {
     return { media: [], messageUrl, tokenError: true };
   }

extensions/msteams/src/directory-live.ts

@@ -64,7 +64,7 @@ async function resolveGraphToken(cfg: unknown): Promise<string> {
   if (!creds) throw new Error("MS Teams credentials missing");
   const { sdk, authConfig } = await loadMSTeamsSdkWithAuth(creds);
   const tokenProvider = new sdk.MsalTokenProvider(authConfig);
-  const token = await tokenProvider.getAccessToken("https://graph.microsoft.com");
+  const token = await tokenProvider.getAccessToken("https://graph.microsoft.com/.default");
   const accessToken = readAccessToken(token);
   if (!accessToken) throw new Error("MS Teams graph token unavailable");
   return accessToken;

extensions/msteams/src/graph-upload.ts

@@ -13,7 +13,7 @@ import type { MSTeamsAccessTokenProvider } from "./attachments/types.js";
 
 const GRAPH_ROOT = "https://graph.microsoft.com/v1.0";
 const GRAPH_BETA = "https://graph.microsoft.com/beta";
-const GRAPH_SCOPE = "https://graph.microsoft.com";
+const GRAPH_SCOPE = "https://graph.microsoft.com/.default";
 
 export interface OneDriveUploadResult {
   id: string;

extensions/msteams/src/monitor-handler/message-handler.ts

@@ -1,10 +1,8 @@
 import {
   buildPendingHistoryContextFromMap,
-  clearHistoryEntriesIfEnabled,
+  clearHistoryEntries,
   DEFAULT_GROUP_HISTORY_LIMIT,
-  logInboundDrop,
+  recordPendingHistoryEntry,
-  recordPendingHistoryEntryIfEnabled,
-  resolveControlCommandGate,
   resolveMentionGating,
   formatAllowlistMatchMeta,
   type HistoryEntry,
@@ -253,24 +251,15 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
       senderId,
       senderName,
     });
-    const hasControlCommandInMessage = core.channel.text.hasControlCommand(text, cfg);
+    const commandAuthorized = core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
-    const commandGate = resolveControlCommandGate({
       useAccessGroups,
       authorizers: [
         { configured: effectiveDmAllowFrom.length > 0, allowed: ownerAllowedForCommands },
         { configured: effectiveGroupAllowFrom.length > 0, allowed: groupAllowedForCommands },
       ],
-      allowTextCommands: true,
-      hasControlCommand: hasControlCommandInMessage,
     });
-    const commandAuthorized = commandGate.commandAuthorized;
+    if (core.channel.text.hasControlCommand(text, cfg) && !commandAuthorized) {
-    if (commandGate.shouldBlock) {
+      logVerboseMessage(`msteams: drop control command from unauthorized sender ${senderId}`);
-      logInboundDrop({
-        log: logVerboseMessage,
-        channel: "msteams",
-        reason: "control command (unauthorized)",
-        target: senderId,
-      });
       return;
     }
 
@@ -382,17 +371,19 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
           requireMention,
           mentioned,
         });
-        recordPendingHistoryEntryIfEnabled({
+        if (historyLimit > 0) {
-          historyMap: conversationHistories,
+          recordPendingHistoryEntry({
-          historyKey: conversationId,
+            historyMap: conversationHistories,
-          limit: historyLimit,
+            historyKey: conversationId,
-          entry: {
+            limit: historyLimit,
-            sender: senderName,
+            entry: {
-            body: rawBody,
+              sender: senderName,
-            timestamp: timestamp?.getTime(),
+              body: rawBody,
-            messageId: activity.id ?? undefined,
+              timestamp: timestamp?.getTime(),
-          },
+              messageId: activity.id ?? undefined,
-        });
+            },
+          });
+        }
         return;
       }
     }
@@ -435,7 +426,7 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
     let combinedBody = body;
     const isRoomish = !isDirectMessage;
     const historyKey = isRoomish ? conversationId : undefined;
-    if (isRoomish && historyKey) {
+    if (isRoomish && historyKey && historyLimit > 0) {
       combinedBody = buildPendingHistoryContextFromMap({
         historyMap: conversationHistories,
         historyKey,
@@ -476,13 +467,12 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
 	      ...mediaPayload,
 	    });
 
-    await core.channel.session.recordInboundSession({
+	    void core.channel.session.recordSessionMetaFromInbound({
-      storePath,
+	      storePath,
       sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
       ctx: ctxPayload,
-      onRecordError: (err) => {
+    }).catch((err) => {
-        logVerboseMessage(`msteams: failed updating session meta: ${String(err)}`);
+      logVerboseMessage(`msteams: failed updating session meta: ${String(err)}`);
-      },
     });
 
     logVerboseMessage(`msteams inbound: from=${ctxPayload.From} preview="${preview}"`);
@@ -522,11 +512,10 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
 
       const didSendReply = counts.final + counts.tool + counts.block > 0;
       if (!queuedFinal) {
-        if (isRoomish && historyKey) {
+        if (isRoomish && historyKey && historyLimit > 0) {
-          clearHistoryEntriesIfEnabled({
+          clearHistoryEntries({
             historyMap: conversationHistories,
             historyKey,
-            limit: historyLimit,
           });
         }
         return;
@@ -535,12 +524,8 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
       logVerboseMessage(
         `msteams: delivered ${finalCount} reply${finalCount === 1 ? "" : "ies"} to ${teamsTo}`,
       );
-      if (isRoomish && historyKey) {
+      if (isRoomish && historyKey && historyLimit > 0) {
-        clearHistoryEntriesIfEnabled({
+        clearHistoryEntries({ historyMap: conversationHistories, historyKey });
-          historyMap: conversationHistories,
-          historyKey,
-          limit: historyLimit,
-        });
       }
     } catch (err) {
       log.error("dispatch failed", { error: String(err) });

extensions/msteams/src/reply-dispatcher.ts

@@ -1,7 +1,4 @@
 import {
-  createReplyPrefixContext,
-  createTypingCallbacks,
-  logTypingFailure,
   resolveChannelMediaMaxBytes,
   type ClawdbotConfig,
   type MSTeamsReplyStyle,
@@ -42,33 +39,23 @@ export function createMSTeamsReplyDispatcher(params: {
 }) {
   const core = getMSTeamsRuntime();
   const sendTypingIndicator = async () => {
-    await params.context.sendActivities([{ type: "typing" }]);
+    try {
+      await params.context.sendActivities([{ type: "typing" }]);
+    } catch {
+      // Typing indicator is best-effort.
+    }
   };
-  const typingCallbacks = createTypingCallbacks({
-    start: sendTypingIndicator,
-    onStartError: (err) => {
-      logTypingFailure({
-        log: (message) => params.log.debug(message),
-        channel: "msteams",
-        action: "start",
-        error: err,
-      });
-    },
-  });
-  const prefixContext = createReplyPrefixContext({
-    cfg: params.cfg,
-    agentId: params.agentId,
-  });
 
-  const { dispatcher, replyOptions, markDispatchIdle } =
+  return core.channel.reply.createReplyDispatcherWithTyping({
-    core.channel.reply.createReplyDispatcherWithTyping({
+    responsePrefix: core.channel.reply.resolveEffectiveMessagesConfig(
-      responsePrefix: prefixContext.responsePrefix,
+      params.cfg,
-      responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
+      params.agentId,
-      humanDelay: core.channel.reply.resolveHumanDelayConfig(params.cfg, params.agentId),
+    ).responsePrefix,
-      deliver: async (payload) => {
+    humanDelay: core.channel.reply.resolveHumanDelayConfig(params.cfg, params.agentId),
-        const tableMode = core.channel.text.resolveMarkdownTableMode({
+    deliver: async (payload) => {
-          cfg: params.cfg,
+      const tableMode = core.channel.text.resolveMarkdownTableMode({
-          channel: "msteams",
+        cfg: params.cfg,
+        channel: "msteams",
       });
       const messages = renderReplyPayloadsToMessages([payload], {
         textChunkLimit: params.textLimit,
@@ -100,27 +87,21 @@ export function createMSTeamsReplyDispatcher(params: {
         mediaMaxBytes,
       });
       if (ids.length > 0) params.onSentMessageIds?.(ids);
-      },
+    },
-      onError: (err, info) => {
+    onError: (err, info) => {
-        const errMsg = formatUnknownError(err);
+      const errMsg = formatUnknownError(err);
-        const classification = classifyMSTeamsSendError(err);
+      const classification = classifyMSTeamsSendError(err);
-        const hint = formatMSTeamsSendErrorHint(classification);
+      const hint = formatMSTeamsSendErrorHint(classification);
-        params.runtime.error?.(
+      params.runtime.error?.(
-          `msteams ${info.kind} reply failed: ${errMsg}${hint ? ` (${hint})` : ""}`,
+        `msteams ${info.kind} reply failed: ${errMsg}${hint ? ` (${hint})` : ""}`,
-        );
+      );
-        params.log.error("reply failed", {
+      params.log.error("reply failed", {
-          kind: info.kind,
+        kind: info.kind,
-          error: errMsg,
+        error: errMsg,
-          classification,
+        classification,
-          hint,
+        hint,
-        });
+      });
-      },
+    },
-      onReplyStart: typingCallbacks.onReplyStart,
+    onReplyStart: sendTypingIndicator,
-    });
+  });
-
-  return {
-    dispatcher,
-    replyOptions: { ...replyOptions, onModelSelected: prefixContext.onModelSelected },
-    markDispatchIdle,
-  };
 }

extensions/msteams/src/resolve-allowlist.ts

@@ -143,7 +143,7 @@ async function resolveGraphToken(cfg: unknown): Promise<string> {
   if (!creds) throw new Error("MS Teams credentials missing");
   const { sdk, authConfig } = await loadMSTeamsSdkWithAuth(creds);
   const tokenProvider = new sdk.MsalTokenProvider(authConfig);
-  const token = await tokenProvider.getAccessToken("https://graph.microsoft.com");
+  const token = await tokenProvider.getAccessToken("https://graph.microsoft.com/.default");
   const accessToken = readAccessToken(token);
   if (!accessToken) throw new Error("MS Teams graph token unavailable");
   return accessToken;

extensions/nextcloud-talk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/nextcloud-talk",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Nextcloud Talk channel plugin",
   "clawdbot": {

extensions/nextcloud-talk/src/inbound.ts

@@ -1,9 +1,4 @@
-import {
+import type { ClawdbotConfig, RuntimeEnv } from "clawdbot/plugin-sdk";
-  logInboundDrop,
-  resolveControlCommandGate,
-  type ClawdbotConfig,
-  type RuntimeEnv,
-} from "clawdbot/plugin-sdk";
 
 import type { ResolvedNextcloudTalkAccount } from "./accounts.js";
 import {
@@ -123,11 +118,7 @@ export async function handleNextcloudTalkInbound(params: {
     senderId,
     senderName,
   }).allowed;
-  const hasControlCommand = core.channel.text.hasControlCommand(
+  const commandAuthorized = core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
-    rawBody,
-    config as ClawdbotConfig,
-  );
-  const commandGate = resolveControlCommandGate({
     useAccessGroups,
     authorizers: [
       {
@@ -136,10 +127,7 @@ export async function handleNextcloudTalkInbound(params: {
         allowed: senderAllowedForCommands,
       },
     ],
-    allowTextCommands,
-    hasControlCommand,
   });
-  const commandAuthorized = commandGate.commandAuthorized;
 
   if (isGroup) {
     const groupAllow = resolveNextcloudTalkGroupAllow({
@@ -200,13 +188,15 @@ export async function handleNextcloudTalkInbound(params: {
     }
   }
 
-  if (isGroup && commandGate.shouldBlock) {
+  if (
-    logInboundDrop({
+    isGroup &&
-      log: (message) => runtime.log?.(message),
+    allowTextCommands &&
-      channel: CHANNEL_ID,
+    core.channel.text.hasControlCommand(rawBody, config as ClawdbotConfig) &&
-      reason: "control command (unauthorized)",
+    commandAuthorized !== true
-      target: senderId,
+  ) {
-    });
+    runtime.log?.(
+      `nextcloud-talk: drop control command from unauthorized sender ${senderId}`,
+    );
     return;
   }
 
@@ -222,6 +212,10 @@ export async function handleNextcloudTalkInbound(params: {
         wildcardConfig: roomMatch.wildcardConfig,
       })
     : false;
+  const hasControlCommand = core.channel.text.hasControlCommand(
+    rawBody,
+    config as ClawdbotConfig,
+  );
   const mentionGate = resolveNextcloudTalkMentionGate({
     isGroup,
     requireMention: shouldRequireMention,
@@ -293,14 +287,15 @@ export async function handleNextcloudTalkInbound(params: {
     CommandAuthorized: commandAuthorized,
   });
 
-  await core.channel.session.recordInboundSession({
+  void core.channel.session
-    storePath,
+    .recordSessionMetaFromInbound({
-    sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
+      storePath,
-    ctx: ctxPayload,
+      sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
-    onRecordError: (err) => {
+      ctx: ctxPayload,
+    })
+    .catch((err) => {
       runtime.error?.(`nextcloud-talk: failed updating session meta: ${String(err)}`);
-    },
+    });
-  });
 
   await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
     ctx: ctxPayload,

extensions/nostr/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 2026.1.23
-
-### Changes
-- Version alignment with core Clawdbot release numbers.
-
 ## 2026.1.22
 
 ### Changes

extensions/nostr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/nostr",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Nostr channel plugin for NIP-04 encrypted DMs",
   "clawdbot": {

extensions/open-prose/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@clawdbot/open-prose",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "OpenProse VM skill pack plugin (slash command + telemetry).",
   "clawdbot": {
-    "extensions": [
+    "extensions": ["./index.ts"]
-      "./index.ts"
-    ]
   }
 }

extensions/signal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/signal",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Signal channel plugin",
   "clawdbot": {

extensions/slack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/slack",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Slack channel plugin",
   "clawdbot": {

extensions/telegram/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/telegram",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Telegram channel plugin",
   "clawdbot": {

extensions/voice-call/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 2026.1.23
-
-### Changes
-- Version alignment with core Clawdbot release numbers.
-
 ## 2026.1.22
 
 ### Changes

extensions/voice-call/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/voice-call",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot voice-call plugin",
   "dependencies": {

extensions/whatsapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/whatsapp",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot WhatsApp channel plugin",
   "clawdbot": {

extensions/zalo/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 2026.1.23
-
-### Changes
-- Version alignment with core Clawdbot release numbers.
-
 ## 2026.1.22
 
 ### Changes

extensions/zalo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/zalo",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Zalo channel plugin",
   "clawdbot": {

extensions/zalo/src/monitor.ts

@@ -570,13 +570,12 @@ async function processMessageWithPipeline(params: {
     OriginatingTo: `zalo:${chatId}`,
   });
 
-  await core.channel.session.recordInboundSession({
+  void core.channel.session.recordSessionMetaFromInbound({
     storePath,
     sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
     ctx: ctxPayload,
-    onRecordError: (err) => {
+  }).catch((err) => {
-      runtime.error?.(`zalo: failed updating session meta: ${String(err)}`);
+    runtime.error?.(`zalo: failed updating session meta: ${String(err)}`);
-    },
   });
 
   const tableMode = core.channel.text.resolveMarkdownTableMode({

extensions/zalouser/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 2026.1.23
-
-### Changes
-- Version alignment with core Clawdbot release numbers.
-
 ## 2026.1.22
 
 ### Changes

extensions/zalouser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/zalouser",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "type": "module",
   "description": "Clawdbot Zalo Personal Account plugin via zca-cli",
   "dependencies": {

extensions/zalouser/src/monitor.ts

@@ -311,13 +311,12 @@ async function processMessage(
     OriginatingTo: `zalouser:${chatId}`,
   });
 
-  await core.channel.session.recordInboundSession({
+  void core.channel.session.recordSessionMetaFromInbound({
     storePath,
     sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
     ctx: ctxPayload,
-    onRecordError: (err) => {
+  }).catch((err) => {
-      runtime.error?.(`zalouser: failed updating session meta: ${String(err)}`);
+    runtime.error?.(`zalouser: failed updating session meta: ${String(err)}`);
-    },
   });
 
   await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawdbot",
-  "version": "2026.1.23",
+  "version": "2026.1.22",
   "description": "WhatsApp gateway CLI (Baileys web) with Pi RPC agent",
   "type": "module",
   "main": "dist/index.js",

src/agents/compaction.test.ts

@@ -1,107 +0,0 @@
-import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import { describe, expect, it } from "vitest";
-
-import {
-  estimateMessagesTokens,
-  pruneHistoryForContextShare,
-  splitMessagesByTokenShare,
-} from "./compaction.js";
-
-function makeMessage(id: number, size: number): AgentMessage {
-  return {
-    role: "user",
-    content: "x".repeat(size),
-    timestamp: id,
-  };
-}
-
-describe("splitMessagesByTokenShare", () => {
-  it("splits messages into two non-empty parts", () => {
-    const messages: AgentMessage[] = [
-      makeMessage(1, 4000),
-      makeMessage(2, 4000),
-      makeMessage(3, 4000),
-      makeMessage(4, 4000),
-    ];
-
-    const parts = splitMessagesByTokenShare(messages, 2);
-    expect(parts.length).toBeGreaterThanOrEqual(2);
-    expect(parts[0]?.length).toBeGreaterThan(0);
-    expect(parts[1]?.length).toBeGreaterThan(0);
-    expect(parts.flat().length).toBe(messages.length);
-  });
-
-  it("preserves message order across parts", () => {
-    const messages: AgentMessage[] = [
-      makeMessage(1, 4000),
-      makeMessage(2, 4000),
-      makeMessage(3, 4000),
-      makeMessage(4, 4000),
-      makeMessage(5, 4000),
-      makeMessage(6, 4000),
-    ];
-
-    const parts = splitMessagesByTokenShare(messages, 3);
-    expect(parts.flat().map((msg) => msg.timestamp)).toEqual(messages.map((msg) => msg.timestamp));
-  });
-});
-
-describe("pruneHistoryForContextShare", () => {
-  it("drops older chunks until the history budget is met", () => {
-    const messages: AgentMessage[] = [
-      makeMessage(1, 4000),
-      makeMessage(2, 4000),
-      makeMessage(3, 4000),
-      makeMessage(4, 4000),
-    ];
-    const maxContextTokens = 2000; // budget is 1000 tokens (50%)
-    const pruned = pruneHistoryForContextShare({
-      messages,
-      maxContextTokens,
-      maxHistoryShare: 0.5,
-      parts: 2,
-    });
-
-    expect(pruned.droppedChunks).toBeGreaterThan(0);
-    expect(pruned.keptTokens).toBeLessThanOrEqual(Math.floor(maxContextTokens * 0.5));
-    expect(pruned.messages.length).toBeGreaterThan(0);
-  });
-
-  it("keeps the newest messages when pruning", () => {
-    const messages: AgentMessage[] = [
-      makeMessage(1, 4000),
-      makeMessage(2, 4000),
-      makeMessage(3, 4000),
-      makeMessage(4, 4000),
-      makeMessage(5, 4000),
-      makeMessage(6, 4000),
-    ];
-    const totalTokens = estimateMessagesTokens(messages);
-    const maxContextTokens = Math.max(1, Math.floor(totalTokens * 0.5)); // budget = 25%
-    const pruned = pruneHistoryForContextShare({
-      messages,
-      maxContextTokens,
-      maxHistoryShare: 0.5,
-      parts: 2,
-    });
-
-    const keptIds = pruned.messages.map((msg) => msg.timestamp);
-    const expectedSuffix = messages.slice(-keptIds.length).map((msg) => msg.timestamp);
-    expect(keptIds).toEqual(expectedSuffix);
-  });
-
-  it("keeps history when already within budget", () => {
-    const messages: AgentMessage[] = [makeMessage(1, 1000)];
-    const maxContextTokens = 2000;
-    const pruned = pruneHistoryForContextShare({
-      messages,
-      maxContextTokens,
-      maxHistoryShare: 0.5,
-      parts: 2,
-    });
-
-    expect(pruned.droppedChunks).toBe(0);
-    expect(pruned.messages.length).toBe(messages.length);
-    expect(pruned.keptTokens).toBe(estimateMessagesTokens(messages));
-  });
-});

src/agents/compaction.ts

@@ -1,341 +0,0 @@
-import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import { estimateTokens, generateSummary } from "@mariozechner/pi-coding-agent";
-
-import { DEFAULT_CONTEXT_TOKENS } from "./defaults.js";
-
-export const BASE_CHUNK_RATIO = 0.4;
-export const MIN_CHUNK_RATIO = 0.15;
-export const SAFETY_MARGIN = 1.2; // 20% buffer for estimateTokens() inaccuracy
-const DEFAULT_SUMMARY_FALLBACK = "No prior history.";
-const DEFAULT_PARTS = 2;
-const MERGE_SUMMARIES_INSTRUCTIONS =
-  "Merge these partial summaries into a single cohesive summary. Preserve decisions," +
-  " TODOs, open questions, and any constraints.";
-
-export function estimateMessagesTokens(messages: AgentMessage[]): number {
-  return messages.reduce((sum, message) => sum + estimateTokens(message), 0);
-}
-
-function normalizeParts(parts: number, messageCount: number): number {
-  if (!Number.isFinite(parts) || parts <= 1) return 1;
-  return Math.min(Math.max(1, Math.floor(parts)), Math.max(1, messageCount));
-}
-
-export function splitMessagesByTokenShare(
-  messages: AgentMessage[],
-  parts = DEFAULT_PARTS,
-): AgentMessage[][] {
-  if (messages.length === 0) return [];
-  const normalizedParts = normalizeParts(parts, messages.length);
-  if (normalizedParts <= 1) return [messages];
-
-  const totalTokens = estimateMessagesTokens(messages);
-  const targetTokens = totalTokens / normalizedParts;
-  const chunks: AgentMessage[][] = [];
-  let current: AgentMessage[] = [];
-  let currentTokens = 0;
-
-  for (const message of messages) {
-    const messageTokens = estimateTokens(message);
-    if (
-      chunks.length < normalizedParts - 1 &&
-      current.length > 0 &&
-      currentTokens + messageTokens > targetTokens
-    ) {
-      chunks.push(current);
-      current = [];
-      currentTokens = 0;
-    }
-
-    current.push(message);
-    currentTokens += messageTokens;
-  }
-
-  if (current.length > 0) {
-    chunks.push(current);
-  }
-
-  return chunks;
-}
-
-export function chunkMessagesByMaxTokens(
-  messages: AgentMessage[],
-  maxTokens: number,
-): AgentMessage[][] {
-  if (messages.length === 0) return [];
-
-  const chunks: AgentMessage[][] = [];
-  let currentChunk: AgentMessage[] = [];
-  let currentTokens = 0;
-
-  for (const message of messages) {
-    const messageTokens = estimateTokens(message);
-    if (currentChunk.length > 0 && currentTokens + messageTokens > maxTokens) {
-      chunks.push(currentChunk);
-      currentChunk = [];
-      currentTokens = 0;
-    }
-
-    currentChunk.push(message);
-    currentTokens += messageTokens;
-
-    if (messageTokens > maxTokens) {
-      // Split oversized messages to avoid unbounded chunk growth.
-      chunks.push(currentChunk);
-      currentChunk = [];
-      currentTokens = 0;
-    }
-  }
-
-  if (currentChunk.length > 0) {
-    chunks.push(currentChunk);
-  }
-
-  return chunks;
-}
-
-/**
- * Compute adaptive chunk ratio based on average message size.
- * When messages are large, we use smaller chunks to avoid exceeding model limits.
- */
-export function computeAdaptiveChunkRatio(messages: AgentMessage[], contextWindow: number): number {
-  if (messages.length === 0) return BASE_CHUNK_RATIO;
-
-  const totalTokens = estimateMessagesTokens(messages);
-  const avgTokens = totalTokens / messages.length;
-
-  // Apply safety margin to account for estimation inaccuracy
-  const safeAvgTokens = avgTokens * SAFETY_MARGIN;
-  const avgRatio = safeAvgTokens / contextWindow;
-
-  // If average message is > 10% of context, reduce chunk ratio
-  if (avgRatio > 0.1) {
-    const reduction = Math.min(avgRatio * 2, BASE_CHUNK_RATIO - MIN_CHUNK_RATIO);
-    return Math.max(MIN_CHUNK_RATIO, BASE_CHUNK_RATIO - reduction);
-  }
-
-  return BASE_CHUNK_RATIO;
-}
-
-/**
- * Check if a single message is too large to summarize.
- * If single message > 50% of context, it can't be summarized safely.
- */
-export function isOversizedForSummary(msg: AgentMessage, contextWindow: number): boolean {
-  const tokens = estimateTokens(msg) * SAFETY_MARGIN;
-  return tokens > contextWindow * 0.5;
-}
-
-async function summarizeChunks(params: {
-  messages: AgentMessage[];
-  model: NonNullable<ExtensionContext["model"]>;
-  apiKey: string;
-  signal: AbortSignal;
-  reserveTokens: number;
-  maxChunkTokens: number;
-  customInstructions?: string;
-  previousSummary?: string;
-}): Promise<string> {
-  if (params.messages.length === 0) {
-    return params.previousSummary ?? DEFAULT_SUMMARY_FALLBACK;
-  }
-
-  const chunks = chunkMessagesByMaxTokens(params.messages, params.maxChunkTokens);
-  let summary = params.previousSummary;
-
-  for (const chunk of chunks) {
-    summary = await generateSummary(
-      chunk,
-      params.model,
-      params.reserveTokens,
-      params.apiKey,
-      params.signal,
-      params.customInstructions,
-      summary,
-    );
-  }
-
-  return summary ?? DEFAULT_SUMMARY_FALLBACK;
-}
-
-/**
- * Summarize with progressive fallback for handling oversized messages.
- * If full summarization fails, tries partial summarization excluding oversized messages.
- */
-export async function summarizeWithFallback(params: {
-  messages: AgentMessage[];
-  model: NonNullable<ExtensionContext["model"]>;
-  apiKey: string;
-  signal: AbortSignal;
-  reserveTokens: number;
-  maxChunkTokens: number;
-  contextWindow: number;
-  customInstructions?: string;
-  previousSummary?: string;
-}): Promise<string> {
-  const { messages, contextWindow } = params;
-
-  if (messages.length === 0) {
-    return params.previousSummary ?? DEFAULT_SUMMARY_FALLBACK;
-  }
-
-  // Try full summarization first
-  try {
-    return await summarizeChunks(params);
-  } catch (fullError) {
-    console.warn(
-      `Full summarization failed, trying partial: ${
-        fullError instanceof Error ? fullError.message : String(fullError)
-      }`,
-    );
-  }
-
-  // Fallback 1: Summarize only small messages, note oversized ones
-  const smallMessages: AgentMessage[] = [];
-  const oversizedNotes: string[] = [];
-
-  for (const msg of messages) {
-    if (isOversizedForSummary(msg, contextWindow)) {
-      const role = (msg as { role?: string }).role ?? "message";
-      const tokens = estimateTokens(msg);
-      oversizedNotes.push(
-        `[Large ${role} (~${Math.round(tokens / 1000)}K tokens) omitted from summary]`,
-      );
-    } else {
-      smallMessages.push(msg);
-    }
-  }
-
-  if (smallMessages.length > 0) {
-    try {
-      const partialSummary = await summarizeChunks({
-        ...params,
-        messages: smallMessages,
-      });
-      const notes = oversizedNotes.length > 0 ? `\n\n${oversizedNotes.join("\n")}` : "";
-      return partialSummary + notes;
-    } catch (partialError) {
-      console.warn(
-        `Partial summarization also failed: ${
-          partialError instanceof Error ? partialError.message : String(partialError)
-        }`,
-      );
-    }
-  }
-
-  // Final fallback: Just note what was there
-  return (
-    `Context contained ${messages.length} messages (${oversizedNotes.length} oversized). ` +
-    `Summary unavailable due to size limits.`
-  );
-}
-
-export async function summarizeInStages(params: {
-  messages: AgentMessage[];
-  model: NonNullable<ExtensionContext["model"]>;
-  apiKey: string;
-  signal: AbortSignal;
-  reserveTokens: number;
-  maxChunkTokens: number;
-  contextWindow: number;
-  customInstructions?: string;
-  previousSummary?: string;
-  parts?: number;
-  minMessagesForSplit?: number;
-}): Promise<string> {
-  const { messages } = params;
-  if (messages.length === 0) {
-    return params.previousSummary ?? DEFAULT_SUMMARY_FALLBACK;
-  }
-
-  const minMessagesForSplit = Math.max(2, params.minMessagesForSplit ?? 4);
-  const parts = normalizeParts(params.parts ?? DEFAULT_PARTS, messages.length);
-  const totalTokens = estimateMessagesTokens(messages);
-
-  if (parts <= 1 || messages.length < minMessagesForSplit || totalTokens <= params.maxChunkTokens) {
-    return summarizeWithFallback(params);
-  }
-
-  const splits = splitMessagesByTokenShare(messages, parts).filter((chunk) => chunk.length > 0);
-  if (splits.length <= 1) {
-    return summarizeWithFallback(params);
-  }
-
-  const partialSummaries: string[] = [];
-  for (const chunk of splits) {
-    partialSummaries.push(
-      await summarizeWithFallback({
-        ...params,
-        messages: chunk,
-        previousSummary: undefined,
-      }),
-    );
-  }
-
-  if (partialSummaries.length === 1) {
-    return partialSummaries[0];
-  }
-
-  const summaryMessages: AgentMessage[] = partialSummaries.map((summary) => ({
-    role: "user",
-    content: summary,
-    timestamp: Date.now(),
-  }));
-
-  const mergeInstructions = params.customInstructions
-    ? `${MERGE_SUMMARIES_INSTRUCTIONS}\n\nAdditional focus:\n${params.customInstructions}`
-    : MERGE_SUMMARIES_INSTRUCTIONS;
-
-  return summarizeWithFallback({
-    ...params,
-    messages: summaryMessages,
-    customInstructions: mergeInstructions,
-  });
-}
-
-export function pruneHistoryForContextShare(params: {
-  messages: AgentMessage[];
-  maxContextTokens: number;
-  maxHistoryShare?: number;
-  parts?: number;
-}): {
-  messages: AgentMessage[];
-  droppedChunks: number;
-  droppedMessages: number;
-  droppedTokens: number;
-  keptTokens: number;
-  budgetTokens: number;
-} {
-  const maxHistoryShare = params.maxHistoryShare ?? 0.5;
-  const budgetTokens = Math.max(1, Math.floor(params.maxContextTokens * maxHistoryShare));
-  let keptMessages = params.messages;
-  let droppedChunks = 0;
-  let droppedMessages = 0;
-  let droppedTokens = 0;
-
-  const parts = normalizeParts(params.parts ?? DEFAULT_PARTS, keptMessages.length);
-
-  while (keptMessages.length > 0 && estimateMessagesTokens(keptMessages) > budgetTokens) {
-    const chunks = splitMessagesByTokenShare(keptMessages, parts);
-    if (chunks.length <= 1) break;
-    const [dropped, ...rest] = chunks;
-    droppedChunks += 1;
-    droppedMessages += dropped.length;
-    droppedTokens += estimateMessagesTokens(dropped);
-    keptMessages = rest.flat();
-  }
-
-  return {
-    messages: keptMessages,
-    droppedChunks,
-    droppedMessages,
-    droppedTokens,
-    keptTokens: estimateMessagesTokens(keptMessages),
-    budgetTokens,
-  };
-}
-
-export function resolveContextWindowTokens(model?: ExtensionContext["model"]): number {
-  return Math.max(1, Math.floor(model?.contextWindow ?? DEFAULT_CONTEXT_TOKENS));
-}

src/agents/pi-embedded-runner/run.ts

@@ -79,7 +79,6 @@ export async function runEmbeddedPiAgent(
         ? "markdown"
         : "plain"
       : "markdown");
-  const isProbeSession = params.sessionId?.startsWith("probe-") ?? false;
 
   return enqueueCommandInLane(sessionLane, () =>
     enqueueGlobal(async () => {
@@ -456,7 +455,7 @@ export async function runEmbeddedPiAgent(
                 cfg: params.config,
                 agentDir: params.agentDir,
               });
-              if (timedOut && !isProbeSession) {
+              if (timedOut) {
                 log.warn(
                   `Profile ${lastProfileId} timed out (possible rate limit). Trying next account...`,
                 );

src/agents/pi-embedded-runner/run/attempt.ts

@@ -595,23 +595,18 @@ export async function runEmbeddedAttempt(
       setActiveEmbeddedRun(params.sessionId, queueHandle);
 
       let abortWarnTimer: NodeJS.Timeout | undefined;
-      const isProbeSession = params.sessionId?.startsWith("probe-") ?? false;
       const abortTimer = setTimeout(
         () => {
-          if (!isProbeSession) {
+          log.warn(
-            log.warn(
+            `embedded run timeout: runId=${params.runId} sessionId=${params.sessionId} timeoutMs=${params.timeoutMs}`,
-              `embedded run timeout: runId=${params.runId} sessionId=${params.sessionId} timeoutMs=${params.timeoutMs}`,
+          );
-            );
-          }
           abortRun(true);
           if (!abortWarnTimer) {
             abortWarnTimer = setTimeout(() => {
               if (!activeSession.isStreaming) return;
-              if (!isProbeSession) {
+              log.warn(
-                log.warn(
+                `embedded run abort still streaming: runId=${params.runId} sessionId=${params.sessionId}`,
-                  `embedded run abort still streaming: runId=${params.runId} sessionId=${params.sessionId}`,
+              );
-                );
-              }
             }, 10_000);
           }
         },

src/agents/pi-embedded-runner/runs.ts

@@ -109,18 +109,14 @@ export function setActiveEmbeddedRun(sessionId: string, handle: EmbeddedPiQueueH
     state: "processing",
     reason: wasActive ? "run_replaced" : "run_started",
   });
-  if (!sessionId.startsWith("probe-")) {
+  diag.info(`run registered: sessionId=${sessionId} totalActive=${ACTIVE_EMBEDDED_RUNS.size}`);
-    diag.info(`run registered: sessionId=${sessionId} totalActive=${ACTIVE_EMBEDDED_RUNS.size}`);
-  }
 }
 
 export function clearActiveEmbeddedRun(sessionId: string, handle: EmbeddedPiQueueHandle) {
   if (ACTIVE_EMBEDDED_RUNS.get(sessionId) === handle) {
     ACTIVE_EMBEDDED_RUNS.delete(sessionId);
     logSessionStateChange({ sessionId, state: "idle", reason: "run_completed" });
-    if (!sessionId.startsWith("probe-")) {
+    diag.info(`run cleared: sessionId=${sessionId} totalActive=${ACTIVE_EMBEDDED_RUNS.size}`);
-      diag.info(`run cleared: sessionId=${sessionId} totalActive=${ACTIVE_EMBEDDED_RUNS.size}`);
-    }
     notifyEmbeddedRunEnded(sessionId);
   } else {
     diag.debug(`run clear skipped: sessionId=${sessionId} reason=handle_mismatch`);

src/agents/pi-extensions/compaction-safeguard.ts

@@ -1,16 +1,12 @@
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import type { ExtensionAPI, FileOperations } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, FileOperations } from "@mariozechner/pi-coding-agent";
-import {
+import { estimateTokens, generateSummary } from "@mariozechner/pi-coding-agent";
-  BASE_CHUNK_RATIO,
+
-  MIN_CHUNK_RATIO,
+import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";
-  SAFETY_MARGIN,
+
-  computeAdaptiveChunkRatio,
+const BASE_CHUNK_RATIO = 0.4;
-  estimateMessagesTokens,
+const MIN_CHUNK_RATIO = 0.15;
-  isOversizedForSummary,
+const SAFETY_MARGIN = 1.2; // 20% buffer for estimateTokens() inaccuracy
-  pruneHistoryForContextShare,
-  resolveContextWindowTokens,
-  summarizeInStages,
-} from "../compaction.js";
 const FALLBACK_SUMMARY =
   "Summary unavailable due to context limits. Older messages were truncated.";
 const TURN_PREFIX_INSTRUCTIONS =
@@ -133,6 +129,175 @@ function formatFileOperations(readFiles: string[], modifiedFiles: string[]): str
   return `\n\n${sections.join("\n\n")}`;
 }
 
+function chunkMessages(messages: AgentMessage[], maxTokens: number): AgentMessage[][] {
+  if (messages.length === 0) return [];
+
+  const chunks: AgentMessage[][] = [];
+  let currentChunk: AgentMessage[] = [];
+  let currentTokens = 0;
+
+  for (const message of messages) {
+    const messageTokens = estimateTokens(message);
+    if (currentChunk.length > 0 && currentTokens + messageTokens > maxTokens) {
+      chunks.push(currentChunk);
+      currentChunk = [];
+      currentTokens = 0;
+    }
+
+    currentChunk.push(message);
+    currentTokens += messageTokens;
+
+    if (messageTokens > maxTokens) {
+      // Split oversized messages to avoid unbounded chunk growth.
+      chunks.push(currentChunk);
+      currentChunk = [];
+      currentTokens = 0;
+    }
+  }
+
+  if (currentChunk.length > 0) {
+    chunks.push(currentChunk);
+  }
+
+  return chunks;
+}
+
+/**
+ * Compute adaptive chunk ratio based on average message size.
+ * When messages are large, we use smaller chunks to avoid exceeding model limits.
+ */
+function computeAdaptiveChunkRatio(messages: AgentMessage[], contextWindow: number): number {
+  if (messages.length === 0) return BASE_CHUNK_RATIO;
+
+  const totalTokens = messages.reduce((sum, m) => sum + estimateTokens(m), 0);
+  const avgTokens = totalTokens / messages.length;
+
+  // Apply safety margin to account for estimation inaccuracy
+  const safeAvgTokens = avgTokens * SAFETY_MARGIN;
+  const avgRatio = safeAvgTokens / contextWindow;
+
+  // If average message is > 10% of context, reduce chunk ratio
+  if (avgRatio > 0.1) {
+    const reduction = Math.min(avgRatio * 2, BASE_CHUNK_RATIO - MIN_CHUNK_RATIO);
+    return Math.max(MIN_CHUNK_RATIO, BASE_CHUNK_RATIO - reduction);
+  }
+
+  return BASE_CHUNK_RATIO;
+}
+
+/**
+ * Check if a single message is too large to summarize.
+ * If single message > 50% of context, it can't be summarized safely.
+ */
+function isOversizedForSummary(msg: AgentMessage, contextWindow: number): boolean {
+  const tokens = estimateTokens(msg) * SAFETY_MARGIN;
+  return tokens > contextWindow * 0.5;
+}
+
+async function summarizeChunks(params: {
+  messages: AgentMessage[];
+  model: NonNullable<ExtensionContext["model"]>;
+  apiKey: string;
+  signal: AbortSignal;
+  reserveTokens: number;
+  maxChunkTokens: number;
+  customInstructions?: string;
+  previousSummary?: string;
+}): Promise<string> {
+  if (params.messages.length === 0) {
+    return params.previousSummary ?? "No prior history.";
+  }
+
+  const chunks = chunkMessages(params.messages, params.maxChunkTokens);
+  let summary = params.previousSummary;
+
+  for (const chunk of chunks) {
+    summary = await generateSummary(
+      chunk,
+      params.model,
+      params.reserveTokens,
+      params.apiKey,
+      params.signal,
+      params.customInstructions,
+      summary,
+    );
+  }
+
+  return summary ?? "No prior history.";
+}
+
+/**
+ * Summarize with progressive fallback for handling oversized messages.
+ * If full summarization fails, tries partial summarization excluding oversized messages.
+ */
+async function summarizeWithFallback(params: {
+  messages: AgentMessage[];
+  model: NonNullable<ExtensionContext["model"]>;
+  apiKey: string;
+  signal: AbortSignal;
+  reserveTokens: number;
+  maxChunkTokens: number;
+  contextWindow: number;
+  customInstructions?: string;
+  previousSummary?: string;
+}): Promise<string> {
+  const { messages, contextWindow } = params;
+
+  if (messages.length === 0) {
+    return params.previousSummary ?? "No prior history.";
+  }
+
+  // Try full summarization first
+  try {
+    return await summarizeChunks(params);
+  } catch (fullError) {
+    console.warn(
+      `Full summarization failed, trying partial: ${
+        fullError instanceof Error ? fullError.message : String(fullError)
+      }`,
+    );
+  }
+
+  // Fallback 1: Summarize only small messages, note oversized ones
+  const smallMessages: AgentMessage[] = [];
+  const oversizedNotes: string[] = [];
+
+  for (const msg of messages) {
+    if (isOversizedForSummary(msg, contextWindow)) {
+      const role = (msg as { role?: string }).role ?? "message";
+      const tokens = estimateTokens(msg);
+      oversizedNotes.push(
+        `[Large ${role} (~${Math.round(tokens / 1000)}K tokens) omitted from summary]`,
+      );
+    } else {
+      smallMessages.push(msg);
+    }
+  }
+
+  if (smallMessages.length > 0) {
+    try {
+      const partialSummary = await summarizeChunks({
+        ...params,
+        messages: smallMessages,
+      });
+      const notes = oversizedNotes.length > 0 ? `\n\n${oversizedNotes.join("\n")}` : "";
+      return partialSummary + notes;
+    } catch (partialError) {
+      console.warn(
+        `Partial summarization also failed: ${
+          partialError instanceof Error ? partialError.message : String(partialError)
+        }`,
+      );
+    }
+  }
+
+  // Final fallback: Just note what was there
+  return (
+    `Context contained ${messages.length} messages (${oversizedNotes.length} oversized). ` +
+    `Summary unavailable due to size limits.`
+  );
+}
+
 export default function compactionSafeguardExtension(api: ExtensionAPI): void {
   api.on("session_before_compact", async (event, ctx) => {
     const { preparation, customInstructions, signal } = event;
@@ -170,48 +335,19 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
     }
 
     try {
-      const contextWindowTokens = resolveContextWindowTokens(model);
+      const contextWindowTokens = Math.max(
-      const turnPrefixMessages = preparation.turnPrefixMessages ?? [];
+        1,
-      let messagesToSummarize = preparation.messagesToSummarize;
+        Math.floor(model.contextWindow ?? DEFAULT_CONTEXT_TOKENS),
-
+      );
-      const tokensBefore =
-        typeof preparation.tokensBefore === "number" && Number.isFinite(preparation.tokensBefore)
-          ? preparation.tokensBefore
-          : undefined;
-      if (tokensBefore !== undefined) {
-        const summarizableTokens =
-          estimateMessagesTokens(messagesToSummarize) + estimateMessagesTokens(turnPrefixMessages);
-        const newContentTokens = Math.max(0, Math.floor(tokensBefore - summarizableTokens));
-        const maxHistoryTokens = Math.floor(contextWindowTokens * 0.5);
-
-        if (newContentTokens > maxHistoryTokens) {
-          const pruned = pruneHistoryForContextShare({
-            messages: messagesToSummarize,
-            maxContextTokens: contextWindowTokens,
-            maxHistoryShare: 0.5,
-            parts: 2,
-          });
-          if (pruned.droppedChunks > 0) {
-            const newContentRatio = (newContentTokens / contextWindowTokens) * 100;
-            console.warn(
-              `Compaction safeguard: new content uses ${newContentRatio.toFixed(
-                1,
-              )}% of context; dropped ${pruned.droppedChunks} older chunk(s) ` +
-                `(${pruned.droppedMessages} messages) to fit history budget.`,
-            );
-            messagesToSummarize = pruned.messages;
-          }
-        }
-      }
 
       // Use adaptive chunk ratio based on message sizes
-      const allMessages = [...messagesToSummarize, ...turnPrefixMessages];
+      const allMessages = [...preparation.messagesToSummarize, ...preparation.turnPrefixMessages];
       const adaptiveRatio = computeAdaptiveChunkRatio(allMessages, contextWindowTokens);
       const maxChunkTokens = Math.max(1, Math.floor(contextWindowTokens * adaptiveRatio));
       const reserveTokens = Math.max(1, Math.floor(preparation.settings.reserveTokens));
 
-      const historySummary = await summarizeInStages({
+      const historySummary = await summarizeWithFallback({
-        messages: messagesToSummarize,
+        messages: preparation.messagesToSummarize,
         model,
         apiKey,
         signal,
@@ -223,9 +359,9 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
       });
 
       let summary = historySummary;
-      if (preparation.isSplitTurn && turnPrefixMessages.length > 0) {
+      if (preparation.isSplitTurn && preparation.turnPrefixMessages.length > 0) {
-        const prefixSummary = await summarizeInStages({
+        const prefixSummary = await summarizeWithFallback({
-          messages: turnPrefixMessages,
+          messages: preparation.turnPrefixMessages,
           model,
           apiKey,
           signal,
@@ -233,7 +369,6 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
           maxChunkTokens,
           contextWindow: contextWindowTokens,
           customInstructions: TURN_PREFIX_INSTRUCTIONS,
-          previousSummary: undefined,
         });
         summary = `${historySummary}\n\n---\n\n**Turn Context (split turn):**\n\n${prefixSummary}`;
       }

src/auto-reply/dispatch.ts

@@ -1,77 +0,0 @@
-import type { ClawdbotConfig } from "../config/config.js";
-import type { FinalizedMsgContext, MsgContext } from "./templating.js";
-import type { GetReplyOptions } from "./types.js";
-import { finalizeInboundContext } from "./reply/inbound-context.js";
-import type { DispatchFromConfigResult } from "./reply/dispatch-from-config.js";
-import { dispatchReplyFromConfig } from "./reply/dispatch-from-config.js";
-import {
-  createReplyDispatcher,
-  createReplyDispatcherWithTyping,
-  type ReplyDispatcher,
-  type ReplyDispatcherOptions,
-  type ReplyDispatcherWithTypingOptions,
-} from "./reply/reply-dispatcher.js";
-
-export type DispatchInboundResult = DispatchFromConfigResult;
-
-export async function dispatchInboundMessage(params: {
-  ctx: MsgContext | FinalizedMsgContext;
-  cfg: ClawdbotConfig;
-  dispatcher: ReplyDispatcher;
-  replyOptions?: Omit<GetReplyOptions, "onToolResult" | "onBlockReply">;
-  replyResolver?: typeof import("./reply.js").getReplyFromConfig;
-}): Promise<DispatchInboundResult> {
-  const finalized = finalizeInboundContext(params.ctx);
-  return await dispatchReplyFromConfig({
-    ctx: finalized,
-    cfg: params.cfg,
-    dispatcher: params.dispatcher,
-    replyOptions: params.replyOptions,
-    replyResolver: params.replyResolver,
-  });
-}
-
-export async function dispatchInboundMessageWithBufferedDispatcher(params: {
-  ctx: MsgContext | FinalizedMsgContext;
-  cfg: ClawdbotConfig;
-  dispatcherOptions: ReplyDispatcherWithTypingOptions;
-  replyOptions?: Omit<GetReplyOptions, "onToolResult" | "onBlockReply">;
-  replyResolver?: typeof import("./reply.js").getReplyFromConfig;
-}): Promise<DispatchInboundResult> {
-  const { dispatcher, replyOptions, markDispatchIdle } = createReplyDispatcherWithTyping(
-    params.dispatcherOptions,
-  );
-
-  const result = await dispatchInboundMessage({
-    ctx: params.ctx,
-    cfg: params.cfg,
-    dispatcher,
-    replyResolver: params.replyResolver,
-    replyOptions: {
-      ...params.replyOptions,
-      ...replyOptions,
-    },
-  });
-
-  markDispatchIdle();
-  return result;
-}
-
-export async function dispatchInboundMessageWithDispatcher(params: {
-  ctx: MsgContext | FinalizedMsgContext;
-  cfg: ClawdbotConfig;
-  dispatcherOptions: ReplyDispatcherOptions;
-  replyOptions?: Omit<GetReplyOptions, "onToolResult" | "onBlockReply">;
-  replyResolver?: typeof import("./reply.js").getReplyFromConfig;
-}): Promise<DispatchInboundResult> {
-  const dispatcher = createReplyDispatcher(params.dispatcherOptions);
-  const result = await dispatchInboundMessage({
-    ctx: params.ctx,
-    cfg: params.cfg,
-    dispatcher,
-    replyResolver: params.replyResolver,
-    replyOptions: params.replyOptions,
-  });
-  await dispatcher.waitForIdle();
-  return result;
-}

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

@@ -82,8 +82,7 @@ export async function runAgentTurnWithFallback(params: {
   // Track payloads sent directly (not via pipeline) during tool flush to avoid duplicates.
   const directlySentBlockKeys = new Set<string>();
 
-  const runId = params.opts?.runId ?? crypto.randomUUID();
+  const runId = crypto.randomUUID();
-  params.opts?.onAgentRunStart?.(runId);
   if (params.sessionKey) {
     registerAgentRunContext(runId, {
       sessionKey: params.sessionKey,
@@ -175,7 +174,6 @@ export async function runAgentTurnWithFallback(params: {
               extraSystemPrompt: params.followupRun.run.extraSystemPrompt,
               ownerNumbers: params.followupRun.run.ownerNumbers,
               cliSessionId,
-              images: params.opts?.images,
             })
               .then((result) => {
                 emitAgentEvent({
@@ -250,8 +248,6 @@ export async function runAgentTurnWithFallback(params: {
             bashElevated: params.followupRun.run.bashElevated,
             timeoutMs: params.followupRun.run.timeoutMs,
             runId,
-            images: params.opts?.images,
-            abortSignal: params.opts?.abortSignal,
             blockReplyBreak: params.resolvedBlockStreamingBreak,
             blockReplyChunking: params.blockReplyChunking,
             onPartialReply: allowPartialStream

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

@@ -5,9 +5,7 @@ import {
   buildHistoryContextFromEntries,
   buildHistoryContextFromMap,
   buildPendingHistoryContextFromMap,
-  clearHistoryEntriesIfEnabled,
   HISTORY_CONTEXT_MARKER,
-  recordPendingHistoryEntryIfEnabled,
 } from "./history.js";
 import { CURRENT_MESSAGE_MARKER } from "./mentions.js";
 
@@ -107,46 +105,4 @@ describe("history helpers", () => {
     expect(result).toContain(CURRENT_MESSAGE_MARKER);
     expect(result).toContain("current");
   });
-
-  it("records pending entries only when enabled", () => {
-    const historyMap = new Map<string, { sender: string; body: string }[]>();
-
-    recordPendingHistoryEntryIfEnabled({
-      historyMap,
-      historyKey: "group",
-      limit: 0,
-      entry: { sender: "A", body: "one" },
-    });
-    expect(historyMap.get("group")).toEqual(undefined);
-
-    recordPendingHistoryEntryIfEnabled({
-      historyMap,
-      historyKey: "group",
-      limit: 2,
-      entry: null,
-    });
-    expect(historyMap.get("group")).toEqual(undefined);
-
-    recordPendingHistoryEntryIfEnabled({
-      historyMap,
-      historyKey: "group",
-      limit: 2,
-      entry: { sender: "B", body: "two" },
-    });
-    expect(historyMap.get("group")?.map((entry) => entry.body)).toEqual(["two"]);
-  });
-
-  it("clears history entries only when enabled", () => {
-    const historyMap = new Map<string, { sender: string; body: string }[]>();
-    historyMap.set("group", [
-      { sender: "A", body: "one" },
-      { sender: "B", body: "two" },
-    ]);
-
-    clearHistoryEntriesIfEnabled({ historyMap, historyKey: "group", limit: 0 });
-    expect(historyMap.get("group")?.map((entry) => entry.body)).toEqual(["one", "two"]);
-
-    clearHistoryEntriesIfEnabled({ historyMap, historyKey: "group", limit: 2 });
-    expect(historyMap.get("group")).toEqual([]);
-  });
 });

src/auto-reply/reply/history.ts

@@ -47,22 +47,6 @@ export function recordPendingHistoryEntry<T extends HistoryEntry>(params: {
   return appendHistoryEntry(params);
 }
 
-export function recordPendingHistoryEntryIfEnabled<T extends HistoryEntry>(params: {
-  historyMap: Map<string, T[]>;
-  historyKey: string;
-  entry?: T | null;
-  limit: number;
-}): T[] {
-  if (!params.entry) return [];
-  if (params.limit <= 0) return [];
-  return recordPendingHistoryEntry({
-    historyMap: params.historyMap,
-    historyKey: params.historyKey,
-    entry: params.entry,
-    limit: params.limit,
-  });
-}
-
 export function buildPendingHistoryContextFromMap(params: {
   historyMap: Map<string, HistoryEntry[]>;
   historyKey: string;
@@ -117,15 +101,6 @@ export function clearHistoryEntries(params: {
   params.historyMap.set(params.historyKey, []);
 }
 
-export function clearHistoryEntriesIfEnabled(params: {
-  historyMap: Map<string, HistoryEntry[]>;
-  historyKey: string;
-  limit: number;
-}): void {
-  if (params.limit <= 0) return;
-  clearHistoryEntries({ historyMap: params.historyMap, historyKey: params.historyKey });
-}
-
 export function buildHistoryContextFromEntries(params: {
   entries: HistoryEntry[];
   currentMessage: string;

src/auto-reply/reply/provider-dispatcher.ts

@@ -1,44 +1,58 @@
 import type { ClawdbotConfig } from "../../config/config.js";
-import type { FinalizedMsgContext, MsgContext } from "../templating.js";
+import type { FinalizedMsgContext } from "../templating.js";
 import type { GetReplyOptions } from "../types.js";
-import type { DispatchInboundResult } from "../dispatch.js";
+import type { DispatchFromConfigResult } from "./dispatch-from-config.js";
+import { dispatchReplyFromConfig } from "./dispatch-from-config.js";
 import {
-  dispatchInboundMessageWithBufferedDispatcher,
+  createReplyDispatcher,
-  dispatchInboundMessageWithDispatcher,
+  createReplyDispatcherWithTyping,
-} from "../dispatch.js";
+  type ReplyDispatcherOptions,
-import type {
+  type ReplyDispatcherWithTypingOptions,
-  ReplyDispatcherOptions,
-  ReplyDispatcherWithTypingOptions,
 } from "./reply-dispatcher.js";
 
 export async function dispatchReplyWithBufferedBlockDispatcher(params: {
-  ctx: MsgContext | FinalizedMsgContext;
+  ctx: FinalizedMsgContext;
   cfg: ClawdbotConfig;
   dispatcherOptions: ReplyDispatcherWithTypingOptions;
   replyOptions?: Omit<GetReplyOptions, "onToolResult" | "onBlockReply">;
   replyResolver?: typeof import("../reply.js").getReplyFromConfig;
-}): Promise<DispatchInboundResult> {
+}): Promise<DispatchFromConfigResult> {
-  return await dispatchInboundMessageWithBufferedDispatcher({
+  const { dispatcher, replyOptions, markDispatchIdle } = createReplyDispatcherWithTyping(
+    params.dispatcherOptions,
+  );
+
+  const result = await dispatchReplyFromConfig({
     ctx: params.ctx,
     cfg: params.cfg,
-    dispatcherOptions: params.dispatcherOptions,
+    dispatcher,
     replyResolver: params.replyResolver,
-    replyOptions: params.replyOptions,
+    replyOptions: {
+      ...params.replyOptions,
+      ...replyOptions,
+    },
   });
+
+  markDispatchIdle();
+  return result;
 }
 
 export async function dispatchReplyWithDispatcher(params: {
-  ctx: MsgContext | FinalizedMsgContext;
+  ctx: FinalizedMsgContext;
   cfg: ClawdbotConfig;
   dispatcherOptions: ReplyDispatcherOptions;
   replyOptions?: Omit<GetReplyOptions, "onToolResult" | "onBlockReply">;
   replyResolver?: typeof import("../reply.js").getReplyFromConfig;
-}): Promise<DispatchInboundResult> {
+}): Promise<DispatchFromConfigResult> {
-  return await dispatchInboundMessageWithDispatcher({
+  const dispatcher = createReplyDispatcher(params.dispatcherOptions);
+
+  const result = await dispatchReplyFromConfig({
     ctx: params.ctx,
     cfg: params.cfg,
-    dispatcherOptions: params.dispatcherOptions,
+    dispatcher,
     replyResolver: params.replyResolver,
     replyOptions: params.replyOptions,
   });
+
+  await dispatcher.waitForIdle();
+  return result;
 }

src/auto-reply/types.ts

@@ -1,4 +1,3 @@
-import type { ImageContent } from "@mariozechner/pi-ai";
 import type { TypingController } from "./reply/typing.js";
 
 export type BlockReplyContext = {
@@ -14,14 +13,6 @@ export type ModelSelectedContext = {
 };
 
 export type GetReplyOptions = {
-  /** Override run id for agent events (defaults to random UUID). */
-  runId?: string;
-  /** Abort signal for the underlying agent run. */
-  abortSignal?: AbortSignal;
-  /** Optional inbound images (used for webchat attachments). */
-  images?: ImageContent[];
-  /** Notifies when an agent run actually starts (useful for webchat command handling). */
-  onAgentRunStart?: (runId: string) => void;
   onReplyStart?: () => Promise<void> | void;
   onTypingController?: (typing: TypingController) => void;
   isHeartbeat?: boolean;

src/channels/ack-reactions.test.ts

@@ -1,269 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-import {
-  removeAckReactionAfterReply,
-  shouldAckReaction,
-  shouldAckReactionForWhatsApp,
-} from "./ack-reactions.js";
-
-describe("shouldAckReaction", () => {
-  it("honors direct and group-all scopes", () => {
-    expect(
-      shouldAckReaction({
-        scope: "direct",
-        isDirect: true,
-        isGroup: false,
-        isMentionableGroup: false,
-        requireMention: false,
-        canDetectMention: false,
-        effectiveWasMentioned: false,
-      }),
-    ).toBe(true);
-
-    expect(
-      shouldAckReaction({
-        scope: "group-all",
-        isDirect: false,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: false,
-        canDetectMention: false,
-        effectiveWasMentioned: false,
-      }),
-    ).toBe(true);
-  });
-
-  it("skips when scope is off or none", () => {
-    expect(
-      shouldAckReaction({
-        scope: "off",
-        isDirect: true,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: true,
-        canDetectMention: true,
-        effectiveWasMentioned: true,
-      }),
-    ).toBe(false);
-
-    expect(
-      shouldAckReaction({
-        scope: "none",
-        isDirect: true,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: true,
-        canDetectMention: true,
-        effectiveWasMentioned: true,
-      }),
-    ).toBe(false);
-  });
-
-  it("defaults to group-mentions gating", () => {
-    expect(
-      shouldAckReaction({
-        scope: undefined,
-        isDirect: false,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: true,
-        canDetectMention: true,
-        effectiveWasMentioned: true,
-      }),
-    ).toBe(true);
-  });
-
-  it("requires mention gating for group-mentions", () => {
-    expect(
-      shouldAckReaction({
-        scope: "group-mentions",
-        isDirect: false,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: false,
-        canDetectMention: true,
-        effectiveWasMentioned: true,
-      }),
-    ).toBe(false);
-
-    expect(
-      shouldAckReaction({
-        scope: "group-mentions",
-        isDirect: false,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: true,
-        canDetectMention: false,
-        effectiveWasMentioned: true,
-      }),
-    ).toBe(false);
-
-    expect(
-      shouldAckReaction({
-        scope: "group-mentions",
-        isDirect: false,
-        isGroup: true,
-        isMentionableGroup: false,
-        requireMention: true,
-        canDetectMention: true,
-        effectiveWasMentioned: true,
-      }),
-    ).toBe(false);
-
-    expect(
-      shouldAckReaction({
-        scope: "group-mentions",
-        isDirect: false,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: true,
-        canDetectMention: true,
-        effectiveWasMentioned: true,
-      }),
-    ).toBe(true);
-
-    expect(
-      shouldAckReaction({
-        scope: "group-mentions",
-        isDirect: false,
-        isGroup: true,
-        isMentionableGroup: true,
-        requireMention: true,
-        canDetectMention: true,
-        effectiveWasMentioned: false,
-        shouldBypassMention: true,
-      }),
-    ).toBe(true);
-  });
-});
-
-describe("shouldAckReactionForWhatsApp", () => {
-  it("respects direct and group modes", () => {
-    expect(
-      shouldAckReactionForWhatsApp({
-        emoji: "👀",
-        isDirect: true,
-        isGroup: false,
-        directEnabled: true,
-        groupMode: "mentions",
-        wasMentioned: false,
-        groupActivated: false,
-      }),
-    ).toBe(true);
-
-    expect(
-      shouldAckReactionForWhatsApp({
-        emoji: "👀",
-        isDirect: true,
-        isGroup: false,
-        directEnabled: false,
-        groupMode: "mentions",
-        wasMentioned: false,
-        groupActivated: false,
-      }),
-    ).toBe(false);
-
-    expect(
-      shouldAckReactionForWhatsApp({
-        emoji: "👀",
-        isDirect: false,
-        isGroup: true,
-        directEnabled: true,
-        groupMode: "always",
-        wasMentioned: false,
-        groupActivated: false,
-      }),
-    ).toBe(true);
-
-    expect(
-      shouldAckReactionForWhatsApp({
-        emoji: "👀",
-        isDirect: false,
-        isGroup: true,
-        directEnabled: true,
-        groupMode: "never",
-        wasMentioned: true,
-        groupActivated: true,
-      }),
-    ).toBe(false);
-  });
-
-  it("honors mentions or activation for group-mentions", () => {
-    expect(
-      shouldAckReactionForWhatsApp({
-        emoji: "👀",
-        isDirect: false,
-        isGroup: true,
-        directEnabled: true,
-        groupMode: "mentions",
-        wasMentioned: true,
-        groupActivated: false,
-      }),
-    ).toBe(true);
-
-    expect(
-      shouldAckReactionForWhatsApp({
-        emoji: "👀",
-        isDirect: false,
-        isGroup: true,
-        directEnabled: true,
-        groupMode: "mentions",
-        wasMentioned: false,
-        groupActivated: true,
-      }),
-    ).toBe(true);
-
-    expect(
-      shouldAckReactionForWhatsApp({
-        emoji: "👀",
-        isDirect: false,
-        isGroup: true,
-        directEnabled: true,
-        groupMode: "mentions",
-        wasMentioned: false,
-        groupActivated: false,
-      }),
-    ).toBe(false);
-  });
-});
-
-describe("removeAckReactionAfterReply", () => {
-  it("removes only when ack succeeded", async () => {
-    const remove = vi.fn().mockResolvedValue(undefined);
-    const onError = vi.fn();
-    removeAckReactionAfterReply({
-      removeAfterReply: true,
-      ackReactionPromise: Promise.resolve(true),
-      ackReactionValue: "👀",
-      remove,
-      onError,
-    });
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    expect(remove).toHaveBeenCalledTimes(1);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("skips removal when ack did not happen", async () => {
-    const remove = vi.fn().mockResolvedValue(undefined);
-    removeAckReactionAfterReply({
-      removeAfterReply: true,
-      ackReactionPromise: Promise.resolve(false),
-      ackReactionValue: "👀",
-      remove,
-    });
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    expect(remove).not.toHaveBeenCalled();
-  });
-
-  it("skips when not configured", async () => {
-    const remove = vi.fn().mockResolvedValue(undefined);
-    removeAckReactionAfterReply({
-      removeAfterReply: false,
-      ackReactionPromise: Promise.resolve(true),
-      ackReactionValue: "👀",
-      remove,
-    });
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    expect(remove).not.toHaveBeenCalled();
-  });
-});

src/channels/ack-reactions.ts

@@ -1,71 +0,0 @@
-export type AckReactionScope = "all" | "direct" | "group-all" | "group-mentions" | "off" | "none";
-
-export type WhatsAppAckReactionMode = "always" | "mentions" | "never";
-
-export type AckReactionGateParams = {
-  scope: AckReactionScope | undefined;
-  isDirect: boolean;
-  isGroup: boolean;
-  isMentionableGroup: boolean;
-  requireMention: boolean;
-  canDetectMention: boolean;
-  effectiveWasMentioned: boolean;
-  shouldBypassMention?: boolean;
-};
-
-export function shouldAckReaction(params: AckReactionGateParams): boolean {
-  const scope = params.scope ?? "group-mentions";
-  if (scope === "off" || scope === "none") return false;
-  if (scope === "all") return true;
-  if (scope === "direct") return params.isDirect;
-  if (scope === "group-all") return params.isGroup;
-  if (scope === "group-mentions") {
-    if (!params.isMentionableGroup) return false;
-    if (!params.requireMention) return false;
-    if (!params.canDetectMention) return false;
-    return params.effectiveWasMentioned || params.shouldBypassMention === true;
-  }
-  return false;
-}
-
-export function shouldAckReactionForWhatsApp(params: {
-  emoji: string;
-  isDirect: boolean;
-  isGroup: boolean;
-  directEnabled: boolean;
-  groupMode: WhatsAppAckReactionMode;
-  wasMentioned: boolean;
-  groupActivated: boolean;
-}): boolean {
-  if (!params.emoji) return false;
-  if (params.isDirect) return params.directEnabled;
-  if (!params.isGroup) return false;
-  if (params.groupMode === "never") return false;
-  if (params.groupMode === "always") return true;
-  return shouldAckReaction({
-    scope: "group-mentions",
-    isDirect: false,
-    isGroup: true,
-    isMentionableGroup: true,
-    requireMention: true,
-    canDetectMention: true,
-    effectiveWasMentioned: params.wasMentioned,
-    shouldBypassMention: params.groupActivated,
-  });
-}
-
-export function removeAckReactionAfterReply(params: {
-  removeAfterReply: boolean;
-  ackReactionPromise: Promise<boolean> | null;
-  ackReactionValue: string | null;
-  remove: () => Promise<void>;
-  onError?: (err: unknown) => void;
-}) {
-  if (!params.removeAfterReply) return;
-  if (!params.ackReactionPromise) return;
-  if (!params.ackReactionValue) return;
-  void params.ackReactionPromise.then((didAck) => {
-    if (!didAck) return;
-    params.remove().catch((err) => params.onError?.(err));
-  });
-}

src/channels/logging.ts

@@ -1,33 +0,0 @@
-export type LogFn = (message: string) => void;
-
-export function logInboundDrop(params: {
-  log: LogFn;
-  channel: string;
-  reason: string;
-  target?: string;
-}): void {
-  const target = params.target ? ` target=${params.target}` : "";
-  params.log(`${params.channel}: drop ${params.reason}${target}`);
-}
-
-export function logTypingFailure(params: {
-  log: LogFn;
-  channel: string;
-  target?: string;
-  action?: "start" | "stop";
-  error: unknown;
-}): void {
-  const target = params.target ? ` target=${params.target}` : "";
-  const action = params.action ? ` action=${params.action}` : "";
-  params.log(`${params.channel} typing${action} failed${target}: ${String(params.error)}`);
-}
-
-export function logAckFailure(params: {
-  log: LogFn;
-  channel: string;
-  target?: string;
-  error: unknown;
-}): void {
-  const target = params.target ? ` target=${params.target}` : "";
-  params.log(`${params.channel} ack cleanup failed${target}: ${String(params.error)}`);
-}

src/channels/reply-prefix.ts

@@ -1,41 +0,0 @@
-import { resolveEffectiveMessagesConfig, resolveIdentityName } from "../agents/identity.js";
-import type { ClawdbotConfig } from "../config/config.js";
-import type { GetReplyOptions } from "../auto-reply/types.js";
-import {
-  extractShortModelName,
-  type ResponsePrefixContext,
-} from "../auto-reply/reply/response-prefix-template.js";
-
-type ModelSelectionContext = Parameters<NonNullable<GetReplyOptions["onModelSelected"]>>[0];
-
-export type ReplyPrefixContextBundle = {
-  prefixContext: ResponsePrefixContext;
-  responsePrefix?: string;
-  responsePrefixContextProvider: () => ResponsePrefixContext;
-  onModelSelected: (ctx: ModelSelectionContext) => void;
-};
-
-export function createReplyPrefixContext(params: {
-  cfg: ClawdbotConfig;
-  agentId: string;
-}): ReplyPrefixContextBundle {
-  const { cfg, agentId } = params;
-  const prefixContext: ResponsePrefixContext = {
-    identityName: resolveIdentityName(cfg, agentId),
-  };
-
-  const onModelSelected = (ctx: ModelSelectionContext) => {
-    // Mutate the object directly instead of reassigning to ensure closures see updates.
-    prefixContext.provider = ctx.provider;
-    prefixContext.model = extractShortModelName(ctx.model);
-    prefixContext.modelFull = `${ctx.provider}/${ctx.model}`;
-    prefixContext.thinkingLevel = ctx.thinkLevel ?? "off";
-  };
-
-  return {
-    prefixContext,
-    responsePrefix: resolveEffectiveMessagesConfig(cfg, agentId).responsePrefix,
-    responsePrefixContextProvider: () => prefixContext,
-    onModelSelected,
-  };
-}

src/channels/session.ts

@@ -1,49 +0,0 @@
-import type { MsgContext } from "../auto-reply/templating.js";
-import {
-  recordSessionMetaFromInbound,
-  type GroupKeyResolution,
-  type SessionEntry,
-  updateLastRoute,
-} from "../config/sessions.js";
-
-export type InboundLastRouteUpdate = {
-  sessionKey: string;
-  channel: SessionEntry["lastChannel"];
-  to: string;
-  accountId?: string;
-  threadId?: string | number;
-};
-
-export async function recordInboundSession(params: {
-  storePath: string;
-  sessionKey: string;
-  ctx: MsgContext;
-  groupResolution?: GroupKeyResolution | null;
-  createIfMissing?: boolean;
-  updateLastRoute?: InboundLastRouteUpdate;
-  onRecordError: (err: unknown) => void;
-}): Promise<void> {
-  const { storePath, sessionKey, ctx, groupResolution, createIfMissing } = params;
-  void recordSessionMetaFromInbound({
-    storePath,
-    sessionKey,
-    ctx,
-    groupResolution,
-    createIfMissing,
-  }).catch(params.onRecordError);
-
-  const update = params.updateLastRoute;
-  if (!update) return;
-  await updateLastRoute({
-    storePath,
-    sessionKey: update.sessionKey,
-    deliveryContext: {
-      channel: update.channel,
-      to: update.to,
-      accountId: update.accountId,
-      threadId: update.threadId,
-    },
-    ctx,
-    groupResolution,
-  });
-}

src/channels/typing.test.ts

@@ -1,42 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-import { createTypingCallbacks } from "./typing.js";
-
-const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
-
-describe("createTypingCallbacks", () => {
-  it("invokes start on reply start", async () => {
-    const start = vi.fn().mockResolvedValue(undefined);
-    const onStartError = vi.fn();
-    const callbacks = createTypingCallbacks({ start, onStartError });
-
-    await callbacks.onReplyStart();
-
-    expect(start).toHaveBeenCalledTimes(1);
-    expect(onStartError).not.toHaveBeenCalled();
-  });
-
-  it("reports start errors", async () => {
-    const start = vi.fn().mockRejectedValue(new Error("fail"));
-    const onStartError = vi.fn();
-    const callbacks = createTypingCallbacks({ start, onStartError });
-
-    await callbacks.onReplyStart();
-
-    expect(onStartError).toHaveBeenCalledTimes(1);
-  });
-
-  it("invokes stop on idle and reports stop errors", async () => {
-    const start = vi.fn().mockResolvedValue(undefined);
-    const stop = vi.fn().mockRejectedValue(new Error("stop"));
-    const onStartError = vi.fn();
-    const onStopError = vi.fn();
-    const callbacks = createTypingCallbacks({ start, stop, onStartError, onStopError });
-
-    callbacks.onIdle?.();
-    await flush();
-
-    expect(stop).toHaveBeenCalledTimes(1);
-    expect(onStopError).toHaveBeenCalledTimes(1);
-  });
-});

src/channels/typing.ts

@@ -1,28 +0,0 @@
-export type TypingCallbacks = {
-  onReplyStart: () => Promise<void>;
-  onIdle?: () => void;
-};
-
-export function createTypingCallbacks(params: {
-  start: () => Promise<void>;
-  stop?: () => Promise<void>;
-  onStartError: (err: unknown) => void;
-  onStopError?: (err: unknown) => void;
-}): TypingCallbacks {
-  const stop = params.stop;
-  const onReplyStart = async () => {
-    try {
-      await params.start();
-    } catch (err) {
-      params.onStartError(err);
-    }
-  };
-
-  const onIdle = stop
-    ? () => {
-        void stop().catch((err) => (params.onStopError ?? params.onStartError)(err));
-      }
-    : undefined;
-
-  return { onReplyStart, onIdle };
-}

src/cli/models-cli.ts

@@ -71,36 +71,9 @@ export function registerModelsCli(program: Command) {
       "Exit non-zero if auth is expiring/expired (1=expired/missing, 2=expiring)",
       false,
     )
-    .option("--probe", "Probe configured provider auth (live)", false)
-    .option("--probe-provider <name>", "Only probe a single provider")
-    .option(
-      "--probe-profile <id>",
-      "Only probe specific auth profile ids (repeat or comma-separated)",
-      (value, previous) => {
-        const next = Array.isArray(previous) ? previous : previous ? [previous] : [];
-        next.push(value);
-        return next;
-      },
-    )
-    .option("--probe-timeout <ms>", "Per-probe timeout in ms")
-    .option("--probe-concurrency <n>", "Concurrent probes")
-    .option("--probe-max-tokens <n>", "Probe max tokens (best-effort)")
     .action(async (opts) => {
       await runModelsCommand(async () => {
-        await modelsStatusCommand(
+        await modelsStatusCommand(opts, defaultRuntime);
-          {
-            json: Boolean(opts.json),
-            plain: Boolean(opts.plain),
-            check: Boolean(opts.check),
-            probe: Boolean(opts.probe),
-            probeProvider: opts.probeProvider as string | undefined,
-            probeProfile: opts.probeProfile as string | string[] | undefined,
-            probeTimeout: opts.probeTimeout as string | undefined,
-            probeConcurrency: opts.probeConcurrency as string | undefined,
-            probeMaxTokens: opts.probeMaxTokens as string | undefined,
-          },
-          defaultRuntime,
-        );
       });
     });
 

src/commands/models.list.test.ts

@@ -17,7 +17,6 @@ const discoverModels = vi.fn();
 
 vi.mock("../config/config.js", () => ({
   CONFIG_PATH_CLAWDBOT: "/tmp/clawdbot.json",
-  STATE_DIR_CLAWDBOT: "/tmp/clawdbot-state",
   loadConfig,
 }));
 

src/commands/models/list.probe.ts

@@ -1,414 +0,0 @@
-import crypto from "node:crypto";
-import fs from "node:fs/promises";
-
-import { resolveClawdbotAgentDir } from "../../agents/agent-paths.js";
-import {
-  ensureAuthProfileStore,
-  listProfilesForProvider,
-  resolveAuthProfileDisplayLabel,
-} from "../../agents/auth-profiles.js";
-import { runEmbeddedPiAgent } from "../../agents/pi-embedded.js";
-import { describeFailoverError } from "../../agents/failover-error.js";
-import { loadModelCatalog } from "../../agents/model-catalog.js";
-import { getCustomProviderApiKey, resolveEnvApiKey } from "../../agents/model-auth.js";
-import { normalizeProviderId, parseModelRef } from "../../agents/model-selection.js";
-import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../../agents/agent-scope.js";
-import { resolveDefaultAgentWorkspaceDir } from "../../agents/workspace.js";
-import type { ClawdbotConfig } from "../../config/config.js";
-import {
-  resolveSessionTranscriptPath,
-  resolveSessionTranscriptsDirForAgent,
-} from "../../config/sessions/paths.js";
-import { redactSecrets } from "../status-all/format.js";
-import { DEFAULT_PROVIDER, formatMs } from "./shared.js";
-
-const PROBE_PROMPT = "Reply with OK. Do not use tools.";
-
-export type AuthProbeStatus =
-  | "ok"
-  | "auth"
-  | "rate_limit"
-  | "billing"
-  | "timeout"
-  | "format"
-  | "unknown"
-  | "no_model";
-
-export type AuthProbeResult = {
-  provider: string;
-  model?: string;
-  profileId?: string;
-  label: string;
-  source: "profile" | "env" | "models.json";
-  mode?: string;
-  status: AuthProbeStatus;
-  error?: string;
-  latencyMs?: number;
-};
-
-type AuthProbeTarget = {
-  provider: string;
-  model?: { provider: string; model: string } | null;
-  profileId?: string;
-  label: string;
-  source: "profile" | "env" | "models.json";
-  mode?: string;
-};
-
-export type AuthProbeSummary = {
-  startedAt: number;
-  finishedAt: number;
-  durationMs: number;
-  totalTargets: number;
-  options: {
-    provider?: string;
-    profileIds?: string[];
-    timeoutMs: number;
-    concurrency: number;
-    maxTokens: number;
-  };
-  results: AuthProbeResult[];
-};
-
-export type AuthProbeOptions = {
-  provider?: string;
-  profileIds?: string[];
-  timeoutMs: number;
-  concurrency: number;
-  maxTokens: number;
-};
-
-const toStatus = (reason?: string | null): AuthProbeStatus => {
-  if (!reason) return "unknown";
-  if (reason === "auth") return "auth";
-  if (reason === "rate_limit") return "rate_limit";
-  if (reason === "billing") return "billing";
-  if (reason === "timeout") return "timeout";
-  if (reason === "format") return "format";
-  return "unknown";
-};
-
-function buildCandidateMap(modelCandidates: string[]): Map<string, string[]> {
-  const map = new Map<string, string[]>();
-  for (const raw of modelCandidates) {
-    const parsed = parseModelRef(String(raw ?? ""), DEFAULT_PROVIDER);
-    if (!parsed) continue;
-    const list = map.get(parsed.provider) ?? [];
-    if (!list.includes(parsed.model)) list.push(parsed.model);
-    map.set(parsed.provider, list);
-  }
-  return map;
-}
-
-function selectProbeModel(params: {
-  provider: string;
-  candidates: Map<string, string[]>;
-  catalog: Array<{ provider: string; id: string }>;
-}): { provider: string; model: string } | null {
-  const { provider, candidates, catalog } = params;
-  const direct = candidates.get(provider);
-  if (direct && direct.length > 0) {
-    return { provider, model: direct[0] };
-  }
-  const fromCatalog = catalog.find((entry) => entry.provider === provider);
-  if (fromCatalog) return { provider: fromCatalog.provider, model: fromCatalog.id };
-  return null;
-}
-
-function buildProbeTargets(params: {
-  cfg: ClawdbotConfig;
-  providers: string[];
-  modelCandidates: string[];
-  options: AuthProbeOptions;
-}): Promise<{ targets: AuthProbeTarget[]; results: AuthProbeResult[] }> {
-  const { cfg, providers, modelCandidates, options } = params;
-  const store = ensureAuthProfileStore();
-  const providerFilter = options.provider?.trim();
-  const providerFilterKey = providerFilter ? normalizeProviderId(providerFilter) : null;
-  const profileFilter = new Set((options.profileIds ?? []).map((id) => id.trim()).filter(Boolean));
-
-  return loadModelCatalog({ config: cfg }).then((catalog) => {
-    const candidates = buildCandidateMap(modelCandidates);
-    const targets: AuthProbeTarget[] = [];
-    const results: AuthProbeResult[] = [];
-
-    for (const provider of providers) {
-      const providerKey = normalizeProviderId(provider);
-      if (providerFilterKey && providerKey !== providerFilterKey) continue;
-
-      const model = selectProbeModel({
-        provider: providerKey,
-        candidates,
-        catalog,
-      });
-
-      const profileIds = listProfilesForProvider(store, providerKey);
-      const filteredProfiles = profileFilter.size
-        ? profileIds.filter((id) => profileFilter.has(id))
-        : profileIds;
-
-      if (filteredProfiles.length > 0) {
-        for (const profileId of filteredProfiles) {
-          const profile = store.profiles[profileId];
-          const mode = profile?.type;
-          const label = resolveAuthProfileDisplayLabel({ cfg, store, profileId });
-          if (!model) {
-            results.push({
-              provider: providerKey,
-              model: undefined,
-              profileId,
-              label,
-              source: "profile",
-              mode,
-              status: "no_model",
-              error: "No model available for probe",
-            });
-            continue;
-          }
-          targets.push({
-            provider: providerKey,
-            model,
-            profileId,
-            label,
-            source: "profile",
-            mode,
-          });
-        }
-        continue;
-      }
-
-      if (profileFilter.size > 0) continue;
-
-      const envKey = resolveEnvApiKey(providerKey);
-      const customKey = getCustomProviderApiKey(cfg, providerKey);
-      if (!envKey && !customKey) continue;
-
-      const label = envKey ? "env" : "models.json";
-      const source = envKey ? "env" : "models.json";
-      const mode = envKey?.source.includes("OAUTH_TOKEN") ? "oauth" : "api_key";
-
-      if (!model) {
-        results.push({
-          provider: providerKey,
-          model: undefined,
-          label,
-          source,
-          mode,
-          status: "no_model",
-          error: "No model available for probe",
-        });
-        continue;
-      }
-
-      targets.push({
-        provider: providerKey,
-        model,
-        label,
-        source,
-        mode,
-      });
-    }
-
-    return { targets, results };
-  });
-}
-
-async function probeTarget(params: {
-  cfg: ClawdbotConfig;
-  agentId: string;
-  agentDir: string;
-  workspaceDir: string;
-  sessionDir: string;
-  target: AuthProbeTarget;
-  timeoutMs: number;
-  maxTokens: number;
-}): Promise<AuthProbeResult> {
-  const { cfg, agentId, agentDir, workspaceDir, sessionDir, target, timeoutMs, maxTokens } = params;
-  if (!target.model) {
-    return {
-      provider: target.provider,
-      model: undefined,
-      profileId: target.profileId,
-      label: target.label,
-      source: target.source,
-      mode: target.mode,
-      status: "no_model",
-      error: "No model available for probe",
-    };
-  }
-
-  const sessionId = `probe-${target.provider}-${crypto.randomUUID()}`;
-  const sessionFile = resolveSessionTranscriptPath(sessionId, agentId);
-  await fs.mkdir(sessionDir, { recursive: true });
-
-  const start = Date.now();
-  try {
-    await runEmbeddedPiAgent({
-      sessionId,
-      sessionFile,
-      workspaceDir,
-      agentDir,
-      config: cfg,
-      prompt: PROBE_PROMPT,
-      provider: target.model.provider,
-      model: target.model.model,
-      authProfileId: target.profileId,
-      authProfileIdSource: target.profileId ? "user" : undefined,
-      timeoutMs,
-      runId: `probe-${crypto.randomUUID()}`,
-      lane: `auth-probe:${target.provider}:${target.profileId ?? target.source}`,
-      thinkLevel: "off",
-      reasoningLevel: "off",
-      verboseLevel: "off",
-      streamParams: { maxTokens },
-    });
-    return {
-      provider: target.provider,
-      model: `${target.model.provider}/${target.model.model}`,
-      profileId: target.profileId,
-      label: target.label,
-      source: target.source,
-      mode: target.mode,
-      status: "ok",
-      latencyMs: Date.now() - start,
-    };
-  } catch (err) {
-    const described = describeFailoverError(err);
-    return {
-      provider: target.provider,
-      model: `${target.model.provider}/${target.model.model}`,
-      profileId: target.profileId,
-      label: target.label,
-      source: target.source,
-      mode: target.mode,
-      status: toStatus(described.reason),
-      error: redactSecrets(described.message),
-      latencyMs: Date.now() - start,
-    };
-  }
-}
-
-async function runTargetsWithConcurrency(params: {
-  cfg: ClawdbotConfig;
-  targets: AuthProbeTarget[];
-  timeoutMs: number;
-  maxTokens: number;
-  concurrency: number;
-  onProgress?: (update: { completed: number; total: number; label?: string }) => void;
-}): Promise<AuthProbeResult[]> {
-  const { cfg, targets, timeoutMs, maxTokens, onProgress } = params;
-  const concurrency = Math.max(1, Math.min(targets.length || 1, params.concurrency));
-
-  const agentId = resolveDefaultAgentId(cfg);
-  const agentDir = resolveClawdbotAgentDir();
-  const workspaceDir = resolveAgentWorkspaceDir(cfg, agentId) ?? resolveDefaultAgentWorkspaceDir();
-  const sessionDir = resolveSessionTranscriptsDirForAgent(agentId);
-
-  await fs.mkdir(workspaceDir, { recursive: true });
-
-  let completed = 0;
-  const results: Array<AuthProbeResult | undefined> = Array.from({ length: targets.length });
-  let cursor = 0;
-
-  const worker = async () => {
-    while (true) {
-      const index = cursor;
-      cursor += 1;
-      if (index >= targets.length) return;
-      const target = targets[index];
-      onProgress?.({
-        completed,
-        total: targets.length,
-        label: `Probing ${target.provider}${target.profileId ? ` (${target.label})` : ""}`,
-      });
-      const result = await probeTarget({
-        cfg,
-        agentId,
-        agentDir,
-        workspaceDir,
-        sessionDir,
-        target,
-        timeoutMs,
-        maxTokens,
-      });
-      results[index] = result;
-      completed += 1;
-      onProgress?.({ completed, total: targets.length });
-    }
-  };
-
-  await Promise.all(Array.from({ length: concurrency }, () => worker()));
-
-  return results.filter((entry): entry is AuthProbeResult => Boolean(entry));
-}
-
-export async function runAuthProbes(params: {
-  cfg: ClawdbotConfig;
-  providers: string[];
-  modelCandidates: string[];
-  options: AuthProbeOptions;
-  onProgress?: (update: { completed: number; total: number; label?: string }) => void;
-}): Promise<AuthProbeSummary> {
-  const startedAt = Date.now();
-  const plan = await buildProbeTargets({
-    cfg: params.cfg,
-    providers: params.providers,
-    modelCandidates: params.modelCandidates,
-    options: params.options,
-  });
-
-  const totalTargets = plan.targets.length;
-  params.onProgress?.({ completed: 0, total: totalTargets });
-
-  const results = totalTargets
-    ? await runTargetsWithConcurrency({
-        cfg: params.cfg,
-        targets: plan.targets,
-        timeoutMs: params.options.timeoutMs,
-        maxTokens: params.options.maxTokens,
-        concurrency: params.options.concurrency,
-        onProgress: params.onProgress,
-      })
-    : [];
-
-  const finishedAt = Date.now();
-
-  return {
-    startedAt,
-    finishedAt,
-    durationMs: finishedAt - startedAt,
-    totalTargets,
-    options: params.options,
-    results: [...plan.results, ...results],
-  };
-}
-
-export function formatProbeLatency(latencyMs?: number | null) {
-  if (!latencyMs && latencyMs !== 0) return "-";
-  return formatMs(latencyMs);
-}
-
-export function groupProbeResults(results: AuthProbeResult[]): Map<string, AuthProbeResult[]> {
-  const map = new Map<string, AuthProbeResult[]>();
-  for (const result of results) {
-    const list = map.get(result.provider) ?? [];
-    list.push(result);
-    map.set(result.provider, list);
-  }
-  return map;
-}
-
-export function sortProbeResults(results: AuthProbeResult[]): AuthProbeResult[] {
-  return results.slice().sort((a, b) => {
-    const provider = a.provider.localeCompare(b.provider);
-    if (provider !== 0) return provider;
-    const aLabel = a.label || a.profileId || "";
-    const bLabel = b.label || b.profileId || "";
-    return aLabel.localeCompare(bLabel);
-  });
-}
-
-export function describeProbeSummary(summary: AuthProbeSummary): string {
-  if (summary.totalTargets === 0) return "No probe targets.";
-  return `Probed ${summary.totalTargets} target${summary.totalTargets === 1 ? "" : "s"} in ${formatMs(summary.durationMs)}`;
-}

src/commands/models/list.status-command.ts

@@ -11,15 +11,9 @@ import {
   resolveProfileUnusableUntilForDisplay,
 } from "../../agents/auth-profiles.js";
 import { resolveEnvApiKey } from "../../agents/model-auth.js";
-import {
+import { parseModelRef, resolveConfiguredModelRef } from "../../agents/model-selection.js";
-  buildModelAliasIndex,
-  parseModelRef,
-  resolveConfiguredModelRef,
-  resolveModelRefFromString,
-} from "../../agents/model-selection.js";
 import { CONFIG_PATH_CLAWDBOT, loadConfig } from "../../config/config.js";
 import { getShellEnvAppliedKeys, shouldEnableShellEnvFallback } from "../../infra/shell-env.js";
-import { withProgressTotals } from "../../cli/progress.js";
 import {
   formatUsageWindowSummary,
   loadProviderUsageSummary,
@@ -28,38 +22,17 @@ import {
 } from "../../infra/provider-usage.js";
 import type { RuntimeEnv } from "../../runtime.js";
 import { colorize, theme } from "../../terminal/theme.js";
-import { renderTable } from "../../terminal/table.js";
 import { formatCliCommand } from "../../cli/command-format.js";
 import { shortenHomePath } from "../../utils.js";
 import { resolveProviderAuthOverview } from "./list.auth-overview.js";
 import { isRich } from "./list.format.js";
-import {
-  describeProbeSummary,
-  formatProbeLatency,
-  runAuthProbes,
-  sortProbeResults,
-  type AuthProbeSummary,
-} from "./list.probe.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER, ensureFlagCompatibility } from "./shared.js";
 
 export async function modelsStatusCommand(
-  opts: {
+  opts: { json?: boolean; plain?: boolean; check?: boolean },
-    json?: boolean;
-    plain?: boolean;
-    check?: boolean;
-    probe?: boolean;
-    probeProvider?: string;
-    probeProfile?: string | string[];
-    probeTimeout?: string;
-    probeConcurrency?: string;
-    probeMaxTokens?: string;
-  },
   runtime: RuntimeEnv,
 ) {
   ensureFlagCompatibility(opts);
-  if (opts.plain && opts.probe) {
-    throw new Error("--probe cannot be used with --plain output.");
-  }
   const cfg = loadConfig();
   const resolved = resolveConfiguredModelRef({
     cfg,
@@ -166,69 +139,6 @@ export async function modelsStatusCommand(
     .filter((provider) => !providerAuthMap.has(provider))
     .sort((a, b) => a.localeCompare(b));
 
-  const probeProfileIds = (() => {
-    if (!opts.probeProfile) return [];
-    const raw = Array.isArray(opts.probeProfile) ? opts.probeProfile : [opts.probeProfile];
-    return raw
-      .flatMap((value) => String(value ?? "").split(","))
-      .map((value) => value.trim())
-      .filter(Boolean);
-  })();
-  const probeTimeoutMs = opts.probeTimeout ? Number(opts.probeTimeout) : 8000;
-  if (!Number.isFinite(probeTimeoutMs) || probeTimeoutMs <= 0) {
-    throw new Error("--probe-timeout must be a positive number (ms).");
-  }
-  const probeConcurrency = opts.probeConcurrency ? Number(opts.probeConcurrency) : 2;
-  if (!Number.isFinite(probeConcurrency) || probeConcurrency <= 0) {
-    throw new Error("--probe-concurrency must be > 0.");
-  }
-  const probeMaxTokens = opts.probeMaxTokens ? Number(opts.probeMaxTokens) : 8;
-  if (!Number.isFinite(probeMaxTokens) || probeMaxTokens <= 0) {
-    throw new Error("--probe-max-tokens must be > 0.");
-  }
-
-  const aliasIndex = buildModelAliasIndex({ cfg, defaultProvider: DEFAULT_PROVIDER });
-  const rawCandidates = [
-    rawModel || resolvedLabel,
-    ...fallbacks,
-    imageModel,
-    ...imageFallbacks,
-    ...allowed,
-  ].filter(Boolean);
-  const resolvedCandidates = rawCandidates
-    .map(
-      (raw) =>
-        resolveModelRefFromString({
-          raw: String(raw ?? ""),
-          defaultProvider: DEFAULT_PROVIDER,
-          aliasIndex,
-        })?.ref,
-    )
-    .filter((ref): ref is { provider: string; model: string } => Boolean(ref));
-  const modelCandidates = resolvedCandidates.map((ref) => `${ref.provider}/${ref.model}`);
-
-  let probeSummary: AuthProbeSummary | undefined;
-  if (opts.probe) {
-    probeSummary = await withProgressTotals(
-      { label: "Probing auth profiles…", total: 1 },
-      async (update) => {
-        return await runAuthProbes({
-          cfg,
-          providers,
-          modelCandidates,
-          options: {
-            provider: opts.probeProvider,
-            profileIds: probeProfileIds,
-            timeoutMs: probeTimeoutMs,
-            concurrency: probeConcurrency,
-            maxTokens: probeMaxTokens,
-          },
-          onProgress: update,
-        });
-      },
-    );
-  }
-
   const providersWithOauth = providerAuth
     .filter(
       (entry) =>
@@ -318,7 +228,6 @@ export async function modelsStatusCommand(
               profiles: authHealth.profiles,
               providers: authHealth.providers,
             },
-            probes: probeSummary,
           },
         },
         null,
@@ -497,118 +406,72 @@ export async function modelsStatusCommand(
   runtime.log(colorize(rich, theme.heading, "OAuth/token status"));
   if (oauthProfiles.length === 0) {
     runtime.log(colorize(rich, theme.muted, "- none"));
-  } else {
+    return;
-    const usageByProvider = new Map<string, string>();
+  }
-    const usageProviders = Array.from(
+
-      new Set(
+  const usageByProvider = new Map<string, string>();
-        oauthProfiles
+  const usageProviders = Array.from(
-          .map((profile) => resolveUsageProviderId(profile.provider))
+    new Set(
-          .filter((provider): provider is UsageProviderId => Boolean(provider)),
+      oauthProfiles
-      ),
+        .map((profile) => resolveUsageProviderId(profile.provider))
-    );
+        .filter((provider): provider is UsageProviderId => Boolean(provider)),
-    if (usageProviders.length > 0) {
+    ),
-      try {
+  );
-        const usageSummary = await loadProviderUsageSummary({
+  if (usageProviders.length > 0) {
-          providers: usageProviders,
+    try {
-          agentDir,
+      const usageSummary = await loadProviderUsageSummary({
-          timeoutMs: 3500,
+        providers: usageProviders,
+        agentDir,
+        timeoutMs: 3500,
+      });
+      for (const snapshot of usageSummary.providers) {
+        const formatted = formatUsageWindowSummary(snapshot, {
+          now: Date.now(),
+          maxWindows: 2,
+          includeResets: true,
         });
-        for (const snapshot of usageSummary.providers) {
+        if (formatted) {
-          const formatted = formatUsageWindowSummary(snapshot, {
+          usageByProvider.set(snapshot.provider, formatted);
-            now: Date.now(),
-            maxWindows: 2,
-            includeResets: true,
-          });
-          if (formatted) {
-            usageByProvider.set(snapshot.provider, formatted);
-          }
         }
-      } catch {
-        // ignore usage failures
-      }
-    }
-
-    const formatStatus = (status: string) => {
-      if (status === "ok") return colorize(rich, theme.success, "ok");
-      if (status === "static") return colorize(rich, theme.muted, "static");
-      if (status === "expiring") return colorize(rich, theme.warn, "expiring");
-      if (status === "missing") return colorize(rich, theme.warn, "unknown");
-      return colorize(rich, theme.error, "expired");
-    };
-
-    const profilesByProvider = new Map<string, typeof oauthProfiles>();
-    for (const profile of oauthProfiles) {
-      const current = profilesByProvider.get(profile.provider);
-      if (current) current.push(profile);
-      else profilesByProvider.set(profile.provider, [profile]);
-    }
-
-    for (const [provider, profiles] of profilesByProvider) {
-      const usageKey = resolveUsageProviderId(provider);
-      const usage = usageKey ? usageByProvider.get(usageKey) : undefined;
-      const usageSuffix = usage ? colorize(rich, theme.muted, ` usage: ${usage}`) : "";
-      runtime.log(`- ${colorize(rich, theme.heading, provider)}${usageSuffix}`);
-      for (const profile of profiles) {
-        const labelText = profile.label || profile.profileId;
-        const label = colorize(rich, theme.accent, labelText);
-        const status = formatStatus(profile.status);
-        const expiry =
-          profile.status === "static"
-            ? ""
-            : profile.expiresAt
-              ? ` expires in ${formatRemainingShort(profile.remainingMs)}`
-              : " expires unknown";
-        const source =
-          profile.source !== "store" ? colorize(rich, theme.muted, ` (${profile.source})`) : "";
-        runtime.log(`  - ${label} ${status}${expiry}${source}`);
       }
+    } catch {
+      // ignore usage failures
     }
   }
 
-  if (probeSummary) {
+  const formatStatus = (status: string) => {
-    runtime.log("");
+    if (status === "ok") return colorize(rich, theme.success, "ok");
-    runtime.log(colorize(rich, theme.heading, "Auth probes"));
+    if (status === "static") return colorize(rich, theme.muted, "static");
-    if (probeSummary.results.length === 0) {
+    if (status === "expiring") return colorize(rich, theme.warn, "expiring");
-      runtime.log(colorize(rich, theme.muted, "- none"));
+    if (status === "missing") return colorize(rich, theme.warn, "unknown");
-    } else {
+    return colorize(rich, theme.error, "expired");
-      const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+  };
-      const sorted = sortProbeResults(probeSummary.results);
+
-      const statusColor = (status: string) => {
+  const profilesByProvider = new Map<string, typeof oauthProfiles>();
-        if (status === "ok") return theme.success;
+  for (const profile of oauthProfiles) {
-        if (status === "rate_limit") return theme.warn;
+    const current = profilesByProvider.get(profile.provider);
-        if (status === "timeout" || status === "billing") return theme.warn;
+    if (current) current.push(profile);
-        if (status === "auth" || status === "format") return theme.error;
+    else profilesByProvider.set(profile.provider, [profile]);
-        if (status === "no_model") return theme.muted;
+  }
-        return theme.muted;
+
-      };
+  for (const [provider, profiles] of profilesByProvider) {
-      const rows = sorted.map((result) => {
+    const usageKey = resolveUsageProviderId(provider);
-        const status = colorize(rich, statusColor(result.status), result.status);
+    const usage = usageKey ? usageByProvider.get(usageKey) : undefined;
-        const latency = formatProbeLatency(result.latencyMs);
+    const usageSuffix = usage ? colorize(rich, theme.muted, ` usage: ${usage}`) : "";
-        const detail = result.error ? colorize(rich, theme.muted, result.error) : "";
+    runtime.log(`- ${colorize(rich, theme.heading, provider)}${usageSuffix}`);
-        const modelLabel = result.model ?? `${result.provider}/-`;
+    for (const profile of profiles) {
-        const modeLabel = result.mode ? ` ${colorize(rich, theme.muted, `(${result.mode})`)}` : "";
+      const labelText = profile.label || profile.profileId;
-        const profile = `${colorize(rich, theme.accent, result.label)}${modeLabel}`;
+      const label = colorize(rich, theme.accent, labelText);
-        const statusLabel = `${status}${colorize(rich, theme.muted, ` · ${latency}`)}`;
+      const status = formatStatus(profile.status);
-        return {
+      const expiry =
-          Model: colorize(rich, theme.heading, modelLabel),
+        profile.status === "static"
-          Profile: profile,
+          ? ""
-          Status: statusLabel,
+          : profile.expiresAt
-          Detail: detail,
+            ? ` expires in ${formatRemainingShort(profile.remainingMs)}`
-        };
+            : " expires unknown";
-      });
+      const source =
-      runtime.log(
+        profile.source !== "store" ? colorize(rich, theme.muted, ` (${profile.source})`) : "";
-        renderTable({
+      runtime.log(`  - ${label} ${status}${expiry}${source}`);
-          width: tableWidth,
-          columns: [
-            { key: "Model", header: "Model", minWidth: 18 },
-            { key: "Profile", header: "Profile", minWidth: 24 },
-            { key: "Status", header: "Status", minWidth: 12 },
-            { key: "Detail", header: "Detail", minWidth: 16, flex: true },
-          ],
-          rows,
-        }).trimEnd(),
-      );
-      runtime.log(colorize(rich, theme.muted, describeProbeSummary(probeSummary)));
     }
   }
 

src/daemon/service-audit.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { auditGatewayServiceConfig, SERVICE_AUDIT_CODES } from "./service-audit.js";
 import { buildMinimalServicePath } from "./service-env.js";
+import { auditGatewayServiceConfig, SERVICE_AUDIT_CODES } from "./service-audit.js";
 
 describe("auditGatewayServiceConfig", () => {
   it("flags bun runtime", async () => {

src/daemon/service-audit.ts

@@ -6,7 +6,7 @@ import {
   isVersionManagedNodePath,
   resolveSystemNodePath,
 } from "./runtime-paths.js";
-import { getMinimalServicePathPartsFromEnv } from "./service-env.js";
+import { getMinimalServicePathParts } from "./service-env.js";
 import { resolveSystemdUserUnitPath } from "./systemd.js";
 
 export type GatewayServiceCommand = {
@@ -220,7 +220,7 @@ function auditGatewayServicePath(
     return;
   }
 
-  const expected = getMinimalServicePathPartsFromEnv({ platform, env });
+  const expected = getMinimalServicePathParts({ platform, home: env.HOME, env });
   const parts = servicePath
     .split(getPathModule(platform).delimiter)
     .map((entry) => entry.trim())

src/daemon/service-env.test.ts

@@ -5,7 +5,6 @@ import {
   buildNodeServiceEnvironment,
   buildServiceEnvironment,
   getMinimalServicePathParts,
-  getMinimalServicePathPartsFromEnv,
 } from "./service-env.js";
 
 describe("getMinimalServicePathParts - Linux user directories", () => {
@@ -72,10 +71,10 @@ describe("getMinimalServicePathParts - Linux user directories", () => {
   });
 
   it("includes env-configured bin roots when HOME is set on Linux", () => {
-    const result = getMinimalServicePathPartsFromEnv({
+    const result = getMinimalServicePathParts({
       platform: "linux",
+      home: "/home/testuser",
       env: {
-        HOME: "/home/testuser",
         PNPM_HOME: "/opt/pnpm",
         NPM_CONFIG_PREFIX: "/opt/npm",
         BUN_INSTALL: "/opt/bun",

src/daemon/service-env.ts

@@ -55,7 +55,7 @@ export function resolveLinuxUserBinDirs(
     return base.endsWith(`/${subdir}`) ? base : path.posix.join(base, subdir);
   };
 
-  // Env-configured bin roots (override defaults when present).
+  // Env-configured bin roots (override defaults when present)
   add(env?.PNPM_HOME);
   add(appendSubdir(env?.NPM_CONFIG_PREFIX, "bin"));
   add(appendSubdir(env?.BUN_INSTALL, "bin"));
@@ -105,15 +105,6 @@ export function getMinimalServicePathParts(options: MinimalServicePathOptions =
   return parts;
 }
 
-export function getMinimalServicePathPartsFromEnv(options: BuildServicePathOptions = {}): string[] {
-  const env = options.env ?? process.env;
-  return getMinimalServicePathParts({
-    ...options,
-    home: options.home ?? env.HOME,
-    env,
-  });
-}
-
 export function buildMinimalServicePath(options: BuildServicePathOptions = {}): string {
   const env = options.env ?? process.env;
   const platform = options.platform ?? process.platform;
@@ -121,7 +112,10 @@ export function buildMinimalServicePath(options: BuildServicePathOptions = {}):
     return env.PATH ?? "";
   }
 
-  return getMinimalServicePathPartsFromEnv({ ...options, env }).join(path.delimiter);
+  return getMinimalServicePathParts({
+    ...options,
+    home: options.home ?? env.HOME,
+  }).join(path.delimiter);
 }
 
 export function buildServiceEnvironment(params: {

src/discord/monitor.slash.test.ts

@@ -1,5 +1,4 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { createReplyDispatcherWithTyping } from "../auto-reply/reply/reply-dispatcher.js";
 
 const dispatchMock = vi.fn();
 
@@ -21,34 +20,15 @@ vi.mock("@buape/carbon", () => ({
   },
 }));
 
-vi.mock("../auto-reply/dispatch.js", async (importOriginal) => {
+vi.mock("../auto-reply/reply/dispatch-from-config.js", () => ({
-  const actual = await importOriginal<typeof import("../auto-reply/dispatch.js")>();
+  dispatchReplyFromConfig: (...args: unknown[]) => dispatchMock(...args),
-  return {
+}));
-    ...actual,
-    dispatchInboundMessage: (...args: unknown[]) => dispatchMock(...args),
-    dispatchInboundMessageWithDispatcher: (...args: unknown[]) => dispatchMock(...args),
-    dispatchInboundMessageWithBufferedDispatcher: (...args: unknown[]) => dispatchMock(...args),
-  };
-});
 
 beforeEach(() => {
-  dispatchMock.mockReset().mockImplementation(async (params) => {
+  dispatchMock.mockReset().mockImplementation(async ({ dispatcher }) => {
-    if ("dispatcher" in params && params.dispatcher) {
+    dispatcher.sendToolResult({ text: "tool update" });
-      params.dispatcher.sendToolResult({ text: "tool update" });
+    dispatcher.sendFinalReply({ text: "final reply" });
-      params.dispatcher.sendFinalReply({ text: "final reply" });
+    return { queuedFinal: true, counts: { tool: 1, block: 0, final: 1 } };
-      return { queuedFinal: true, counts: { tool: 1, block: 0, final: 1 } };
-    }
-    if ("dispatcherOptions" in params && params.dispatcherOptions) {
-      const { dispatcher, markDispatchIdle } = createReplyDispatcherWithTyping(
-        params.dispatcherOptions,
-      );
-      dispatcher.sendToolResult({ text: "tool update" });
-      dispatcher.sendFinalReply({ text: "final reply" });
-      await dispatcher.waitForIdle();
-      markDispatchIdle();
-      return { queuedFinal: true, counts: dispatcher.getQueuedCounts() };
-    }
-    return { queuedFinal: false, counts: { tool: 0, block: 0, final: 0 } };
   });
 });
 

src/discord/monitor.test.ts

@@ -377,63 +377,12 @@ describe("discord mention gating", () => {
       resolveDiscordShouldRequireMention({
         isGuildMessage: true,
         isThread: true,
-        botId: "bot123",
-        threadOwnerId: "bot123",
         channelConfig,
         guildInfo,
       }),
     ).toBe(false);
   });
 
-  it("requires mention inside user-created threads with autoThread enabled", () => {
-    const guildInfo: DiscordGuildEntryResolved = {
-      requireMention: true,
-      channels: {
-        general: { allow: true, autoThread: true },
-      },
-    };
-    const channelConfig = resolveDiscordChannelConfig({
-      guildInfo,
-      channelId: "1",
-      channelName: "General",
-      channelSlug: "general",
-    });
-    expect(
-      resolveDiscordShouldRequireMention({
-        isGuildMessage: true,
-        isThread: true,
-        botId: "bot123",
-        threadOwnerId: "user456",
-        channelConfig,
-        guildInfo,
-      }),
-    ).toBe(true);
-  });
-
-  it("requires mention when thread owner is unknown", () => {
-    const guildInfo: DiscordGuildEntryResolved = {
-      requireMention: true,
-      channels: {
-        general: { allow: true, autoThread: true },
-      },
-    };
-    const channelConfig = resolveDiscordChannelConfig({
-      guildInfo,
-      channelId: "1",
-      channelName: "General",
-      channelSlug: "general",
-    });
-    expect(
-      resolveDiscordShouldRequireMention({
-        isGuildMessage: true,
-        isThread: true,
-        botId: "bot123",
-        channelConfig,
-        guildInfo,
-      }),
-    ).toBe(true);
-  });
-
   it("inherits parent channel mention rules for threads", () => {
     const guildInfo: DiscordGuildEntryResolved = {
       requireMention: true,