fix: adjust systemd ExecStart escape test (#995 ) (thanks @roshanasingh4)

Fix systemd ExecStart parsing whitespace
2026-01-16 06:03:17 +00:00 · 2026-01-16 05:41:30 +00:00
74 changed files with 17837 additions and 16919 deletions
@@ -116,14 +116,6 @@
  - launchd PATH is minimal; ensure the app’s launch agent PATH includes standard system paths plus your pnpm bin (typically `$HOME/Library/pnpm`) so `pnpm`/`clawdbot` binaries resolve when invoked via `clawdbot-mac`.
 - For manual `clawdbot message send` messages that include `!`, use the heredoc pattern noted below to avoid the Bash tool’s escaping.

-## NPM + 1Password (publish/verify)
- Use the 1password skill; all `op` commands must run inside a fresh tmux session.
- Sign in: `eval "$(op signin --account my.1password.com)"` (app unlocked + integration on).
- OTP: `op read 'op://Private/Npmjs/one-time password?attribute=otp'`.
- Publish: `npm publish --access public --otp="<otp>"` (run from the package dir).
- Verify without local npmrc side effects: `npm view <pkg> version --userconfig "$(mktemp)"`.
- Kill the tmux session after publish.
-
 ## Exclamation Mark Escaping Workaround
 The Claude Code Bash tool escapes `!` to `\\!` in command arguments. When using `clawdbot message send` with messages containing exclamation marks, use heredoc syntax:

@@ -26,6 +26,7 @@
 - Fix: guard model fallback against undefined provider/model values. (#954) — thanks @roshanasingh4.
 - Fix: refactor session store updates, add chat.inject, and harden subagent cleanup flow. (#944) — thanks @tyler6204.
 - Fix: clean up suspended CLI processes across backends. (#978) — thanks @Nachx639.
+- Fix: parse systemd ExecStart arguments when whitespace is present. (#995) — thanks @roshanasingh4.
 - CLI: add `--json` output for `clawdbot daemon` lifecycle/install commands.
 - Memory: make `node-llama-cpp` an optional dependency (avoid Node 25 install failures) and improve local-embeddings fallback/errors.
 - Browser: add `snapshot refs=aria` (Playwright aria-ref ids) for self-resolving refs across `snapshot` → `act`.
@@ -36,10 +37,8 @@
 - Telegram: add bidirectional reaction support with configurable notifications and agent guidance. (#964) — thanks @bohdanpodvirnyi.
 - Telegram: skip `message_thread_id=1` for General topic sends while keeping typing indicators. (#848) — thanks @azade-c.
 - Discord: allow allowlisted guilds without channel lists to receive messages when `groupPolicy="allowlist"`. — thanks @thewilloftheshadow.
- Discord: allow emoji/sticker uploads + channel actions in config defaults. (#870) — thanks @JDIVE.
 - Fix: sanitize user-facing error text + strip `<final>` tags across reply pipelines. (#975) — thanks @ThomsenDrake.
 - Fix: normalize pairing CLI aliases, allow extension channels, and harden Zalo webhook payload parsing. (#991) — thanks @longmaba.
- Fix: stream block replies between tool calls when block streaming is off. (#992) — thanks @tyler6204.

 ## 2026.1.14-1

@@ -119,7 +119,7 @@ dependencies {
  testImplementation("io.kotest:kotest-runner-junit5-jvm:6.0.7")
  testImplementation("io.kotest:kotest-assertions-core-jvm:6.0.7")
  testImplementation("org.robolectric:robolectric:4.16")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine:6.0.2")
+  testRuntimeOnly("org.junit.vintage:junit-vintage-engine:6.0.1")
 }

 tasks.withType<Test>().configureEach {
@@ -212,7 +212,7 @@ class BridgeSession(
      connectWithSocket(endpoint, hello, null)
    }

-  private suspend fun connectWithSocket(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) {
+  private fun connectWithSocket(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) {
    val socket =
      createBridgeSocket(tls) { fingerprint ->
        onTlsFingerprint?.invoke(tls?.stableId ?: endpoint.stableId, fingerprint)
@@ -260,15 +260,15 @@ class BridgeSession(
        else -> throw IllegalStateException("unexpected bridge response")
      }

-      while (scope.isActive) {
-        val line = reader.readLine() ?: break
-        val frame = json.parseToJsonElement(line).asObjectOrNull() ?: continue
-        when (frame["type"].asStringOrNull()) {
-          "event" -> {
-            val event = frame["event"].asStringOrNull() ?: continue
-            val payload = frame["payloadJSON"].asStringOrNull()
-            onEvent(event, payload)
-          }
+        while (scope.isActive) {
+          val line = reader.readLine() ?: break
+          val frame = json.parseToJsonElement(line).asObjectOrNull() ?: continue
+          when (frame["type"].asStringOrNull()) {
+            "event" -> {
+              val event = frame["event"].asStringOrNull() ?: return@withContext
+              val payload = frame["payloadJSON"].asStringOrNull()
+              onEvent(event, payload)
+            }
            "ping" -> {
              val id = frame["id"].asStringOrNull() ?: ""
              conn.sendJson(buildJsonObject { put("type", JsonPrimitive("pong")); put("id", JsonPrimitive(id)) })
@@ -314,20 +314,20 @@ class BridgeSession(
                },
              )
            }
-          "invoke-res" -> {
-            // gateway->node only (ignore)
+            "invoke-res" -> {
+              // gateway->node only (ignore)
+            }
          }
        }
+      } finally {
+        currentConnection = null
+        for ((_, waiter) in pending) {
+          waiter.cancel()
+        }
+        pending.clear()
+        conn.closeQuietly()
      }
-    } finally {
-      currentConnection = null
-      for ((_, waiter) in pending) {
-        waiter.cancel()
-      }
-      pending.clear()
-      conn.closeQuietly()
    }
-  }

  private fun buildHelloJson(hello: Hello): JsonObject =
    buildJsonObject {
@@ -1,6 +1,5 @@
 package com.clawdbot.android.bridge

-import android.annotation.SuppressLint
 import java.net.Socket
 import java.security.MessageDigest
 import java.security.SecureRandom
@@ -22,7 +21,6 @@ fun createBridgeSocket(params: BridgeTlsParams?, onStore: ((String) -> Unit)? =
  if (params == null) return Socket()
  val expected = params.expectedFingerprint?.let(::normalizeFingerprint)
  val defaultTrust = defaultTrustManager()
-  @SuppressLint("CustomX509TrustManager")
  val trustManager =
    object : X509TrustManager {
      override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
@@ -32,10 +32,11 @@ func makeBridgeTLSOptions(_ params: BridgeTLSParams?) -> NWProtocolTLS.Options?
    sec_protocol_options_set_verify_block(
        options.securityProtocolOptions,
        { _, trust, complete in
-            let trustRef = sec_trust_copy_ref(trust).takeRetainedValue()
-            if let chain = SecTrustCopyCertificateChain(trustRef) as? [SecCertificate],
-               let cert = chain.first
-            {
+            guard let trust else {
+                complete(false)
+                return
+            }
+            if let cert = SecTrustGetCertificateAtIndex(trust, 0) {
                let data = SecCertificateCopyData(cert) as Data
                let fingerprint = sha256Hex(data)
                if let expected {
@@ -48,7 +49,7 @@ func makeBridgeTLSOptions(_ params: BridgeTLSParams?) -> NWProtocolTLS.Options?
                    return
                }
            }
-            let ok = SecTrustEvaluateWithError(trustRef, nil)
+            let ok = SecTrustEvaluateWithError(trust, nil)
            complete(ok)
        },
        DispatchQueue(label: "com.clawdbot.bridge.tls.verify"))
@@ -190,7 +190,14 @@ actor CameraController {
    }

    func listDevices() -> [CameraDeviceInfo] {
-        return Self.discoverVideoDevices().map { device in
+        let types: [AVCaptureDevice.DeviceType] = [
+            .builtInWideAngleCamera,
+        ]
+        let session = AVCaptureDevice.DiscoverySession(
+            deviceTypes: types,
+            mediaType: .video,
+            position: .unspecified)
+        return session.devices.map { device in
            CameraDeviceInfo(
                id: device.uniqueID,
                name: device.localizedName,
@@ -225,7 +232,7 @@ actor CameraController {
        deviceId: String?) -> AVCaptureDevice?
    {
        if let deviceId, !deviceId.isEmpty {
-            if let match = Self.discoverVideoDevices().first(where: { $0.uniqueID == deviceId }) {
+            if let match = AVCaptureDevice.devices(for: .video).first(where: { $0.uniqueID == deviceId }) {
                return match
            }
        }
@@ -245,24 +252,6 @@ actor CameraController {
        }
    }

-    private nonisolated static func discoverVideoDevices() -> [AVCaptureDevice] {
-        let types: [AVCaptureDevice.DeviceType] = [
-            .builtInWideAngleCamera,
-            .builtInUltraWideCamera,
-            .builtInTelephotoCamera,
-            .builtInDualCamera,
-            .builtInDualWideCamera,
-            .builtInTripleCamera,
-            .builtInTrueDepthCamera,
-            .builtInLiDARDepthCamera,
-        ]
-        let session = AVCaptureDevice.DiscoverySession(
-            deviceTypes: types,
-            mediaType: .video,
-            position: .unspecified)
-        return session.devices
-    }
-
    nonisolated static func clampQuality(_ quality: Double?) -> Double {
        let q = quality ?? 0.9
        return min(1.0, max(0.05, q))
@@ -137,11 +137,9 @@ final class ScreenRecordService: @unchecked Sendable {
        recordQueue: DispatchQueue) -> @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void
    {
        { sample, type, error in
-            let sampleBox = UncheckedSendableBox(value: sample)
            // ReplayKit can call the capture handler on a background queue.
            // Serialize writes to avoid queue asserts.
            recordQueue.async {
-                let sample = sampleBox.value
                if let error {
                    state.withLock { state in
                        if state.handlerError == nil { state.handlerError = error }
@@ -69,10 +69,7 @@ extension GatewayLaunchAgentManager {
    }

    private static func readDaemonLoaded() async -> Bool? {
-        let result = await self.runDaemonCommandResult(
-            ["status", "--json", "--no-probe"],
-            timeout: 15,
-            quiet: true)
+        let result = await self.runDaemonCommand(["status", "--json", "--no-probe"], timeout: 15, quiet: true)
        guard result.success, let payload = result.payload else { return nil }
        guard
            let json = try? JSONSerialization.jsonObject(with: payload) as? [String: Any],
@@ -92,13 +92,10 @@ struct GeneralSettings: View {
                                Text(policy.title).tag(policy)
                            }
                        }
-                        .labelsHidden()
-                        .pickerStyle(.menu)
+                        .pickerStyle(.segmented)

                        Text("""
-                        Controls remote command execution on this Mac when it is paired as a node. \
-                        "Always Ask" prompts on each command; "Always Allow" runs without prompts; \
-                        "Never" disables `system.run`.
+                        Controls remote command execution on this Mac when it is paired as a node. "Always Ask" prompts on each command; "Always Allow" runs without prompts; "Never" disables `system.run`.
                        """)
                        .font(.footnote)
                        .foregroundStyle(.tertiary)
@@ -114,8 +111,7 @@ struct GeneralSettings: View {
                            Text("While Using").tag(ClawdbotLocationMode.whileUsing.rawValue)
                            Text("Always").tag(ClawdbotLocationMode.always.rawValue)
                        }
-                        .labelsHidden()
-                        .pickerStyle(.menu)
+                        .pickerStyle(.segmented)

                        Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
                            .disabled(self.locationMode == .off)
@@ -460,7 +460,7 @@ actor MacNodeBridgeSession {
        do {
            try await self.send(response)
        } catch {
-            self.logInvokeSendFailure(error)
+            await self.logInvokeSendFailure(error)
        }
    }

@@ -19,14 +19,14 @@ enum MacNodeBridgeTLSStore {
    }

    static func loadFingerprint(stableID: String) -> String? {
-        let key = self.keyPrefix + stableID
-        let raw = self.defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let key = keyPrefix + stableID
+        let raw = defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines)
        return raw?.isEmpty == false ? raw : nil
    }

    static func saveFingerprint(_ value: String, stableID: String) {
-        let key = self.keyPrefix + stableID
-        self.defaults.set(value, forKey: key)
+        let key = keyPrefix + stableID
+        defaults.set(value, forKey: key)
    }
 }

@@ -40,10 +40,11 @@ func makeMacNodeTLSOptions(_ params: MacNodeBridgeTLSParams?) -> NWProtocolTLS.O
    sec_protocol_options_set_verify_block(
        options.securityProtocolOptions,
        { _, trust, complete in
-            let trustRef = sec_trust_copy_ref(trust).takeRetainedValue()
-            if let chain = SecTrustCopyCertificateChain(trustRef) as? [SecCertificate],
-               let cert = chain.first
-            {
+            guard let trust else {
+                complete(false)
+                return
+            }
+            if let cert = SecTrustGetCertificateAtIndex(trust, 0) {
                let data = SecCertificateCopyData(cert) as Data
                let fingerprint = sha256Hex(data)
                if let expected {
@@ -56,7 +57,7 @@ func makeMacNodeTLSOptions(_ params: MacNodeBridgeTLSParams?) -> NWProtocolTLS.O
                    return
                }
            }
-            let ok = SecTrustEvaluateWithError(trustRef, nil)
+            let ok = SecTrustEvaluateWithError(trust, nil)
            complete(ok)
        },
        DispatchQueue(label: "com.clawdbot.macos.bridge.tls.verify"))
@@ -70,5 +71,5 @@ private func sha256Hex(_ data: Data) -> String {
 }

 private func normalizeMacNodeFingerprint(_ raw: String) -> String {
-    raw.lowercased().filter(\.isHexDigit)
+    raw.lowercased().filter { $0.isHexDigit }
 }
@@ -463,7 +463,7 @@ final class MacNodeModeCoordinator {
        }
    }

-    private nonisolated static func targetFromResult(_ result: NWBrowser.Result) -> BridgeTarget? {
+    private static func targetFromResult(_ result: NWBrowser.Result) -> BridgeTarget? {
        let endpoint = result.endpoint
        guard case .service = endpoint else { return nil }
        let stableID = BridgeEndpointID.stableID(endpoint)
@@ -477,7 +477,7 @@ final class MacNodeModeCoordinator {
        return BridgeTarget(endpoint: endpoint, stableID: stableID, tls: tlsParams)
    }

-    private nonisolated static func resolveDiscoveredTLSParams(
+    private static func resolveDiscoveredTLSParams(
        stableID: String,
        tlsEnabled: Bool,
        tlsFingerprintSha256: String?) -> MacNodeBridgeTLSParams?
@@ -503,7 +503,7 @@ final class MacNodeModeCoordinator {
        return nil
    }

-    private nonisolated static func resolveManualTLSParams(stableID: String) -> MacNodeBridgeTLSParams? {
+    private static func resolveManualTLSParams(stableID: String) -> MacNodeBridgeTLSParams? {
        if let stored = MacNodeBridgeTLSStore.loadFingerprint(stableID: stableID) {
            return MacNodeBridgeTLSParams(
                required: true,
@@ -519,12 +519,12 @@ final class MacNodeModeCoordinator {
            storeKey: stableID)
    }

-    private nonisolated static func txtValue(_ dict: [String: String], key: String) -> String? {
+    private static func txtValue(_ dict: [String: String], key: String) -> String? {
        let raw = dict[key]?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
        return raw.isEmpty ? nil : raw
    }

-    private nonisolated static func txtBoolValue(_ dict: [String: String], key: String) -> Bool {
+    private static func txtBoolValue(_ dict: [String: String], key: String) -> Bool {
        guard let raw = self.txtValue(dict, key: key)?.lowercased() else { return false }
        return raw == "1" || raw == "true" || raw == "yes"
    }
@@ -586,8 +586,8 @@ actor MacNodeRuntime {
            let key = rawKey.trimmingCharacters(in: .whitespacesAndNewlines)
            guard !key.isEmpty else { continue }
            let upper = key.uppercased()
-            if self.blockedEnvKeys.contains(upper) { continue }
-            if self.blockedEnvPrefixes.contains(where: { upper.hasPrefix($0) }) { continue }
+            if blockedEnvKeys.contains(upper) { continue }
+            if blockedEnvPrefixes.contains(where: { upper.hasPrefix($0) }) { continue }
            merged[key] = value
        }
        return merged
@@ -10,11 +10,11 @@ enum SystemRunPolicy: String, CaseIterable, Identifiable {
    var title: String {
        switch self {
        case .never:
-            "Never"
+            return "Never"
        case .ask:
-            "Always Ask"
+            return "Always Ask"
        case .always:
-            "Always Allow"
+            return "Always Allow"
        }
    }

@@ -75,13 +75,13 @@ enum SystemRunAllowlist {

    static func contains(_ argv: [String], defaults: UserDefaults = .standard) -> Bool {
        let key = key(for: argv)
-        return self.load(from: defaults).contains(key)
+        return load(from: defaults).contains(key)
    }

    static func add(_ argv: [String], defaults: UserDefaults = .standard) {
        let key = key(for: argv)
        guard !key.isEmpty else { return }
-        var allowlist = self.load(from: defaults)
+        var allowlist = load(from: defaults)
        if allowlist.insert(key).inserted {
            MacNodeConfigFile.setSystemRunAllowlist(Array(allowlist).sorted())
        }
@@ -227,8 +227,6 @@ Outbound Discord API calls retry on rate limits (429) using Discord `retry_after
      actions: {
        reactions: true,
        stickers: true,
-        emojiUploads: true,
-        stickerUploads: true,
        polls: true,
        permissions: true,
        messages: true,
@@ -239,7 +237,6 @@ Outbound Discord API calls retry on rate limits (429) using Discord `retry_after
        roleInfo: true,
        roles: false,
        channelInfo: true,
-        channels: true,
        voiceStatus: true,
        events: true,
        moderation: false
@@ -307,9 +304,8 @@ ack reaction after the bot replies.
 - `retry`: retry policy for outbound Discord API calls (attempts, minDelayMs, maxDelayMs, jitter).
 - `actions`: per-action tool gates; omit to allow all (set `false` to disable).
  - `reactions` (covers react + read reactions)
-  - `stickers`, `emojiUploads`, `stickerUploads`, `polls`, `permissions`, `messages`, `threads`, `pins`, `search`
+  - `stickers`, `polls`, `permissions`, `messages`, `threads`, `pins`, `search`
  - `memberInfo`, `roleInfo`, `channelInfo`, `voiceStatus`, `events`
-  - `channels` (create/edit/delete channels + categories + permissions)
  - `roles` (role add/remove, default `false`)
  - `moderation` (timeout/kick/ban, default `false`)

@@ -325,8 +321,6 @@ Reaction notifications use `guilds.<id>.reactionNotifications`:
 | --- | --- | --- |
 | reactions | enabled | React + list reactions + emojiList |
 | stickers | enabled | Send stickers |
-| emojiUploads | enabled | Upload emojis |
-| stickerUploads | enabled | Upload stickers |
 | polls | enabled | Create polls |
 | permissions | enabled | Channel permission snapshot |
 | messages | enabled | Read/send/edit/delete |
@@ -336,7 +330,6 @@ Reaction notifications use `guilds.<id>.reactionNotifications`:
 | memberInfo | enabled | Member info |
 | roleInfo | enabled | Role list |
 | channelInfo | enabled | Channel info + list |
-| channels | enabled | Channel/category management |
 | voiceStatus | enabled | Voice state lookup |
 | events | enabled | List/create scheduled events |
 | roles | disabled | Role add/remove |
@@ -1,41 +0,0 @@
---
-summary: "CLI reference for `clawdbot config` (get/set/unset config values)"
-read_when:
-  - You want to read or edit config non-interactively
---
-
-# `clawdbot config`
-
-Config helpers: get/set/unset values by path. Run without a subcommand to open
-the configure wizard (same as `clawdbot configure`).
-
-## Examples
-
-```bash
-clawdbot config get browser.executablePath
-clawdbot config set browser.executablePath "/usr/bin/google-chrome"
-clawdbot config set agents.defaults.heartbeat.every "2h"
-clawdbot config unset tools.web.search.apiKey
-```
-
-## Paths
-
-Paths use dot or bracket notation:
-
-```bash
-clawdbot config get agents.defaults.workspace
-clawdbot config get agents.list[0].id
-```
-
-## Values
-
-Values are parsed as JSON5 when possible; otherwise they are treated as strings.
-Use `--json` to require JSON5 parsing.
-
-```bash
-clawdbot config set agents.defaults.heartbeat.every "0m"
-clawdbot config set gateway.port 19001 --json
-clawdbot config set channels.whatsapp.groups '["*"]' --json
-```
-
-Restart the gateway after edits.
@@ -1,19 +1,15 @@
 ---
-summary: "CLI reference for `clawdbot configure` (interactive configuration prompts)"
+summary: "CLI reference for `clawdbot configure` / `clawdbot config` (interactive configuration prompts)"
 read_when:
  - You want to tweak credentials, devices, or agent defaults interactively
 ---

-# `clawdbot configure`
+# `clawdbot configure` (alias: `config`)

 Interactive prompt to set up credentials, devices, and agent defaults.

-Tip: `clawdbot config` without a subcommand opens the same wizard. Use
-`clawdbot config get|set|unset` for non-interactive edits.
-
 Related:
 - Gateway configuration reference: [Configuration](/gateway/configuration)
- Config CLI: [Config](/cli/config)

 Notes:
 - Choosing where the Gateway runs always updates `gateway.mode`. You can select "Continue" without other sections if that is all you need.
@@ -13,8 +13,7 @@ This page describes the current CLI behavior. If commands change, update this do

 - [`setup`](/cli/setup)
 - [`onboard`](/cli/onboard)
- [`configure`](/cli/configure)
- [`config`](/cli/config)
+- [`configure`](/cli/configure) (alias: `config`)
 - [`doctor`](/cli/doctor)
 - [`dashboard`](/cli/dashboard)
 - [`reset`](/cli/reset)
@@ -84,11 +83,7 @@ Palette source of truth: `src/terminal/palette.ts` (aka “lobster seam”).
 clawdbot [--dev] [--profile <name>] <command>
  setup
  onboard
-  configure
-  config
-    get
-    set
-    unset
+  configure (alias: config)
  doctor
  security
    audit
@@ -315,18 +310,9 @@ Options:
 - `--node-manager <npm|pnpm|bun>` (pnpm recommended; bun not recommended for Gateway runtime)
 - `--json`

-### `configure`
+### `configure` / `config`
 Interactive configuration wizard (models, channels, skills, gateway).

-### `config`
-Non-interactive config helpers (get/set/unset). Running `clawdbot config` with no
-subcommand launches the wizard.
-
-Subcommands:
- `config get <path>`: print a config value (dot/bracket path).
- `config set <path> <value>`: set a value (JSON5 or raw string).
- `config unset <path>`: remove a value.
-
 ### `doctor`
 Health checks + quick fixes (config + gateway + legacy services).

@@ -21,8 +21,6 @@ clawdbot plugins info <id>
 clawdbot plugins enable <id>
 clawdbot plugins disable <id>
 clawdbot plugins doctor
-clawdbot plugins update <id>
-clawdbot plugins update --all
 ```

 ### Install
@@ -33,12 +31,3 @@ clawdbot plugins install <npm-spec>

 Security note: treat plugin installs like running code. Prefer pinned versions.

-### Update
-
-```bash
-clawdbot plugins update <id>
-clawdbot plugins update --all
-clawdbot plugins update <id> --dry-run
-```
-
-Updates only apply to plugins installed from npm (tracked in `plugins.installs`).
@@ -169,20 +169,6 @@ The agent was interrupted mid-response.

 **Fix:** Just send another message. The session continues.

-### "Agent failed before reply: Unknown model: anthropic/claude-haiku-3-5"
-
-Clawdbot intentionally rejects **older/insecure models** (especially those more
-vulnerable to prompt injection). If you see this error, the model name is no
-longer supported.
-
-**Fix:**
- Pick a **latest** model for the provider and update your config or model alias.
- If you’re unsure which models are available, run `clawdbot models list` or
-  `clawdbot models scan` and choose a supported one.
- Check gateway logs for the detailed failure reason.
-
-See also: [Models CLI](/cli/models) and [Model providers](/concepts/model-providers).
-
 ### Messages Not Triggering

 **Check 1:** Is the sender allowlisted?
@@ -320,139 +306,6 @@ Clawdbot keeps conversation history in memory.
 }
 ```

-## Common troubleshooting
-
-### “All models failed” — what should I check first?
-
- **Credentials** present for the provider(s) being tried (auth profiles + env vars).
- **Model routing**: confirm `agents.defaults.model.primary` and fallbacks are models you can access.
- **Gateway logs** in `/tmp/clawdbot/…` for the exact provider error.
- **Model status**: use `/model status` (chat) or `clawdbot models status` (CLI).
-
-### I’m running on my personal WhatsApp number — why is self-chat weird?
-
-Enable self-chat mode and allowlist your own number:
-
-```json5
-{
-  channels: {
-    whatsapp: {
-      selfChatMode: true,
-      dmPolicy: "allowlist",
-      allowFrom: ["+15555550123"]
-    }
-  }
-}
-```
-
-See [WhatsApp setup](/channels/whatsapp).
-
-### WhatsApp logged me out. How do I re‑auth?
-
-Run the login command again and scan the QR code:
-
-```bash
-clawdbot channels login
-```
-
-### Build errors on `main` — what’s the standard fix path?
-
-1) `git pull origin main && pnpm install`
-2) `pnpm clawdbot doctor`
-3) Check GitHub issues or Discord
-4) Temporary workaround: check out an older commit
-
-### npm install fails (allow-build-scripts / missing tar or yargs). What now?
-
-If you’re running from source, use the repo’s package manager: **pnpm** (preferred).
-The repo declares `packageManager: "pnpm@…"`, and pnpm patches are tracked in `pnpm.patchedDependencies`.
-
-Typical recovery:
-```bash
-git status   # ensure you’re in the repo root
-pnpm install
-pnpm build
-pnpm clawdbot doctor
-clawdbot daemon restart
-```
-
-Why: pnpm is the configured package manager for this repo, and the dependency
-patching workflow relies on it.
-
-### How do I switch between git installs and npm installs?
-
-Use the **website installer** and select the install method with a flag. It
-upgrades in place and rewrites the gateway service to point at the new install.
-
-Switch **to git install**:
-```bash
-curl -fsSL https://clawd.bot/install.sh | bash -s -- --install-method git --no-onboard
-```
-
-Switch **to npm global**:
-```bash
-curl -fsSL https://clawd.bot/install.sh | bash
-```
-
-Notes:
- The git flow only rebases if the repo is clean. Commit or stash changes first.
- After switching, run:
-  ```bash
-  clawdbot doctor
-  clawdbot daemon restart
-  ```
-
-### Telegram block streaming isn’t splitting text between tool calls. Why?
-
-Block streaming only sends **completed text blocks**. Common reasons you see a single message:
- `agents.defaults.blockStreamingDefault` is still `"off"`.
- `channels.telegram.blockStreaming` is set to `false`.
- `channels.telegram.streamMode` is `partial` or `block` **and draft streaming is active**
-  (private chat + topics). Draft streaming disables block streaming in that case.
- Your `minChars` / coalesce settings are too high, so chunks get merged.
- The model emits one large text block (no mid‑reply flush points).
-
-Fix checklist:
-1) Put block streaming settings under `agents.defaults`, not the root.
-2) Set `channels.telegram.streamMode: "off"` if you want real multi‑message block replies.
-3) Use smaller chunk/coalesce thresholds while debugging.
-
-See [Streaming](/concepts/streaming).
-
-### Discord doesn’t reply in my server even with `requireMention: false`. Why?
-
-`requireMention` only controls mention‑gating **after** the channel passes allowlists.
-By default `channels.discord.groupPolicy` is **allowlist**, so guilds must be explicitly enabled.
-If you set `channels.discord.guilds.<guildId>.channels`, only the listed channels are allowed; omit it to allow all channels in the guild.
-
-Fix checklist:
-1) Set `channels.discord.groupPolicy: "open"` **or** add a guild allowlist entry (and optionally a channel allowlist).
-2) Use **numeric channel IDs** in `channels.discord.guilds.<guildId>.channels`.
-3) Put `requireMention: false` **under** `channels.discord.guilds` (global or per‑channel).
-   Top‑level `channels.discord.requireMention` is not a supported key.
-4) Ensure the bot has **Message Content Intent** and channel permissions.
-5) Run `clawdbot channels status --probe` for audit hints.
-
-Docs: [Discord](/channels/discord), [Channels troubleshooting](/channels/troubleshooting).
-
-### Cloud Code Assist API error: invalid tool schema (400). What now?
-
-This is almost always a **tool schema compatibility** issue. The Cloud Code Assist
-endpoint accepts a strict subset of JSON Schema. Clawdbot scrubs/normalizes tool
-schemas in current `main`, but the fix is not in the last release yet (as of
-January 13, 2026).
-
-Fix checklist:
-1) **Update Clawdbot**:
-   - If you can run from source, pull `main` and restart the gateway.
-   - Otherwise, wait for the next release that includes the schema scrubber.
-2) Avoid unsupported keywords like `anyOf/oneOf/allOf`, `patternProperties`,
-   `additionalProperties`, `minLength`, `maxLength`, `format`, etc.
-3) If you define custom tools, keep the top‑level schema as `type: "object"` with
-   `properties` and simple enums.
-
-See [Tools](/tools) and [TypeBox schemas](/concepts/typebox).
-
 ## macOS Specific Issues

 ### App Crashes when Granting Permissions (Speech/Mic)
@@ -160,15 +160,11 @@ clawdbot plugins install <path>              # add a local file/dir to plugins.l
 clawdbot plugins install ./extensions/voice-call # relative path ok
 clawdbot plugins install ./plugin.tgz        # install from a local tarball
 clawdbot plugins install @clawdbot/voice-call # install from npm
-clawdbot plugins update <id>
-clawdbot plugins update --all
 clawdbot plugins enable <id>
 clawdbot plugins disable <id>
 clawdbot plugins doctor
 ```

-`plugins update` only works for npm installs tracked under `plugins.installs`.
-
 Plugins may also register their own top‑level commands (example: `clawdbot voicecall`).

 ## Plugin API (overview)
@@ -70,14 +70,11 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
  - [I set `COPILOT_GITHUB_TOKEN`, but models status shows “Shell env: off.” Why?](#i-set-copilot_github_token-but-models-status-shows-shell-env-off-why)
 - [Sessions & multiple chats](#sessions-multiple-chats)
  - [How do I start a fresh conversation?](#how-do-i-start-a-fresh-conversation)
-  - [Do sessions reset automatically if I never send `/new`?](#do-sessions-reset-automatically-if-i-never-send-new)
-  - [How do I completely reset Clawdbot but keep it installed?](#how-do-i-completely-reset-clawdbot-but-keep-it-installed)
+  - [How do I completely reset Clawdbot (but keep it installed)?](#how-do-i-completely-reset-clawdbot-but-keep-it-installed)
  - [I’m getting “context too large” errors — how do I reset or compact?](#im-getting-context-too-large-errors-how-do-i-reset-or-compact)
-  - [Why am I getting heartbeat messages every 30 minutes?](#why-am-i-getting-heartbeat-messages-every-30-minutes)
  - [Do I need to add a “bot account” to a WhatsApp group?](#do-i-need-to-add-a-bot-account-to-a-whatsapp-group)
  - [Why doesn’t Clawdbot reply in a group?](#why-doesnt-clawdbot-reply-in-a-group)
  - [Do groups/threads share context with DMs?](#do-groupsthreads-share-context-with-dms)
-  - [How many workspaces and agents can I create?](#how-many-workspaces-and-agents-can-i-create)
 - [Models: defaults, selection, aliases, switching](#models-defaults-selection-aliases-switching)
  - [What is the “default model”?](#what-is-the-default-model)
  - [How do I switch models on the fly (without restarting)?](#how-do-i-switch-models-on-the-fly-without-restarting)
@@ -110,17 +107,25 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
 - [Logging and debugging](#logging-and-debugging)
  - [Where are logs?](#where-are-logs)
  - [How do I start/stop/restart the Gateway daemon?](#how-do-i-startstoprestart-the-gateway-daemon)
-  - [ELI5: `clawdbot daemon restart` vs `clawdbot gateway`](#eli5-clawdbot-daemon-restart-vs-clawdbot-gateway)
  - [What’s the fastest way to get more details when something fails?](#whats-the-fastest-way-to-get-more-details-when-something-fails)
 - [Media & attachments](#media-attachments)
  - [My skill generated an image/PDF, but nothing was sent](#my-skill-generated-an-imagepdf-but-nothing-was-sent)
 - [Security and access control](#security-and-access-control)
  - [Is it safe to expose Clawdbot to inbound DMs?](#is-it-safe-to-expose-clawdbot-to-inbound-dms)
-  - [I ran `/start` in Telegram but didn’t get a pairing code](#i-ran-start-in-telegram-but-didnt-get-a-pairing-code)
  - [WhatsApp: will it message my contacts? How does pairing work?](#whatsapp-will-it-message-my-contacts-how-does-pairing-work)
 - [Chat commands, aborting tasks, and “it won’t stop”](#chat-commands-aborting-tasks-and-it-wont-stop)
  - [How do I stop/cancel a running task?](#how-do-i-stopcancel-a-running-task)
  - [Why does it feel like the bot “ignores” rapid‑fire messages?](#why-does-it-feel-like-the-bot-ignores-rapidfire-messages)
+- [Common troubleshooting](#common-troubleshooting)
+  - [“All models failed” — what should I check first?](#all-models-failed-what-should-i-check-first)
+  - [I’m running on my personal WhatsApp number — why is self-chat weird?](#im-running-on-my-personal-whatsapp-number-why-is-self-chat-weird)
+  - [WhatsApp logged me out. How do I re‑auth?](#whatsapp-logged-me-out-how-do-i-reauth)
+  - [Build errors on `main` — what’s the standard fix path?](#build-errors-on-main-whats-the-standard-fix-path)
+  - [npm install fails (allow-build-scripts / missing tar or yargs). What now?](#npm-install-fails-allow-build-scripts--missing-tar-or-yargs-what-now)
+  - [How do I switch between git installs and npm installs?](#how-do-i-switch-between-git-installs-and-npm-installs)
+  - [Telegram block streaming isn’t splitting text between tool calls. Why?](#telegram-block-streaming-isnt-splitting-text-between-tool-calls-why)
+  - [Discord doesn’t reply in my server even with `requireMention: false`. Why?](#discord-doesnt-reply-in-my-server-even-with-requiremention-false-why)
+  - [Cloud Code Assist API error: invalid tool schema (400). What now?](#cloud-code-assist-api-error-invalid-tool-schema-400-what-now)

 ## First 60 seconds if something's broken

@@ -853,21 +858,7 @@ See [/concepts/model-providers](/concepts/model-providers) and [/environment](/e

 Send `/new` or `/reset` as a standalone message. See [Session management](/concepts/session).

-### Do sessions reset automatically if I never send `/new`?
-
-Yes. Sessions expire after `session.idleMinutes` (default **60**). The **next**
-message starts a fresh session id for that chat key. This does not delete
-transcripts — it just starts a new session.
-
-```json5
-{
-  session: {
-    idleMinutes: 240
-  }
-}
-```
-
-### How do I completely reset Clawdbot but keep it installed?
+### How do I completely reset Clawdbot (but keep it installed)?

 Use the reset command:

@@ -914,24 +905,6 @@ If it keeps happening:

 Docs: [Compaction](/concepts/compaction), [Session pruning](/concepts/session-pruning), [Session management](/concepts/session).

-### Why am I getting heartbeat messages every 30 minutes?
-
-Heartbeats run every **30m** by default. Tune or disable them:
-
-```json5
-{
-  agents: {
-    defaults: {
-      heartbeat: {
-        every: "2h"   // or "0m" to disable
-      }
-    }
-  }
-}
-```
-
-Per-agent overrides use `agents.list[].heartbeat`. Docs: [Heartbeat](/gateway/heartbeat).
-
 ### Do I need to add a “bot account” to a WhatsApp group?

 No. Clawdbot runs on **your own account**, so if you’re in the group, Clawdbot can see it.
@@ -962,19 +935,6 @@ See [Groups](/concepts/groups) and [Group messages](/concepts/group-messages).

 Direct chats collapse to the main session by default. Groups/channels have their own session keys, and Telegram topics / Discord threads are separate sessions. See [Groups](/concepts/groups) and [Group messages](/concepts/group-messages).

-### How many workspaces and agents can I create?
-
-No hard limits. Dozens (even hundreds) are fine, but watch for:
-
- **Disk growth:** sessions + transcripts live under `~/.clawdbot/agents/<agentId>/sessions/`.
- **Token cost:** more agents means more concurrent model usage.
- **Ops overhead:** per-agent auth profiles, workspaces, and channel routing.
-
-Tips:
- Keep one **active** workspace per agent (`agents.defaults.workspace`).
- Prune old sessions (delete JSONL or store entries) if disk grows.
- Use `clawdbot doctor` to spot stray workspaces and profile mismatches.
-
 ## Models: defaults, selection, aliases, switching

 ### What is the “default model”?
@@ -1447,14 +1407,6 @@ clawdbot daemon restart

 If you run the gateway manually, `clawdbot gateway --force` can reclaim the port. See [Gateway](/gateway).

-### ELI5: `clawdbot daemon restart` vs `clawdbot gateway`
-
- `clawdbot daemon restart`: restarts the **background service** (launchd/systemd).
- `clawdbot gateway`: runs the gateway **in the foreground** for this terminal session.
-
-If you installed the daemon, use the daemon commands. Use `clawdbot gateway` when
-you want a one-off, foreground run.
-
 ### What’s the fastest way to get more details when something fails?

 Start the Gateway with `--verbose` to get more console detail. Then inspect the log file for channel auth, model routing, and RPC errors.
@@ -1471,11 +1423,7 @@ CLI sending:
 clawdbot message send --to +15555550123 --message "Here you go" --media /path/to/file.png
 ```

-Also check:
- The target channel supports outbound media and isn’t blocked by allowlists.
- The file is within the provider’s size limits (images are resized to max 2048px).
-
-See [Images](/nodes/images).
+Note: images are resized/recompressed (max side 2048px) to hit size limits. See [Images](/nodes/images).

 ## Security and access control

@@ -1491,19 +1439,6 @@ Treat inbound DMs as untrusted input. Defaults are designed to reduce risk:

 Run `clawdbot doctor` to surface risky DM policies.

-### I ran `/start` in Telegram but didn’t get a pairing code
-
-Pairing codes are sent **only** when an unknown sender messages the bot and
-`dmPolicy: "pairing"` is enabled. `/start` by itself doesn’t generate a code.
-
-Check pending requests:
-```bash
-clawdbot pairing list telegram
-```
-
-If you want immediate access, allowlist your sender id or set `dmPolicy: "open"`
-for that account.
-
 ### WhatsApp: will it message my contacts? How does pairing work?

 No. Default WhatsApp DM policy is **pairing**. Unknown senders only get a pairing code and their message is **not processed**. Clawdbot only replies to chats it receives or to explicit sends you trigger.
@@ -1561,6 +1496,139 @@ Queue mode controls how new messages interact with an in‑flight run. Use `/que

 You can add options like `debounce:2s cap:25 drop:summarize` for followup modes.

+## Common troubleshooting
+
+### “All models failed” — what should I check first?
+
+- **Credentials** present for the provider(s) being tried (auth profiles + env vars).
+- **Model routing**: confirm `agents.defaults.model.primary` and fallbacks are models you can access.
+- **Gateway logs** in `/tmp/clawdbot/…` for the exact provider error.
+- **`/model status`** to see current configured models + shorthands.
+
+### I’m running on my personal WhatsApp number — why is self-chat weird?
+
+Enable self-chat mode and allowlist your own number:
+
+```json5
+{
+  channels: {
+    whatsapp: {
+      selfChatMode: true,
+      dmPolicy: "allowlist",
+      allowFrom: ["+15555550123"]
+    }
+  }
+}
+```
+
+See [WhatsApp setup](/channels/whatsapp).
+
+### WhatsApp logged me out. How do I re‑auth?
+
+Run the login command again and scan the QR code:
+
+```bash
+clawdbot channels login
+```
+
+### Build errors on `main` — what’s the standard fix path?
+
+1) `git pull origin main && pnpm install`
+2) `pnpm clawdbot doctor`
+3) Check GitHub issues or Discord
+4) Temporary workaround: check out an older commit
+
+### npm install fails (allow-build-scripts / missing tar or yargs). What now?
+
+If you’re running from source, use the repo’s package manager: **pnpm** (preferred).
+The repo declares `packageManager: "pnpm@…"`, and pnpm patches are tracked in `pnpm.patchedDependencies`.
+
+Typical recovery:
+```bash
+git status   # ensure you’re in the repo root
+pnpm install
+pnpm build
+pnpm clawdbot doctor
+clawdbot daemon restart
+```
+
+Why: pnpm is the configured package manager for this repo, and the dependency
+patching workflow relies on it.
+
+### How do I switch between git installs and npm installs?
+
+Use the **website installer** and select the install method with a flag. It
+upgrades in place and rewrites the gateway service to point at the new install.
+
+Switch **to git install**:
+```bash
+curl -fsSL https://clawd.bot/install.sh | bash -s -- --install-method git --no-onboard
+```
+
+Switch **to npm global**:
+```bash
+curl -fsSL https://clawd.bot/install.sh | bash
+```
+
+Notes:
+- The git flow only rebases if the repo is clean. Commit or stash changes first.
+- After switching, run:
+  ```bash
+  clawdbot doctor
+  clawdbot daemon restart
+  ```
+
+### Telegram block streaming isn’t splitting text between tool calls. Why?
+
+Block streaming only sends **completed text blocks**. Common reasons you see a single message:
+- `agents.defaults.blockStreamingDefault` is still `"off"`.
+- `channels.telegram.blockStreaming` is set to `false`.
+- `channels.telegram.streamMode` is `partial` or `block` **and draft streaming is active**
+  (private chat + topics). Draft streaming disables block streaming in that case.
+- Your `minChars` / coalesce settings are too high, so chunks get merged.
+- The model emits one large text block (no mid‑reply flush points).
+
+Fix checklist:
+1) Put block streaming settings under `agents.defaults`, not the root.
+2) Set `channels.telegram.streamMode: "off"` if you want real multi‑message block replies.
+3) Use smaller chunk/coalesce thresholds while debugging.
+
+See [Streaming](/concepts/streaming).
+
+### Discord doesn’t reply in my server even with `requireMention: false`. Why?
+
+`requireMention` only controls mention‑gating **after** the channel passes allowlists.
+By default `channels.discord.groupPolicy` is **allowlist**, so guilds must be explicitly enabled.
+If you set `channels.discord.guilds.<guildId>.channels`, only the listed channels are allowed; omit it to allow all channels in the guild.
+
+Fix checklist:
+1) Set `channels.discord.groupPolicy: "open"` **or** add a guild allowlist entry (and optionally a channel allowlist).
+2) Use **numeric channel IDs** in `channels.discord.guilds.<guildId>.channels`.
+3) Put `requireMention: false` **under** `channels.discord.guilds` (global or per‑channel).
+   Top‑level `channels.discord.requireMention` is not a supported key.
+4) Ensure the bot has **Message Content Intent** and channel permissions.
+5) Run `clawdbot channels status --probe` for audit hints.
+
+Docs: [Discord](/channels/discord), [Channels troubleshooting](/channels/troubleshooting).
+
+### Cloud Code Assist API error: invalid tool schema (400). What now?
+
+This is almost always a **tool schema compatibility** issue. The Cloud Code Assist
+endpoint accepts a strict subset of JSON Schema. Clawdbot scrubs/normalizes tool
+schemas in current `main`, but the fix is not in the last release yet (as of
+January 13, 2026).
+
+Fix checklist:
+1) **Update Clawdbot**:
+   - If you can run from source, pull `main` and restart the gateway.
+   - Otherwise, wait for the next release that includes the schema scrubber.
+2) Avoid unsupported keywords like `anyOf/oneOf/allOf`, `patternProperties`,
+   `additionalProperties`, `minLength`, `maxLength`, `format`, etc.
+3) If you define custom tools, keep the top‑level schema as `type: "object"` with
+   `properties` and simple enums.
+
+See [Tools](/tools) and [TypeBox schemas](/concepts/typebox).
+
 ## Answer the exact question from the screenshot/chat log

 **Q: “What’s the default model for Anthropic with an API key?”**
@@ -68,8 +68,6 @@ Tip: `--json` does **not** imply non-interactive mode. Use `--non-interactive` (

 1) **Existing config detection**
   - If `~/.clawdbot/clawdbot.json` exists, choose **Keep / Modify / Reset**.
-   - Re-running the wizard does **not** wipe anything unless you explicitly choose **Reset**
-     (or pass `--reset`).
   - If the config is invalid or contains legacy keys, the wizard stops and asks
     you to run `clawdbot doctor` before continuing.
   - Reset uses `trash` (never `rm`) and offers scopes:
@@ -112,18 +112,3 @@ curl -s http://127.0.0.1:18791/tabs
 | `browser.noSandbox` | Add `--no-sandbox` flag (needed for some Linux setups) | `false` |
 | `browser.attachOnly` | Don't launch browser, only attach to existing | `false` |
 | `browser.cdpPort` | Chrome DevTools Protocol port | `18800` |
-
-### Problem: "Chrome extension relay is running, but no tab is connected"
-
-You’re using the `chrome` profile (extension relay). It expects the Clawdbot
-browser extension to be attached to a live tab.
-
-Fix options:
-1. **Use the managed browser:** `clawdbot browser start --browser-profile clawd`
-   (or set `browser.defaultProfile: "clawd"`).
-2. **Use the extension relay:** install the extension, open a tab, and click the
-   Clawdbot extension icon to attach it.
-
-Notes:
- The `chrome` profile uses your **system default Chromium browser** when possible.
- Local `clawd` profiles auto-assign `cdpPort`/`cdpUrl`; only set those for remote CDP.
@@ -14,10 +14,8 @@ control server.

 Beginner view:
 - Think of it as a **separate, agent-only browser**.
- The `clawd` profile does **not** touch your personal browser profile.
+- It does **not** touch your personal browser profile.
 - The agent can **open tabs, read pages, click, and type** in a safe lane.
- The default `chrome` profile uses the **system default Chromium browser** via the
-  extension relay; switch to `clawd` for the isolated managed browser.

 ## What you get

@@ -41,14 +39,6 @@ clawdbot browser --browser-profile clawd snapshot
 If you get “Browser disabled”, enable it in config (see below) and restart the
 Gateway.

-## Profiles: `clawd` vs `chrome`
-
- `clawd`: managed, isolated browser (no extension required).
- `chrome`: extension relay to your **system browser** (requires the Clawdbot
-  extension to be attached to a tab).
-
-Set `browser.defaultProfile: "clawd"` if you want managed mode by default.
-
 ## Configuration

 Browser settings live in `~/.clawdbot/clawdbot.json`.
@@ -81,21 +71,11 @@ Notes:
 - `cdpUrl` defaults to `controlUrl + 1` when unset.
 - `attachOnly: true` means “never launch a local browser; only attach if it is already running.”
 - `color` + per-profile `color` tint the browser UI so you can see which profile is active.
- Default profile is `chrome` (extension relay). Use `defaultProfile: "clawd"` for the managed browser.
- Auto-detect order: system default browser if Chromium-based; otherwise Chrome → Brave → Edge → Chromium → Chrome Canary.
- Local `clawd` profiles auto-assign `cdpPort`/`cdpUrl` — set those only for remote CDP.
+- Auto-detect order: default browser if Chromium-based; otherwise Chrome → Brave → Edge → Chromium → Chrome Canary.

 ## Use Brave (or another Chromium-based browser)

-If your **system default** browser is Chromium-based (Chrome/Brave/Edge/etc),
-Clawdbot uses it automatically. Set `browser.executablePath` to override
-auto-detection:
-
-CLI example:
-
-```bash
-clawdbot config set browser.executablePath "/usr/bin/google-chrome"
-```
+Set `browser.executablePath` to override auto-detection:

 ```json5
 // macOS
@@ -359,10 +339,6 @@ Playwright. If Playwright isn’t installed, those endpoints return a clear 501
 error. ARIA snapshots and basic screenshots still work for clawd-managed Chrome.
 For the Chrome extension relay driver, ARIA snapshots and screenshots require Playwright.

-If you see `Playwright is not available in this gateway build`, install the full
-Playwright package (not `playwright-core`) and restart the gateway, or reinstall
-Clawdbot with browser support.
-
 ## How it works (internal)

 High-level flow:
@@ -75,9 +75,7 @@ export function createClawdbotTools(options?: {
    }),
    createCanvasTool(),
    createNodesTool(),
-    createCronTool({
-      agentSessionKey: options?.agentSessionKey,
-    }),
+    createCronTool(),
    createMessageTool({
      agentAccountId: options?.agentAccountId,
      config: options?.config,
@@ -44,11 +44,7 @@ import {
 } from "../skills.js";
 import { filterBootstrapFilesForSession, loadWorkspaceBootstrapFiles } from "../workspace.js";
 import { buildEmbeddedExtensionPaths } from "./extensions.js";
-import {
-  logToolSchemasForGoogle,
-  sanitizeSessionHistory,
-  sanitizeToolsForGoogle,
-} from "./google.js";
+import { logToolSchemasForGoogle, sanitizeSessionHistory } from "./google.js";
 import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "./history.js";
 import { resolveGlobalLane, resolveSessionLane } from "./lanes.js";
 import { log } from "./logger.js";
@@ -187,7 +183,7 @@ export async function compactEmbeddedPiSession(params: {
          warn: (message) => log.warn(`${message} (sessionKey=${sessionLabel})`),
        });
        const runAbortController = new AbortController();
-        const toolsRaw = createClawdbotCodingTools({
+        const tools = createClawdbotCodingTools({
          exec: {
            ...resolveExecToolDefaults(params.config),
            elevated: params.bashElevated,
@@ -204,7 +200,6 @@ export async function compactEmbeddedPiSession(params: {
          modelId,
          modelAuthMode: resolveModelAuthMode(model.provider, params.config),
        });
-        const tools = sanitizeToolsForGoogle({ tools: toolsRaw, provider });
        logToolSchemasForGoogle({ tools, provider });
        const machineName = await getMachineDisplayName();
        const runtimeChannel = normalizeMessageChannel(
@@ -1,37 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import type { AgentTool } from "@mariozechner/pi-agent-core";
-import { sanitizeToolsForGoogle } from "./google.js";
-
-describe("sanitizeToolsForGoogle", () => {
-  it("strips unsupported schema keywords for Google providers", () => {
-    const tool = {
-      name: "test",
-      description: "test",
-      parameters: {
-        type: "object",
-        additionalProperties: false,
-        properties: {
-          foo: {
-            type: "string",
-            format: "uuid",
-          },
-        },
-      },
-      execute: async () => ({ ok: true, content: [] }),
-    } as unknown as AgentTool;
-
-    const [sanitized] = sanitizeToolsForGoogle({
-      tools: [tool],
-      provider: "google-gemini-cli",
-    });
-
-    const params = sanitized.parameters as {
-      additionalProperties?: unknown;
-      properties?: Record<string, { format?: unknown }>;
-    };
-
-    expect(params.additionalProperties).toBeUndefined();
-    expect(params.properties?.foo?.format).toBeUndefined();
-  });
-});
@@ -1,5 +1,4 @@
 import type { AgentMessage, AgentTool } from "@mariozechner/pi-agent-core";
-import type { TSchema } from "@sinclair/typebox";
 import type { SessionManager } from "@mariozechner/pi-coding-agent";

 import { registerUnhandledRejectionHandler } from "../../infra/unhandled-rejections.js";
@@ -15,7 +14,6 @@ import { sanitizeToolUseResultPairing } from "../session-transcript-repair.js";
 import { log } from "./logger.js";
 import { describeUnknownError } from "./utils.js";
 import { isAntigravityClaude } from "../pi-embedded-helpers/google.js";
-import { cleanToolSchemaForGemini } from "../pi-tools.schema.js";

 const GOOGLE_TURN_ORDERING_CUSTOM_TYPE = "google-turn-ordering-bootstrap";
 const GOOGLE_SCHEMA_UNSUPPORTED_KEYWORDS = new Set([
@@ -82,36 +80,17 @@ function findUnsupportedSchemaKeywords(schema: unknown, path: string): string[]
  return violations;
 }

-export function sanitizeToolsForGoogle<TSchemaType extends TSchema = TSchema, TResult = unknown>(
-  params: {
-    tools: AgentTool<TSchemaType, TResult>[];
-    provider: string;
-  },
-): AgentTool<TSchemaType, TResult>[] {
-  if (params.provider !== "google-antigravity" && params.provider !== "google-gemini-cli") {
-    return params.tools;
-  }
-  return params.tools.map((tool) => {
-    if (!tool.parameters || typeof tool.parameters !== "object") return tool;
-    return {
-      ...tool,
-      parameters: cleanToolSchemaForGemini(tool.parameters as Record<string, unknown>) as TSchemaType,
-    };
-  });
-}
-
 export function logToolSchemasForGoogle(params: { tools: AgentTool[]; provider: string }) {
  if (params.provider !== "google-antigravity" && params.provider !== "google-gemini-cli") {
    return;
  }
  const toolNames = params.tools.map((tool, index) => `${index}:${tool.name}`);
-  const tools = sanitizeToolsForGoogle(params);
  log.info("google tool schema snapshot", {
    provider: params.provider,
-    toolCount: tools.length,
+    toolCount: params.tools.length,
    tools: toolNames,
  });
-  for (const [index, tool] of tools.entries()) {
+  for (const [index, tool] of params.tools.entries()) {
    const violations = findUnsupportedSchemaKeywords(tool.parameters, `${tool.name}.parameters`);
    if (violations.length > 0) {
      log.warn("google tool schema has unsupported keywords", {
@@ -45,11 +45,7 @@ import { filterBootstrapFilesForSession, loadWorkspaceBootstrapFiles } from "../
 import { isAbortError } from "../abort.js";
 import { buildEmbeddedExtensionPaths } from "../extensions.js";
 import { applyExtraParamsToAgent } from "../extra-params.js";
-import {
-  logToolSchemasForGoogle,
-  sanitizeSessionHistory,
-  sanitizeToolsForGoogle,
-} from "../google.js";
+import { logToolSchemasForGoogle, sanitizeSessionHistory } from "../google.js";
 import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "../history.js";
 import { log } from "../logger.js";
 import { buildModelAliasLines } from "../model.js";
@@ -131,7 +127,7 @@ export async function runEmbeddedAttempt(

    const agentDir = params.agentDir ?? resolveClawdbotAgentDir();

-    const toolsRaw = createClawdbotCodingTools({
+    const tools = createClawdbotCodingTools({
      exec: {
        ...resolveExecToolDefaults(params.config),
        elevated: params.bashElevated,
@@ -152,7 +148,6 @@ export async function runEmbeddedAttempt(
      replyToMode: params.replyToMode,
      hasRepliedRef: params.hasRepliedRef,
    });
-    const tools = sanitizeToolsForGoogle({ tools: toolsRaw, provider: params.provider });
    logToolSchemasForGoogle({ tools, provider: params.provider });

    const machineName = await getMachineDisplayName();
@@ -14,7 +14,7 @@ export function handleAgentStart(ctx: EmbeddedPiSubscribeContext) {
      startedAt: Date.now(),
    },
  });
-  void ctx.params.onAgentEvent?.({
+  ctx.params.onAgentEvent?.({
    stream: "lifecycle",
    data: { phase: "start" },
  });
@@ -24,7 +24,7 @@ export function handleAutoCompactionStart(ctx: EmbeddedPiSubscribeContext) {
  ctx.state.compactionInFlight = true;
  ctx.ensureCompactionPromise();
  ctx.log.debug(`embedded run compaction start: runId=${ctx.params.runId}`);
-  void ctx.params.onAgentEvent?.({
+  ctx.params.onAgentEvent?.({
    stream: "compaction",
    data: { phase: "start" },
  });
@@ -43,7 +43,7 @@ export function handleAutoCompactionEnd(
  } else {
    ctx.maybeResolveCompactionWait();
  }
-  void ctx.params.onAgentEvent?.({
+  ctx.params.onAgentEvent?.({
    stream: "compaction",
    data: { phase: "end", willRetry },
  });
@@ -59,7 +59,7 @@ export function handleAgentEnd(ctx: EmbeddedPiSubscribeContext) {
      endedAt: Date.now(),
    },
  });
-  void ctx.params.onAgentEvent?.({
+  ctx.params.onAgentEvent?.({
    stream: "lifecycle",
    data: { phase: "end" },
  });
@@ -118,7 +118,7 @@ export function handleMessageUpdate(
        mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
      },
    });
-    void ctx.params.onAgentEvent?.({
+    ctx.params.onAgentEvent?.({
      stream: "assistant",
      data: {
        text: cleanedText,
@@ -11,7 +11,7 @@ import {
 } from "./pi-embedded-subscribe.tools.js";
 import { inferToolMetaFromArgs } from "./pi-embedded-utils.js";

-export async function handleToolExecutionStart(
+export function handleToolExecutionStart(
  ctx: EmbeddedPiSubscribeContext,
  evt: AgentEvent & { toolName: string; toolCallId: string; args: unknown },
 ) {
@@ -53,8 +53,7 @@ export async function handleToolExecutionStart(
      args: args as Record<string, unknown>,
    },
  });
-  // Await onAgentEvent to ensure typing indicator starts before tool summaries are emitted.
-  await ctx.params.onAgentEvent?.({
+  ctx.params.onAgentEvent?.({
    stream: "tool",
    data: { phase: "start", name: toolName, toolCallId },
  });
@@ -109,23 +108,14 @@ export function handleToolExecutionUpdate(
      partialResult: sanitized,
    },
  });
-  const onAgentEvent = ctx.params.onAgentEvent;
-  if (onAgentEvent) {
-    void Promise.resolve()
-      .then(() =>
-        onAgentEvent({
-          stream: "tool",
-          data: {
-            phase: "update",
-            name: toolName,
-            toolCallId,
-          },
-        }),
-      )
-      .catch((err: unknown) => {
-        ctx.log.debug(`tool_execution_update handler failed: ${String(err)}`);
-      });
-  }
+  ctx.params.onAgentEvent?.({
+    stream: "tool",
+    data: {
+      phase: "update",
+      name: toolName,
+      toolCallId,
+    },
+  });
 }

 export function handleToolExecutionEnd(
@@ -180,25 +170,16 @@ export function handleToolExecutionEnd(
      result: sanitizedResult,
    },
  });
-  const onAgentEvent = ctx.params.onAgentEvent;
-  if (onAgentEvent) {
-    void Promise.resolve()
-      .then(() =>
-        onAgentEvent({
-          stream: "tool",
-          data: {
-            phase: "result",
-            name: toolName,
-            toolCallId,
-            meta,
-            isError: isToolError,
-          },
-        }),
-      )
-      .catch((err: unknown) => {
-        ctx.log.debug(`tool_execution_result handler failed: ${String(err)}`);
-      });
-  }
+  ctx.params.onAgentEvent?.({
+    stream: "tool",
+    data: {
+      phase: "result",
+      name: toolName,
+      toolCallId,
+      meta,
+      isError: isToolError,
+    },
+  });

  ctx.log.debug(
    `embedded run tool end: runId=${ctx.params.runId} tool=${toolName} toolCallId=${toolCallId}`,
@@ -32,11 +32,7 @@ export function createEmbeddedPiSessionEventHandler(ctx: EmbeddedPiSubscribeCont
        handleMessageEnd(ctx, evt as never);
        return;
      case "tool_execution_start":
-        // Async handler - awaits typing indicator before emitting tool summaries.
-        // Catch rejections to avoid unhandled promise rejection crashes.
-        handleToolExecutionStart(ctx, evt as never).catch((err) => {
-          ctx.log.debug(`tool_execution_start handler failed: ${String(err)}`);
-        });
+        handleToolExecutionStart(ctx, evt as never);
        return;
      case "tool_execution_update":
        handleToolExecutionUpdate(ctx, evt as never);
@@ -13,7 +13,7 @@ describe("subscribeEmbeddedPiSession", () => {
    { tag: "antthinking", open: "<antthinking>", close: "</antthinking>" },
  ] as const;

-  it("includes canvas action metadata in tool summaries", async () => {
+  it("includes canvas action metadata in tool summaries", () => {
    let handler: ((evt: unknown) => void) | undefined;
    const session: StubSession = {
      subscribe: (fn) => {
@@ -38,9 +38,6 @@ describe("subscribeEmbeddedPiSession", () => {
      args: { action: "a2ui_push", jsonlPath: "/tmp/a2ui.jsonl" },
    });

-    // Wait for async handler to complete
-    await Promise.resolve();
-
    expect(onToolResult).toHaveBeenCalledTimes(1);
    const payload = onToolResult.mock.calls[0][0];
    expect(payload.text).toContain("🖼️");
@@ -75,7 +72,7 @@ describe("subscribeEmbeddedPiSession", () => {

    expect(onToolResult).not.toHaveBeenCalled();
  });
-  it("emits tool summaries when shouldEmitToolResult overrides verbose", async () => {
+  it("emits tool summaries when shouldEmitToolResult overrides verbose", () => {
    let handler: ((evt: unknown) => void) | undefined;
    const session: StubSession = {
      subscribe: (fn) => {
@@ -101,9 +98,6 @@ describe("subscribeEmbeddedPiSession", () => {
      args: { path: "/tmp/c.txt" },
    });

-    // Wait for async handler to complete
-    await Promise.resolve();
-
    expect(onToolResult).toHaveBeenCalledTimes(1);
  });
 });
@@ -14,7 +14,7 @@ describe("subscribeEmbeddedPiSession", () => {
    { tag: "antthinking", open: "<antthinking>", close: "</antthinking>" },
  ] as const;

-  it("suppresses message_end block replies when the message tool already sent", async () => {
+  it("suppresses message_end block replies when the message tool already sent", () => {
    let handler: ((evt: unknown) => void) | undefined;
    const session: StubSession = {
      subscribe: (fn) => {
@@ -41,9 +41,6 @@ describe("subscribeEmbeddedPiSession", () => {
      args: { action: "send", to: "+1555", message: messageText },
    });

-    // Wait for async handler to complete
-    await Promise.resolve();
-
    handler?.({
      type: "tool_execution_end",
      toolName: "message",
@@ -61,7 +58,7 @@ describe("subscribeEmbeddedPiSession", () => {

    expect(onBlockReply).not.toHaveBeenCalled();
  });
-  it("does not suppress message_end replies when message tool reports error", async () => {
+  it("does not suppress message_end replies when message tool reports error", () => {
    let handler: ((evt: unknown) => void) | undefined;
    const session: StubSession = {
      subscribe: (fn) => {
@@ -88,9 +85,6 @@ describe("subscribeEmbeddedPiSession", () => {
      args: { action: "send", to: "+1555", message: messageText },
    });

-    // Wait for async handler to complete
-    await Promise.resolve();
-
    handler?.({
      type: "tool_execution_end",
      toolName: "message",
@@ -1,49 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { subscribeEmbeddedPiSession } from "./pi-embedded-subscribe.js";
-
-type StubSession = {
-  subscribe: (fn: (evt: unknown) => void) => () => void;
-};
-
-type SessionEventHandler = (evt: unknown) => void;
-
-describe("subscribeEmbeddedPiSession", () => {
-  it("swallows onAgentEvent rejections for tool update/result events", async () => {
-    let handler: SessionEventHandler | undefined;
-    const session: StubSession = {
-      subscribe: (fn) => {
-        handler = fn;
-        return () => {};
-      },
-    };
-
-    const onAgentEvent = vi.fn().mockRejectedValue(new Error("boom"));
-
-    subscribeEmbeddedPiSession({
-      session: session as unknown as Parameters<typeof subscribeEmbeddedPiSession>[0]["session"],
-      runId: "run",
-      onAgentEvent,
-    });
-
-    expect(() => {
-      handler?.({
-        type: "tool_execution_update",
-        toolName: "bash",
-        toolCallId: "tool-1",
-        partialResult: "ok",
-      });
-      handler?.({
-        type: "tool_execution_end",
-        toolName: "bash",
-        toolCallId: "tool-1",
-        isError: false,
-        result: "ok",
-      });
-    }).not.toThrow();
-
-    // Allow async rejection handling to settle.
-    await Promise.resolve();
-
-    expect(onAgentEvent).toHaveBeenCalledTimes(2);
-  });
-});
@@ -54,7 +54,7 @@ describe("subscribeEmbeddedPiSession", () => {
    await waitPromise;
    expect(resolved).toBe(true);
  });
-  it("emits tool summaries at tool start when verbose is on", async () => {
+  it("emits tool summaries at tool start when verbose is on", () => {
    let handler: ((evt: unknown) => void) | undefined;
    const session: StubSession = {
      subscribe: (fn) => {
@@ -79,9 +79,6 @@ describe("subscribeEmbeddedPiSession", () => {
      args: { path: "/tmp/a.txt" },
    });

-    // Wait for async handler to complete
-    await Promise.resolve();
-
    expect(onToolResult).toHaveBeenCalledTimes(1);
    const payload = onToolResult.mock.calls[0][0];
    expect(payload.text).toContain("/tmp/a.txt");
@@ -96,7 +93,7 @@ describe("subscribeEmbeddedPiSession", () => {

    expect(onToolResult).toHaveBeenCalledTimes(1);
  });
-  it("includes browser action metadata in tool summaries", async () => {
+  it("includes browser action metadata in tool summaries", () => {
    let handler: ((evt: unknown) => void) | undefined;
    const session: StubSession = {
      subscribe: (fn) => {
@@ -121,9 +118,6 @@ describe("subscribeEmbeddedPiSession", () => {
      args: { action: "snapshot", targetUrl: "https://example.com" },
    });

-    // Wait for async handler to complete
-    await Promise.resolve();
-
    expect(onToolResult).toHaveBeenCalledTimes(1);
    const payload = onToolResult.mock.calls[0][0];
    expect(payload.text).toContain("🌐");
@@ -22,10 +22,7 @@ export type SubscribeEmbeddedPiSessionParams = {
  blockReplyChunking?: BlockReplyChunking;
  onPartialReply?: (payload: { text?: string; mediaUrls?: string[] }) => void | Promise<void>;
  onAssistantMessageStart?: () => void | Promise<void>;
-  onAgentEvent?: (evt: {
-    stream: string;
-    data: Record<string, unknown>;
-  }) => void | Promise<void>;
+  onAgentEvent?: (evt: { stream: string; data: Record<string, unknown> }) => void;
  enforceFinalTag?: boolean;
 };

@@ -102,7 +102,7 @@ export function ensureSkillsWatcher(params: { workspaceDir: string; config?: Cla
  if (!watchEnabled) {
    if (existing) {
      watchers.delete(workspaceDir);
-      if (existing.timer) clearTimeout(existing.timer);
+      existing.timer && clearTimeout(existing.timer);
      void existing.watcher.close().catch(() => {});
    }
    return;
@@ -115,7 +115,7 @@ export function ensureSkillsWatcher(params: { workspaceDir: string; config?: Cla
  }
  if (existing) {
    watchers.delete(workspaceDir);
-    if (existing.timer) clearTimeout(existing.timer);
+    existing.timer && clearTimeout(existing.timer);
    void existing.watcher.close().catch(() => {});
  }

@@ -173,7 +173,7 @@ export function buildAgentSystemPrompt(params: {
    browser: "Control web browser",
    canvas: "Present/eval/snapshot the Canvas",
    nodes: "List/describe/notify/camera/screen on paired nodes",
-    cron: "Manage cron jobs and wake events (use for reminders; include recent context in reminder text if appropriate)",
+    cron: "Manage cron jobs and wake events (use for reminders)",
    message: "Send messages and channel actions",
    gateway: "Restart, apply config, or run updates on the running Clawdbot process",
    agents_list: "List agent ids allowed for sessions_spawn",
@@ -319,7 +319,7 @@ export function buildAgentSystemPrompt(params: {
          "- browser: control clawd's dedicated browser",
          "- canvas: present/eval/snapshot the Canvas",
          "- nodes: list/describe/notify/camera/screen on paired nodes",
-          "- cron: manage cron jobs and wake events (use for reminders; include recent context in reminder text if appropriate)",
+          "- cron: manage cron jobs and wake events (use for reminders)",
          "- sessions_list: list sessions",
          "- sessions_history: fetch session history",
          "- sessions_send: send to another session",
@@ -84,47 +84,4 @@ describe("cron tool", () => {
      payload: { kind: "systemEvent", text: "hello" },
    });
  });
-
-  it("adds recent context for systemEvent reminders when session key is available", async () => {
-    callGatewayMock
-      .mockResolvedValueOnce({
-        messages: [
-          { role: "user", content: [{ type: "text", text: "Discussed Q2 budget" }] },
-          {
-            role: "assistant",
-            content: [{ type: "text", text: "We agreed to review on Tuesday." }],
-          },
-          { role: "user", content: [{ type: "text", text: "Remind me about the thing at 2pm" }] },
-        ],
-      })
-      .mockResolvedValueOnce({ ok: true });
-
-    const tool = createCronTool({ agentSessionKey: "main" });
-    await tool.execute("call3", {
-      action: "add",
-      job: {
-        name: "reminder",
-        schedule: { atMs: 123 },
-        payload: { text: "Reminder: the thing." },
-      },
-    });
-
-    expect(callGatewayMock).toHaveBeenCalledTimes(2);
-    const historyCall = callGatewayMock.mock.calls[0]?.[0] as {
-      method?: string;
-      params?: unknown;
-    };
-    expect(historyCall.method).toBe("chat.history");
-
-    const cronCall = callGatewayMock.mock.calls[1]?.[0] as {
-      method?: string;
-      params?: { payload?: { text?: string } };
-    };
-    expect(cronCall.method).toBe("cron.add");
-    const text = cronCall.params?.payload?.text ?? "";
-    expect(text).toContain("Recent context:");
-    expect(text).toContain("User: Discussed Q2 budget");
-    expect(text).toContain("Assistant: We agreed to review on Tuesday.");
-    expect(text).toContain("User: Remind me about the thing at 2pm");
-  });
 });
@@ -1,11 +1,8 @@
 import { Type } from "@sinclair/typebox";
 import { normalizeCronJobCreate, normalizeCronJobPatch } from "../../cron/normalize.js";
-import { loadConfig } from "../../config/config.js";
-import { truncateUtf16Safe } from "../../utils.js";
 import { optionalStringEnum, stringEnum } from "../schema/typebox.js";
 import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
 import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
-import { resolveInternalSessionKey, resolveMainSessionAlias } from "./sessions-helpers.js";

 // NOTE: We use Type.Object({}, { additionalProperties: true }) for job/patch
 // instead of CronAddParamsSchema/CronJobPatchSchema because the gateway schemas
@@ -16,11 +13,6 @@ const CRON_ACTIONS = ["status", "list", "add", "update", "remove", "run", "runs"

 const CRON_WAKE_MODES = ["now", "next-heartbeat"] as const;

-const REMINDER_CONTEXT_MESSAGES = 3;
-const REMINDER_CONTEXT_PER_MESSAGE_MAX = 220;
-const REMINDER_CONTEXT_TOTAL_MAX = 700;
-const REMINDER_CONTEXT_MARKER = "\n\nRecent context:\n";
-
 // Flattened schema: runtime validates per-action requirements.
 const CronToolSchema = Type.Object({
  action: stringEnum(CRON_ACTIONS),
@@ -36,90 +28,7 @@ const CronToolSchema = Type.Object({
  mode: optionalStringEnum(CRON_WAKE_MODES),
 });

-type CronToolOptions = {
-  agentSessionKey?: string;
-};
-
-type ChatMessage = {
-  role?: unknown;
-  content?: unknown;
-};
-
-function stripExistingContext(text: string) {
-  const index = text.indexOf(REMINDER_CONTEXT_MARKER);
-  if (index === -1) return text;
-  return text.slice(0, index).trim();
-}
-
-function truncateText(input: string, maxLen: number) {
-  if (input.length <= maxLen) return input;
-  const truncated = truncateUtf16Safe(input, Math.max(0, maxLen - 3)).trimEnd();
-  return `${truncated}...`;
-}
-
-function normalizeContextText(raw: string) {
-  return raw.replace(/\s+/g, " ").trim();
-}
-
-function extractMessageText(message: ChatMessage): { role: string; text: string } | null {
-  const role = typeof message.role === "string" ? message.role : "";
-  if (role !== "user" && role !== "assistant") return null;
-  const content = message.content;
-  if (typeof content === "string") {
-    const normalized = normalizeContextText(content);
-    return normalized ? { role, text: normalized } : null;
-  }
-  if (!Array.isArray(content)) return null;
-  const chunks: string[] = [];
-  for (const block of content) {
-    if (!block || typeof block !== "object") continue;
-    if ((block as { type?: unknown }).type !== "text") continue;
-    const text = (block as { text?: unknown }).text;
-    if (typeof text === "string" && text.trim()) {
-      chunks.push(text);
-    }
-  }
-  const joined = normalizeContextText(chunks.join(" "));
-  return joined ? { role, text: joined } : null;
-}
-
-async function buildReminderContextLines(params: {
-  agentSessionKey?: string;
-  gatewayOpts: GatewayCallOptions;
-}) {
-  const sessionKey = params.agentSessionKey?.trim();
-  if (!sessionKey) return [];
-  const cfg = loadConfig();
-  const { mainKey, alias } = resolveMainSessionAlias(cfg);
-  const resolvedKey = resolveInternalSessionKey({ key: sessionKey, alias, mainKey });
-  try {
-    const res = (await callGatewayTool("chat.history", params.gatewayOpts, {
-      sessionKey: resolvedKey,
-      limit: 12,
-    })) as { messages?: unknown[] };
-    const messages = Array.isArray(res?.messages) ? res.messages : [];
-    const parsed = messages
-      .map((msg) => extractMessageText(msg as ChatMessage))
-      .filter((msg): msg is { role: string; text: string } => Boolean(msg));
-    const recent = parsed.slice(-REMINDER_CONTEXT_MESSAGES);
-    if (recent.length === 0) return [];
-    const lines: string[] = [];
-    let total = 0;
-    for (const entry of recent) {
-      const label = entry.role === "user" ? "User" : "Assistant";
-      const text = truncateText(entry.text, REMINDER_CONTEXT_PER_MESSAGE_MAX);
-      const line = `- ${label}: ${text}`;
-      total += line.length;
-      if (total > REMINDER_CONTEXT_TOTAL_MAX) break;
-      lines.push(line);
-    }
-    return lines;
-  } catch {
-    return [];
-  }
-}
-
-export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
+export function createCronTool(): AnyAgentTool {
  return {
    label: "Cron",
    name: "cron",
@@ -149,24 +58,6 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
            throw new Error("job required");
          }
          const job = normalizeCronJobCreate(params.job) ?? params.job;
-          if (
-            job &&
-            typeof job === "object" &&
-            "payload" in job &&
-            (job as { payload?: { kind?: string; text?: string } }).payload?.kind === "systemEvent"
-          ) {
-            const payload = (job as { payload: { kind: string; text: string } }).payload;
-            if (typeof payload.text === "string" && payload.text.trim()) {
-              const contextLines = await buildReminderContextLines({
-                agentSessionKey: opts?.agentSessionKey,
-                gatewayOpts,
-              });
-              if (contextLines.length > 0) {
-                const baseText = stripExistingContext(payload.text);
-                payload.text = `${baseText}${REMINDER_CONTEXT_MARKER}${contextLines.join("\n")}`;
-              }
-            }
-          }
          return jsonResult(await callGatewayTool("cron.add", gatewayOpts, job));
        }
        case "update": {
@@ -219,7 +219,7 @@ export async function handleDiscordGuildAction(
      return jsonResult({ ok: true, event });
    }
    case "channelCreate": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const guildId = readStringParam(params, "guildId", { required: true });
@@ -241,7 +241,7 @@ export async function handleDiscordGuildAction(
      return jsonResult({ ok: true, channel });
    }
    case "channelEdit": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const channelId = readStringParam(params, "channelId", {
@@ -267,7 +267,7 @@ export async function handleDiscordGuildAction(
      return jsonResult({ ok: true, channel });
    }
    case "channelDelete": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const channelId = readStringParam(params, "channelId", {
@@ -277,7 +277,7 @@ export async function handleDiscordGuildAction(
      return jsonResult(result);
    }
    case "channelMove": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const guildId = readStringParam(params, "guildId", { required: true });
@@ -295,7 +295,7 @@ export async function handleDiscordGuildAction(
      return jsonResult({ ok: true });
    }
    case "categoryCreate": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const guildId = readStringParam(params, "guildId", { required: true });
@@ -310,7 +310,7 @@ export async function handleDiscordGuildAction(
      return jsonResult({ ok: true, category: channel });
    }
    case "categoryEdit": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const categoryId = readStringParam(params, "categoryId", {
@@ -326,7 +326,7 @@ export async function handleDiscordGuildAction(
      return jsonResult({ ok: true, category: channel });
    }
    case "categoryDelete": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const categoryId = readStringParam(params, "categoryId", {
@@ -336,7 +336,7 @@ export async function handleDiscordGuildAction(
      return jsonResult(result);
    }
    case "channelPermissionSet": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const channelId = readStringParam(params, "channelId", {
@@ -359,7 +359,7 @@ export async function handleDiscordGuildAction(
      return jsonResult({ ok: true });
    }
    case "channelPermissionRemove": {
-      if (!isActionEnabled("channels")) {
+      if (!isActionEnabled("channels", false)) {
        throw new Error("Discord channel management is disabled.");
      }
      const channelId = readStringParam(params, "channelId", {
@@ -26,7 +26,7 @@ import type { VerboseLevel } from "../thinking.js";
 import { isSilentReplyText, SILENT_REPLY_TOKEN } from "../tokens.js";
 import type { GetReplyOptions, ReplyPayload } from "../types.js";
 import { buildThreadingToolContext, resolveEnforceFinalTag } from "./agent-runner-utils.js";
-import { createBlockReplyPayloadKey, type BlockReplyPipeline } from "./block-reply-pipeline.js";
+import type { BlockReplyPipeline } from "./block-reply-pipeline.js";
 import type { FollowupRun } from "./queue.js";
 import { parseReplyDirectives } from "./reply-directives.js";
 import { applyReplyTagsToPayload, isRenderablePayload } from "./reply-payloads.js";
@@ -40,8 +40,6 @@ export type AgentRunLoopResult =
      fallbackModel?: string;
      didLogHeartbeatStrip: boolean;
      autoCompactionCompleted: boolean;
-      /** Payload keys sent directly (not via pipeline) during tool flush. */
-      directlySentBlockKeys?: Set<string>;
    }
  | { kind: "final"; payload: ReplyPayload };

@@ -72,8 +70,6 @@ export async function runAgentTurnWithFallback(params: {
 }): Promise<AgentRunLoopResult> {
  let didLogHeartbeatStrip = false;
  let autoCompactionCompleted = false;
-  // Track payloads sent directly (not via pipeline) during tool flush to avoid duplicates.
-  const directlySentBlockKeys = new Set<string>();

  const runId = crypto.randomUUID();
  if (params.sessionKey) {
@@ -248,13 +244,12 @@ export async function runAgentTurnWithFallback(params: {
                    });
                  }
                : undefined,
-            onAgentEvent: async (evt) => {
-              // Trigger typing when tools start executing.
-              // Must await to ensure typing indicator starts before tool summaries are emitted.
+            onAgentEvent: (evt) => {
+              // Trigger typing when tools start executing
              if (evt.stream === "tool") {
                const phase = typeof evt.data.phase === "string" ? evt.data.phase : "";
                if (phase === "start" || phase === "update") {
-                  await params.typingSignals.signalToolStart();
+                  void params.typingSignals.signalToolStart();
                }
              }
              // Track auto-compaction completion
@@ -266,71 +261,57 @@ export async function runAgentTurnWithFallback(params: {
                }
              }
            },
-            // Always pass onBlockReply so flushBlockReplyBuffer works before tool execution,
-            // even when regular block streaming is disabled. The handler sends directly
-            // via opts.onBlockReply when the pipeline isn't available.
-            onBlockReply: params.opts?.onBlockReply
-              ? async (payload) => {
-                  const { text, skip } = normalizeStreamingText(payload);
-                  const hasPayloadMedia = (payload.mediaUrls?.length ?? 0) > 0;
-                  if (skip && !hasPayloadMedia) return;
-                  const taggedPayload = applyReplyTagsToPayload(
-                    {
-                      text,
-                      mediaUrls: payload.mediaUrls,
-                      mediaUrl: payload.mediaUrls?.[0],
-                    },
-                    params.sessionCtx.MessageSid,
-                  );
-                  // Let through payloads with audioAsVoice flag even if empty (need to track it)
-                  if (!isRenderablePayload(taggedPayload) && !payload.audioAsVoice) return;
-                  const parsed = parseReplyDirectives(taggedPayload.text ?? "", {
-                    currentMessageId: params.sessionCtx.MessageSid,
-                    silentToken: SILENT_REPLY_TOKEN,
-                  });
-                  const cleaned = parsed.text || undefined;
-                  const hasRenderableMedia =
-                    Boolean(taggedPayload.mediaUrl) || (taggedPayload.mediaUrls?.length ?? 0) > 0;
-                  // Skip empty payloads unless they have audioAsVoice flag (need to track it)
-                  if (
-                    !cleaned &&
-                    !hasRenderableMedia &&
-                    !payload.audioAsVoice &&
-                    !parsed.audioAsVoice
-                  )
-                    return;
-                  if (parsed.isSilent && !hasRenderableMedia) return;
+            onBlockReply:
+              params.blockStreamingEnabled && params.opts?.onBlockReply
+                ? async (payload) => {
+                    const { text, skip } = normalizeStreamingText(payload);
+                    const hasPayloadMedia = (payload.mediaUrls?.length ?? 0) > 0;
+                    if (skip && !hasPayloadMedia) return;
+                    const taggedPayload = applyReplyTagsToPayload(
+                      {
+                        text,
+                        mediaUrls: payload.mediaUrls,
+                        mediaUrl: payload.mediaUrls?.[0],
+                      },
+                      params.sessionCtx.MessageSid,
+                    );
+                    // Let through payloads with audioAsVoice flag even if empty (need to track it)
+                    if (!isRenderablePayload(taggedPayload) && !payload.audioAsVoice) return;
+                    const parsed = parseReplyDirectives(taggedPayload.text ?? "", {
+                      currentMessageId: params.sessionCtx.MessageSid,
+                      silentToken: SILENT_REPLY_TOKEN,
+                    });
+                    const cleaned = parsed.text || undefined;
+                    const hasRenderableMedia =
+                      Boolean(taggedPayload.mediaUrl) || (taggedPayload.mediaUrls?.length ?? 0) > 0;
+                    // Skip empty payloads unless they have audioAsVoice flag (need to track it)
+                    if (
+                      !cleaned &&
+                      !hasRenderableMedia &&
+                      !payload.audioAsVoice &&
+                      !parsed.audioAsVoice
+                    )
+                      return;
+                    if (parsed.isSilent && !hasRenderableMedia) return;

-                  const blockPayload: ReplyPayload = params.applyReplyToMode({
-                    ...taggedPayload,
-                    text: cleaned,
-                    audioAsVoice: Boolean(parsed.audioAsVoice || payload.audioAsVoice),
-                    replyToId: taggedPayload.replyToId ?? parsed.replyToId,
-                    replyToTag: taggedPayload.replyToTag || parsed.replyToTag,
-                    replyToCurrent: taggedPayload.replyToCurrent || parsed.replyToCurrent,
-                  });
-
-                  void params.typingSignals
-                    .signalTextDelta(cleaned ?? taggedPayload.text)
-                    .catch((err) => {
-                      logVerbose(`block reply typing signal failed: ${String(err)}`);
+                    const blockPayload: ReplyPayload = params.applyReplyToMode({
+                      ...taggedPayload,
+                      text: cleaned,
+                      audioAsVoice: Boolean(parsed.audioAsVoice || payload.audioAsVoice),
+                      replyToId: taggedPayload.replyToId ?? parsed.replyToId,
+                      replyToTag: taggedPayload.replyToTag || parsed.replyToTag,
+                      replyToCurrent: taggedPayload.replyToCurrent || parsed.replyToCurrent,
                    });

-                  // Use pipeline if available (block streaming enabled), otherwise send directly
-                  if (params.blockStreamingEnabled && params.blockReplyPipeline) {
-                    params.blockReplyPipeline.enqueue(blockPayload);
-                  } else {
-                    // Send directly when flushing before tool execution (no streaming).
-                    // Track sent key to avoid duplicate in final payloads.
-                    try {
-                      await params.opts?.onBlockReply?.(blockPayload);
-                      directlySentBlockKeys.add(createBlockReplyPayloadKey(blockPayload));
-                    } catch (err) {
-                      logVerbose(`block reply direct delivery failed: ${String(err)}`);
-                    }
+                    void params.typingSignals
+                      .signalTextDelta(cleaned ?? taggedPayload.text)
+                      .catch((err) => {
+                        logVerbose(`block reply typing signal failed: ${String(err)}`);
+                      });
+
+                    params.blockReplyPipeline?.enqueue(blockPayload);
                  }
-                }
-              : undefined,
+                : undefined,
            onBlockReplyFlush:
              params.blockStreamingEnabled && blockReplyPipeline
                ? async () => {
@@ -466,6 +447,5 @@ export async function runAgentTurnWithFallback(params: {
    fallbackModel,
    didLogHeartbeatStrip,
    autoCompactionCompleted,
-    directlySentBlockKeys: directlySentBlockKeys.size > 0 ? directlySentBlockKeys : undefined,
  };
 }
@@ -5,7 +5,7 @@ import type { OriginatingChannelType } from "../templating.js";
 import { SILENT_REPLY_TOKEN } from "../tokens.js";
 import type { ReplyPayload } from "../types.js";
 import { formatBunFetchSocketError, isBunFetchSocketError } from "./agent-runner-utils.js";
-import { createBlockReplyPayloadKey, type BlockReplyPipeline } from "./block-reply-pipeline.js";
+import type { BlockReplyPipeline } from "./block-reply-pipeline.js";
 import { parseReplyDirectives } from "./reply-directives.js";
 import {
  applyReplyThreading,
@@ -20,8 +20,6 @@ export function buildReplyPayloads(params: {
  didLogHeartbeatStrip: boolean;
  blockStreamingEnabled: boolean;
  blockReplyPipeline: BlockReplyPipeline | null;
-  /** Payload keys sent directly (not via pipeline) during tool flush. */
-  directlySentBlockKeys?: Set<string>;
  replyToMode: ReplyToMode;
  replyToChannel?: OriginatingChannelType;
  currentMessageId?: string;
@@ -100,16 +98,11 @@ export function buildReplyPayloads(params: {
    payloads: replyTaggedPayloads,
    sentTexts: messagingToolSentTexts,
  });
-  // Filter out payloads already sent via pipeline or directly during tool flush.
  const filteredPayloads = shouldDropFinalPayloads
    ? []
    : params.blockStreamingEnabled
      ? dedupedPayloads.filter((payload) => !params.blockReplyPipeline?.hasSentPayload(payload))
-      : params.directlySentBlockKeys?.size
-        ? dedupedPayloads.filter(
-            (payload) => !params.directlySentBlockKeys!.has(createBlockReplyPayloadKey(payload)),
-          )
-        : dedupedPayloads;
+      : dedupedPayloads;
  const replyPayloads = suppressMessagingToolReplies ? [] : filteredPayloads;

  return {
@@ -272,7 +272,7 @@ export async function runReplyAgent(params: {
      return finalizeWithFollowup(runOutcome.payload, queueKey, runFollowupTurn);
    }

-    const { runResult, fallbackProvider, fallbackModel, directlySentBlockKeys } = runOutcome;
+    const { runResult, fallbackProvider, fallbackModel } = runOutcome;
    let { didLogHeartbeatStrip, autoCompactionCompleted } = runOutcome;

    if (
@@ -314,7 +314,6 @@ export async function runReplyAgent(params: {
      didLogHeartbeatStrip,
      blockStreamingEnabled,
      blockReplyPipeline,
-      directlySentBlockKeys,
      replyToMode,
      replyToChannel,
      currentMessageId: sessionCtx.MessageSid,
@@ -13,9 +13,6 @@ export type BrowserStatus = {
  cdpPort: number;
  cdpUrl?: string;
  chosenBrowser: string | null;
-  detectedBrowser?: string | null;
-  detectedExecutablePath?: string | null;
-  detectError?: string | null;
  userDataDir: string | null;
  color: string;
  headless: boolean;
@@ -63,11 +63,7 @@ export async function requirePwAi(
  jsonError(
    res,
    501,
-    [
-      `Playwright is not available in this gateway build; '${feature}' is unsupported.`,
-      "Install the full Playwright package (not playwright-core) and restart the gateway, or reinstall with browser support.",
-      "Docs: /tools/browser#playwright-requirement",
-    ].join("\n"),
+    `Playwright is not available in this gateway build; '${feature}' is unsupported.`,
  );
  return null;
 }
@@ -1,6 +1,5 @@
 import type express from "express";

-import { resolveBrowserExecutableForPlatform } from "../chrome.executables.js";
 import { createBrowserProfilesService } from "../profiles-service.js";
 import type { BrowserRouteContext } from "../server-context.js";
 import { getProfileContext, jsonError, toStringOrEmpty } from "./utils.js";
@@ -37,19 +36,6 @@ export function registerBrowserBasicRoutes(app: express.Express, ctx: BrowserRou
    ]);

    const profileState = current.profiles.get(profileCtx.profile.name);
-    let detectedBrowser: string | null = null;
-    let detectedExecutablePath: string | null = null;
-    let detectError: string | null = null;
-
-    try {
-      const detected = resolveBrowserExecutableForPlatform(current.resolved, process.platform);
-      if (detected) {
-        detectedBrowser = detected.kind;
-        detectedExecutablePath = detected.path;
-      }
-    } catch (err) {
-      detectError = String(err);
-    }

    res.json({
      enabled: current.resolved.enabled,
@@ -62,9 +48,6 @@ export function registerBrowserBasicRoutes(app: express.Express, ctx: BrowserRou
      cdpPort: profileCtx.profile.cdpPort,
      cdpUrl: profileCtx.profile.cdpUrl,
      chosenBrowser: profileState?.running?.exe.kind ?? null,
-      detectedBrowser,
-      detectedExecutablePath,
-      detectError,
      userDataDir: profileState?.running?.userDataDir ?? null,
      color: profileCtx.profile.color,
      headless: current.resolved.headless,
@@ -1 +1 @@
-e8286176aaf2c0daf5f4b30dd221c3d7aa1aec8329d6865cac3d9636fd7f08f6
+7a41e2cbe78e007eeaa03a65e18b8edf3fe17263de427426eaf58e946728eaf6
@@ -1,24 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import type { ClawdbotConfig } from "../../../config/config.js";
-import { discordMessageActions } from "./discord.js";
-
-describe("discord message actions", () => {
-  it("lists channel and upload actions by default", () => {
-    const cfg = { channels: { discord: { token: "d0" } } } as ClawdbotConfig;
-    const actions = discordMessageActions.listActions?.({ cfg }) ?? [];
-
-    expect(actions).toContain("emoji-upload");
-    expect(actions).toContain("sticker-upload");
-    expect(actions).toContain("channel-create");
-  });
-
-  it("respects disabled channel actions", () => {
-    const cfg = {
-      channels: { discord: { token: "d0", actions: { channels: false } } },
-    } as ClawdbotConfig;
-    const actions = discordMessageActions.listActions?.({ cfg }) ?? [];
-
-    expect(actions).not.toContain("channel-create");
-  });
-});
@@ -47,7 +47,7 @@ export const discordMessageActions: ChannelMessageActionAdapter = {
      actions.add("channel-info");
      actions.add("channel-list");
    }
-    if (gate("channels")) {
+    if (gate("channels", false)) {
      actions.add("channel-create");
      actions.add("channel-edit");
      actions.add("channel-delete");
@@ -47,10 +47,7 @@ export function registerBrowserManageCommands(
            `cdpPort: ${status.cdpPort}`,
            `cdpUrl: ${status.cdpUrl ?? `http://127.0.0.1:${status.cdpPort}`}`,
            `browser: ${status.chosenBrowser ?? "unknown"}`,
-            `detectedBrowser: ${status.detectedBrowser ?? "unknown"}`,
-            `detectedPath: ${status.detectedExecutablePath ?? status.executablePath ?? "auto"}`,
            `profileColor: ${status.color}`,
-            ...(status.detectError ? [`detectError: ${status.detectError}`] : []),
          ].join("\n"),
        );
      } catch (err) {
@@ -1,297 +0,0 @@
-import JSON5 from "json5";
-import type { Command } from "commander";
-
-import { readConfigFileSnapshot, writeConfigFile } from "../config/config.js";
-import { danger, info } from "../globals.js";
-import { defaultRuntime } from "../runtime.js";
-import { formatDocsLink } from "../terminal/links.js";
-import { theme } from "../terminal/theme.js";
-
-type PathSegment = string;
-
-function isIndexSegment(raw: string): boolean {
-  return /^[0-9]+$/.test(raw);
-}
-
-function parsePath(raw: string): PathSegment[] {
-  const trimmed = raw.trim();
-  if (!trimmed) return [];
-  const parts: string[] = [];
-  let current = "";
-  let i = 0;
-  while (i < trimmed.length) {
-    const ch = trimmed[i];
-    if (ch === "\\") {
-      const next = trimmed[i + 1];
-      if (next) current += next;
-      i += 2;
-      continue;
-    }
-    if (ch === ".") {
-      if (current) parts.push(current);
-      current = "";
-      i += 1;
-      continue;
-    }
-    if (ch === "[") {
-      if (current) parts.push(current);
-      current = "";
-      const close = trimmed.indexOf("]", i);
-      if (close === -1) throw new Error(`Invalid path (missing "]"): ${raw}`);
-      const inside = trimmed.slice(i + 1, close).trim();
-      if (!inside) throw new Error(`Invalid path (empty "[]"): ${raw}`);
-      parts.push(inside);
-      i = close + 1;
-      continue;
-    }
-    current += ch;
-    i += 1;
-  }
-  if (current) parts.push(current);
-  return parts.map((part) => part.trim()).filter(Boolean);
-}
-
-function parseValue(raw: string, opts: { json?: boolean }): unknown {
-  const trimmed = raw.trim();
-  if (opts.json) {
-    try {
-      return JSON5.parse(trimmed);
-    } catch (err) {
-      throw new Error(`Failed to parse JSON5 value: ${String(err)}`);
-    }
-  }
-
-  try {
-    return JSON5.parse(trimmed);
-  } catch {
-    return raw;
-  }
-}
-
-function getAtPath(root: unknown, path: PathSegment[]): { found: boolean; value?: unknown } {
-  let current: unknown = root;
-  for (const segment of path) {
-    if (!current || typeof current !== "object") return { found: false };
-    if (Array.isArray(current)) {
-      if (!isIndexSegment(segment)) return { found: false };
-      const index = Number.parseInt(segment, 10);
-      if (!Number.isFinite(index) || index < 0 || index >= current.length) {
-        return { found: false };
-      }
-      current = current[index];
-      continue;
-    }
-    const record = current as Record<string, unknown>;
-    if (!(segment in record)) return { found: false };
-    current = record[segment];
-  }
-  return { found: true, value: current };
-}
-
-function setAtPath(root: Record<string, unknown>, path: PathSegment[], value: unknown): void {
-  let current: unknown = root;
-  for (let i = 0; i < path.length - 1; i += 1) {
-    const segment = path[i];
-    const next = path[i + 1];
-    const nextIsIndex = Boolean(next && isIndexSegment(next));
-    if (Array.isArray(current)) {
-      if (!isIndexSegment(segment)) {
-        throw new Error(`Expected numeric index for array segment "${segment}"`);
-      }
-      const index = Number.parseInt(segment, 10);
-      const existing = current[index];
-      if (!existing || typeof existing !== "object") {
-        current[index] = nextIsIndex ? [] : {};
-      }
-      current = current[index];
-      continue;
-    }
-    if (!current || typeof current !== "object") {
-      throw new Error(`Cannot traverse into "${segment}" (not an object)`);
-    }
-    const record = current as Record<string, unknown>;
-    const existing = record[segment];
-    if (!existing || typeof existing !== "object") {
-      record[segment] = nextIsIndex ? [] : {};
-    }
-    current = record[segment];
-  }
-
-  const last = path[path.length - 1];
-  if (Array.isArray(current)) {
-    if (!isIndexSegment(last)) {
-      throw new Error(`Expected numeric index for array segment "${last}"`);
-    }
-    const index = Number.parseInt(last, 10);
-    current[index] = value;
-    return;
-  }
-  if (!current || typeof current !== "object") {
-    throw new Error(`Cannot set "${last}" (parent is not an object)`);
-  }
-  (current as Record<string, unknown>)[last] = value;
-}
-
-function unsetAtPath(root: Record<string, unknown>, path: PathSegment[]): boolean {
-  let current: unknown = root;
-  for (let i = 0; i < path.length - 1; i += 1) {
-    const segment = path[i];
-    if (!current || typeof current !== "object") return false;
-    if (Array.isArray(current)) {
-      if (!isIndexSegment(segment)) return false;
-      const index = Number.parseInt(segment, 10);
-      if (!Number.isFinite(index) || index < 0 || index >= current.length) return false;
-      current = current[index];
-      continue;
-    }
-    const record = current as Record<string, unknown>;
-    if (!(segment in record)) return false;
-    current = record[segment];
-  }
-
-  const last = path[path.length - 1];
-  if (Array.isArray(current)) {
-    if (!isIndexSegment(last)) return false;
-    const index = Number.parseInt(last, 10);
-    if (!Number.isFinite(index) || index < 0 || index >= current.length) return false;
-    current.splice(index, 1);
-    return true;
-  }
-  if (!current || typeof current !== "object") return false;
-  const record = current as Record<string, unknown>;
-  if (!(last in record)) return false;
-  delete record[last];
-  return true;
-}
-
-async function loadValidConfig() {
-  const snapshot = await readConfigFileSnapshot();
-  if (snapshot.valid) return snapshot;
-  defaultRuntime.error(`Config invalid at ${snapshot.path}.`);
-  for (const issue of snapshot.issues) {
-    defaultRuntime.error(`- ${issue.path || "<root>"}: ${issue.message}`);
-  }
-  defaultRuntime.error("Run `clawdbot doctor` to repair, then retry.");
-  defaultRuntime.exit(1);
-  return snapshot;
-}
-
-export function registerConfigCli(program: Command) {
-  const cmd = program
-    .command("config")
-    .description("Config helpers (get/set/unset). Run without subcommand for the wizard.")
-    .addHelpText(
-      "after",
-      () =>
-        `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/config", "docs.clawd.bot/cli/config")}\n`,
-    )
-    .option(
-      "--section <section>",
-      "Configure wizard sections (repeatable). Use with no subcommand.",
-      (value: string, previous: string[]) => [...previous, value],
-      [] as string[],
-    )
-    .action(async (opts) => {
-      const { CONFIGURE_WIZARD_SECTIONS, configureCommand, configureCommandWithSections } =
-        await import("../commands/configure.js");
-      const sections: string[] = Array.isArray(opts.section)
-        ? opts.section
-            .map((value: unknown) => (typeof value === "string" ? value.trim() : ""))
-            .filter(Boolean)
-        : [];
-      if (sections.length === 0) {
-        await configureCommand(defaultRuntime);
-        return;
-      }
-
-      const invalid = sections.filter((s) => !CONFIGURE_WIZARD_SECTIONS.includes(s as never));
-      if (invalid.length > 0) {
-        defaultRuntime.error(
-          `Invalid --section: ${invalid.join(", ")}. Expected one of: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}.`,
-        );
-        defaultRuntime.exit(1);
-        return;
-      }
-
-      await configureCommandWithSections(sections as never, defaultRuntime);
-    });
-
-  cmd
-    .command("get")
-    .description("Get a config value by dot path")
-    .argument("<path>", "Config path (dot or bracket notation)")
-    .option("--json", "Output JSON", false)
-    .action(async (path: string, opts) => {
-      try {
-        const parsedPath = parsePath(path);
-        if (parsedPath.length === 0) {
-          throw new Error("Path is empty.");
-        }
-        const snapshot = await loadValidConfig();
-        const res = getAtPath(snapshot.config, parsedPath);
-        if (!res.found) {
-          defaultRuntime.error(danger(`Config path not found: ${path}`));
-          defaultRuntime.exit(1);
-          return;
-        }
-        if (opts.json) {
-          defaultRuntime.log(JSON.stringify(res.value ?? null, null, 2));
-          return;
-        }
-        if (typeof res.value === "string" || typeof res.value === "number" || typeof res.value === "boolean") {
-          defaultRuntime.log(String(res.value));
-          return;
-        }
-        defaultRuntime.log(JSON.stringify(res.value ?? null, null, 2));
-      } catch (err) {
-        defaultRuntime.error(danger(String(err)));
-        defaultRuntime.exit(1);
-      }
-    });
-
-  cmd
-    .command("set")
-    .description("Set a config value by dot path")
-    .argument("<path>", "Config path (dot or bracket notation)")
-    .argument("<value>", "Value (JSON5 or raw string)")
-    .option("--json", "Parse value as JSON5 (required)", false)
-    .action(async (path: string, value: string, opts) => {
-      try {
-        const parsedPath = parsePath(path);
-        if (parsedPath.length === 0) throw new Error("Path is empty.");
-        const parsedValue = parseValue(value, opts);
-        const snapshot = await loadValidConfig();
-        const next = snapshot.config as Record<string, unknown>;
-        setAtPath(next, parsedPath, parsedValue);
-        await writeConfigFile(next);
-        defaultRuntime.log(info(`Updated ${path}. Restart the gateway to apply.`));
-      } catch (err) {
-        defaultRuntime.error(danger(String(err)));
-        defaultRuntime.exit(1);
-      }
-    });
-
-  cmd
-    .command("unset")
-    .description("Remove a config value by dot path")
-    .argument("<path>", "Config path (dot or bracket notation)")
-    .action(async (path: string) => {
-      try {
-        const parsedPath = parsePath(path);
-        if (parsedPath.length === 0) throw new Error("Path is empty.");
-        const snapshot = await loadValidConfig();
-        const next = snapshot.config as Record<string, unknown>;
-        const removed = unsetAtPath(next, parsedPath);
-        if (!removed) {
-          defaultRuntime.error(danger(`Config path not found: ${path}`));
-          defaultRuntime.exit(1);
-          return;
-        }
-        await writeConfigFile(next);
-        defaultRuntime.log(info(`Removed ${path}. Restart the gateway to apply.`));
-      } catch (err) {
-        defaultRuntime.error(danger(String(err)));
-        defaultRuntime.exit(1);
-      }
-    });
-}
@@ -1,17 +1,10 @@
 import fs from "node:fs";
-import fsp from "node:fs/promises";
 import path from "node:path";
 import chalk from "chalk";
 import type { Command } from "commander";

 import { loadConfig, writeConfigFile } from "../config/config.js";
-import type { ClawdbotConfig } from "../config/config.js";
-import {
-  installPluginFromArchive,
-  installPluginFromNpmSpec,
-  resolvePluginInstallDir,
-} from "../plugins/install.js";
-import { recordPluginInstall } from "../plugins/installs.js";
+import { installPluginFromArchive, installPluginFromNpmSpec } from "../plugins/install.js";
 import type { PluginRecord } from "../plugins/registry.js";
 import { buildPluginStatusReport } from "../plugins/status.js";
 import { defaultRuntime } from "../runtime.js";
@@ -29,11 +22,6 @@ export type PluginInfoOptions = {
  json?: boolean;
 };

-export type PluginUpdateOptions = {
-  all?: boolean;
-  dryRun?: boolean;
-};
-
 function formatPluginLine(plugin: PluginRecord, verbose = false): string {
  const status =
    plugin.status === "loaded"
@@ -68,16 +56,6 @@ function formatPluginLine(plugin: PluginRecord, verbose = false): string {
  return parts.join("\n");
 }

-async function readInstalledPackageVersion(dir: string): Promise<string | undefined> {
-  try {
-    const raw = await fsp.readFile(path.join(dir, "package.json"), "utf-8");
-    const parsed = JSON.parse(raw) as { version?: unknown };
-    return typeof parsed.version === "string" ? parsed.version : undefined;
-  } catch {
-    return undefined;
-  }
-}
-
 export function registerPluginsCli(program: Command) {
  const plugins = program
    .command("plugins")
@@ -140,8 +118,6 @@ export function registerPluginsCli(program: Command) {
        defaultRuntime.error(`Plugin not found: ${id}`);
        process.exit(1);
      }
-      const cfg = loadConfig();
-      const install = cfg.plugins?.installs?.[plugin.id];

      if (opts.json) {
        defaultRuntime.log(JSON.stringify(plugin, null, 2));
@@ -175,15 +151,6 @@ export function registerPluginsCli(program: Command) {
        lines.push(`Services: ${plugin.services.join(", ")}`);
      }
      if (plugin.error) lines.push(chalk.red(`Error: ${plugin.error}`));
-      if (install) {
-        lines.push("");
-        lines.push(`Install: ${install.source}`);
-        if (install.spec) lines.push(`Spec: ${install.spec}`);
-        if (install.sourcePath) lines.push(`Source path: ${install.sourcePath}`);
-        if (install.installPath) lines.push(`Install path: ${install.installPath}`);
-        if (install.version) lines.push(`Recorded version: ${install.version}`);
-        if (install.installedAt) lines.push(`Installed at: ${install.installedAt}`);
-      }
      defaultRuntime.log(lines.join("\n"));
    });

@@ -256,7 +223,7 @@ export function registerPluginsCli(program: Command) {
            process.exit(1);
          }

-          let next: ClawdbotConfig = {
+          const next = {
            ...cfg,
            plugins: {
              ...cfg.plugins,
@@ -269,13 +236,6 @@ export function registerPluginsCli(program: Command) {
              },
            },
          };
-          next = recordPluginInstall(next, {
-            pluginId: result.pluginId,
-            source: "archive",
-            sourcePath: resolved,
-            installPath: result.targetDir,
-            version: result.version,
-          });
          await writeConfigFile(next);
          defaultRuntime.log(`Installed plugin: ${result.pluginId}`);
          defaultRuntime.log(`Restart the gateway to load plugins.`);
@@ -327,7 +287,7 @@ export function registerPluginsCli(program: Command) {
        process.exit(1);
      }

-      let next: ClawdbotConfig = {
+      const next = {
        ...cfg,
        plugins: {
          ...cfg.plugins,
@@ -340,124 +300,11 @@ export function registerPluginsCli(program: Command) {
          },
        },
      };
-      next = recordPluginInstall(next, {
-        pluginId: result.pluginId,
-        source: "npm",
-        spec: raw,
-        installPath: result.targetDir,
-        version: result.version,
-      });
      await writeConfigFile(next);
      defaultRuntime.log(`Installed plugin: ${result.pluginId}`);
      defaultRuntime.log(`Restart the gateway to load plugins.`);
    });

-  plugins
-    .command("update")
-    .description("Update installed plugins (npm installs only)")
-    .argument("[id]", "Plugin id (omit with --all)")
-    .option("--all", "Update all tracked plugins", false)
-    .option("--dry-run", "Show what would change without writing", false)
-    .action(async (id: string | undefined, opts: PluginUpdateOptions) => {
-      const cfg = loadConfig();
-      const installs = cfg.plugins?.installs ?? {};
-      const targets = opts.all ? Object.keys(installs) : id ? [id] : [];
-
-      if (targets.length === 0) {
-        defaultRuntime.error("Provide a plugin id or use --all.");
-        process.exit(1);
-      }
-
-      let nextCfg = cfg;
-      let updatedCount = 0;
-
-      for (const pluginId of targets) {
-        const record = installs[pluginId];
-        if (!record) {
-          defaultRuntime.log(chalk.yellow(`No install record for "${pluginId}".`));
-          continue;
-        }
-        if (record.source !== "npm") {
-          defaultRuntime.log(
-            chalk.yellow(`Skipping "${pluginId}" (source: ${record.source}).`),
-          );
-          continue;
-        }
-        if (!record.spec) {
-          defaultRuntime.log(chalk.yellow(`Skipping "${pluginId}" (missing npm spec).`));
-          continue;
-        }
-
-        const installPath = record.installPath ?? resolvePluginInstallDir(pluginId);
-        const currentVersion = await readInstalledPackageVersion(installPath);
-
-        if (opts.dryRun) {
-          const probe = await installPluginFromNpmSpec({
-            spec: record.spec,
-            mode: "update",
-            dryRun: true,
-            expectedPluginId: pluginId,
-            logger: {
-              info: (msg) => defaultRuntime.log(msg),
-              warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
-            },
-          });
-          if (!probe.ok) {
-            defaultRuntime.log(chalk.red(`Failed to check ${pluginId}: ${probe.error}`));
-            continue;
-          }
-
-          const nextVersion = probe.version ?? "unknown";
-          const currentLabel = currentVersion ?? "unknown";
-          if (currentVersion && probe.version && currentVersion === probe.version) {
-            defaultRuntime.log(`${pluginId} is up to date (${currentLabel}).`);
-          } else {
-            defaultRuntime.log(
-              `Would update ${pluginId}: ${currentLabel} → ${nextVersion}.`,
-            );
-          }
-          continue;
-        }
-
-        const result = await installPluginFromNpmSpec({
-          spec: record.spec,
-          mode: "update",
-          expectedPluginId: pluginId,
-          logger: {
-            info: (msg) => defaultRuntime.log(msg),
-            warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
-          },
-        });
-        if (!result.ok) {
-          defaultRuntime.log(chalk.red(`Failed to update ${pluginId}: ${result.error}`));
-          continue;
-        }
-
-        const nextVersion = result.version ?? (await readInstalledPackageVersion(result.targetDir));
-        nextCfg = recordPluginInstall(nextCfg, {
-          pluginId,
-          source: "npm",
-          spec: record.spec,
-          installPath: result.targetDir,
-          version: nextVersion,
-        });
-        updatedCount += 1;
-
-        const currentLabel = currentVersion ?? "unknown";
-        const nextLabel = nextVersion ?? "unknown";
-        if (currentVersion && nextVersion && currentVersion === nextVersion) {
-          defaultRuntime.log(`${pluginId} already at ${currentLabel}.`);
-        } else {
-          defaultRuntime.log(`Updated ${pluginId}: ${currentLabel} → ${nextLabel}.`);
-        }
-      }
-
-      if (updatedCount > 0) {
-        await writeConfigFile(nextCfg);
-        defaultRuntime.log("Restart the gateway to load plugins.");
-      }
-    });
-
  plugins
    .command("doctor")
    .description("Report plugin load issues")
@@ -1,6 +1,5 @@
 import { Command } from "commander";
 import { registerBrowserCli } from "../browser-cli.js";
-import { registerConfigCli } from "../config-cli.js";
 import { createProgramContext } from "./context.js";
 import { configureProgramHelp } from "./help.js";
 import { registerPreActionHooks } from "./preaction.js";
@@ -23,7 +22,6 @@ export function buildProgram() {
  registerSetupCommand(program);
  registerOnboardCommand(program);
  registerConfigureCommand(program);
-  registerConfigCli(program);
  registerMaintenanceCommands(program);
  registerMessageCommands(program, ctx);
  registerAgentCommands(program, {
@@ -9,45 +9,54 @@ import { formatDocsLink } from "../../terminal/links.js";
 import { theme } from "../../terminal/theme.js";

 export function registerConfigureCommand(program: Command) {
-  program
-    .command("configure")
-    .description("Interactive prompt to set up credentials, devices, and agent defaults")
-    .addHelpText(
-      "after",
-      () =>
-        `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/configure", "docs.clawd.bot/cli/configure")}\n`,
-    )
-    .option(
-      "--section <section>",
-      `Configuration sections (repeatable). Options: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}`,
-      (value: string, previous: string[]) => [...previous, value],
-      [] as string[],
-    )
-    .action(async (opts) => {
-      try {
-        const sections: string[] = Array.isArray(opts.section)
-          ? opts.section
-              .map((value: unknown) => (typeof value === "string" ? value.trim() : ""))
-              .filter(Boolean)
-          : [];
-        if (sections.length === 0) {
-          await configureCommand(defaultRuntime);
-          return;
-        }
+  const register = (name: "configure" | "config") => {
+    program
+      .command(name)
+      .description(
+        name === "config"
+          ? "Alias for `clawdbot configure`"
+          : "Interactive prompt to set up credentials, devices, and agent defaults",
+      )
+      .addHelpText(
+        "after",
+        () =>
+          `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/configure", "docs.clawd.bot/cli/configure")}\n`,
+      )
+      .option(
+        "--section <section>",
+        `Configuration sections (repeatable). Options: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}`,
+        (value: string, previous: string[]) => [...previous, value],
+        [] as string[],
+      )
+      .action(async (opts) => {
+        try {
+          const sections: string[] = Array.isArray(opts.section)
+            ? opts.section
+                .map((value: unknown) => (typeof value === "string" ? value.trim() : ""))
+                .filter(Boolean)
+            : [];
+          if (sections.length === 0) {
+            await configureCommand(defaultRuntime);
+            return;
+          }

-        const invalid = sections.filter((s) => !CONFIGURE_WIZARD_SECTIONS.includes(s as never));
-        if (invalid.length > 0) {
-          defaultRuntime.error(
-            `Invalid --section: ${invalid.join(", ")}. Expected one of: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}.`,
-          );
+          const invalid = sections.filter((s) => !CONFIGURE_WIZARD_SECTIONS.includes(s as never));
+          if (invalid.length > 0) {
+            defaultRuntime.error(
+              `Invalid --section: ${invalid.join(", ")}. Expected one of: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}.`,
+            );
+            defaultRuntime.exit(1);
+            return;
+          }
+
+          await configureCommandWithSections(sections as never, defaultRuntime);
+        } catch (err) {
+          defaultRuntime.error(String(err));
          defaultRuntime.exit(1);
-          return;
        }
+      });
+  };

-        await configureCommandWithSections(sections as never, defaultRuntime);
-      } catch (err) {
-        defaultRuntime.error(String(err));
-        defaultRuntime.exit(1);
-      }
-    });
+  register("configure");
+  register("config");
 }
@@ -372,7 +372,7 @@ describe("doctor command", () => {
        );
      }),
    ).toBe(true);
-  }, 20_000);
+  }, 10_000);

  it("warns when extra workspace directories exist", async () => {
    readConfigFileSnapshot.mockResolvedValue({
@@ -68,9 +68,6 @@ describe("ensureOnboardingPluginInstalled", () => {
    expect(result.installed).toBe(true);
    expect(result.cfg.plugins?.entries?.zalo?.enabled).toBe(true);
    expect(result.cfg.plugins?.allow).toContain("zalo");
-    expect(result.cfg.plugins?.installs?.zalo?.source).toBe("npm");
-    expect(result.cfg.plugins?.installs?.zalo?.spec).toBe("@clawdbot/zalo");
-    expect(result.cfg.plugins?.installs?.zalo?.installPath).toBe("/tmp/zalo");
    expect(installPluginFromNpmSpec).toHaveBeenCalledWith(
      expect.objectContaining({ spec: "@clawdbot/zalo" }),
    );
@@ -4,7 +4,6 @@ import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../../agents/ag
 import type { ChannelPluginCatalogEntry } from "../../channels/plugins/catalog.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import { createSubsystemLogger } from "../../logging.js";
-import { recordPluginInstall } from "../../plugins/installs.js";
 import { loadClawdbotPlugins } from "../../plugins/loader.js";
 import { installPluginFromNpmSpec } from "../../plugins/install.js";
 import type { RuntimeEnv } from "../../runtime.js";
@@ -159,13 +158,6 @@ export async function ensureOnboardingPluginInstalled(params: {

  if (result.ok) {
    next = ensurePluginEnabled(next, result.pluginId);
-    next = recordPluginInstall(next, {
-      pluginId: result.pluginId,
-      source: "npm",
-      spec: entry.install.npmSpec,
-      installPath: result.targetDir,
-      version: result.version,
-    });
    return { cfg: next, installed: true };
  }

@@ -28,18 +28,13 @@ describe("config discord", () => {
                dm: {
                  enabled: true,
                  allowFrom: ["steipete"],
-                groupEnabled: true,
-                groupChannels: ["clawd-dm"],
-              },
-              actions: {
-                emojiUploads: true,
-                stickerUploads: false,
-                channels: true,
-              },
-              guilds: {
-                "123": {
-                  slug: "friends-of-clawd",
-                  requireMention: false,
+                  groupEnabled: true,
+                  groupChannels: ["clawd-dm"],
+                },
+                guilds: {
+                  "123": {
+                    slug: "friends-of-clawd",
+                    requireMention: false,
                    users: ["steipete"],
                    channels: {
                      general: { allow: true },
@@ -62,9 +57,6 @@ describe("config discord", () => {
      expect(cfg.channels?.discord?.enabled).toBe(true);
      expect(cfg.channels?.discord?.dm?.groupEnabled).toBe(true);
      expect(cfg.channels?.discord?.dm?.groupChannels).toEqual(["clawd-dm"]);
-      expect(cfg.channels?.discord?.actions?.emojiUploads).toBe(true);
-      expect(cfg.channels?.discord?.actions?.stickerUploads).toBe(false);
-      expect(cfg.channels?.discord?.actions?.channels).toBe(true);
      expect(cfg.channels?.discord?.guilds?.["123"]?.slug).toBe("friends-of-clawd");
      expect(cfg.channels?.discord?.guilds?.["123"]?.channels?.general?.allow).toBe(true);
    });
@@ -220,13 +220,6 @@ const FIELD_LABELS: Record<string, string> = {
  "plugins.entries": "Plugin Entries",
  "plugins.entries.*.enabled": "Plugin Enabled",
  "plugins.entries.*.config": "Plugin Config",
-  "plugins.installs": "Plugin Install Records",
-  "plugins.installs.*.source": "Plugin Install Source",
-  "plugins.installs.*.spec": "Plugin Install Spec",
-  "plugins.installs.*.sourcePath": "Plugin Install Source Path",
-  "plugins.installs.*.installPath": "Plugin Install Path",
-  "plugins.installs.*.version": "Plugin Install Version",
-  "plugins.installs.*.installedAt": "Plugin Install Time",
 };

 const FIELD_HELP: Record<string, string> = {
@@ -298,14 +291,6 @@ const FIELD_HELP: Record<string, string> = {
  "plugins.entries": "Per-plugin settings keyed by plugin id (enable/disable + config payloads).",
  "plugins.entries.*.enabled": "Overrides plugin enable/disable for this entry (restart required).",
  "plugins.entries.*.config": "Plugin-defined config payload (schema is provided by the plugin).",
-  "plugins.installs":
-    "CLI-managed install metadata (used by `clawdbot plugins update` to locate install sources).",
-  "plugins.installs.*.source": 'Install source ("npm", "archive", or "path").',
-  "plugins.installs.*.spec": "Original npm spec used for install (if source is npm).",
-  "plugins.installs.*.sourcePath": "Original archive/path used for install (if any).",
-  "plugins.installs.*.installPath": "Resolved install directory (usually ~/.clawdbot/extensions/<id>).",
-  "plugins.installs.*.version": "Version recorded at install time (if available).",
-  "plugins.installs.*.installedAt": "ISO timestamp of last install/update.",
  "agents.defaults.model.primary": "Primary model (provider/model).",
  "agents.defaults.model.fallbacks":
    "Ordered fallback models (provider/model). Used when the primary model fails.",
@@ -8,15 +8,6 @@ export type PluginsLoadConfig = {
  paths?: string[];
 };

-export type PluginInstallRecord = {
-  source: "npm" | "archive" | "path";
-  spec?: string;
-  sourcePath?: string;
-  installPath?: string;
-  version?: string;
-  installedAt?: string;
-};
-
 export type PluginsConfig = {
  /** Enable or disable plugin loading. */
  enabled?: boolean;
@@ -26,5 +17,4 @@ export type PluginsConfig = {
  deny?: string[];
  load?: PluginsLoadConfig;
  entries?: Record<string, PluginEntryConfig>;
-  installs?: Record<string, PluginInstallRecord>;
 };
@@ -154,8 +154,6 @@ export const DiscordAccountSchema = z.object({
    .object({
      reactions: z.boolean().optional(),
      stickers: z.boolean().optional(),
-      emojiUploads: z.boolean().optional(),
-      stickerUploads: z.boolean().optional(),
      polls: z.boolean().optional(),
      permissions: z.boolean().optional(),
      messages: z.boolean().optional(),
@@ -169,7 +167,6 @@ export const DiscordAccountSchema = z.object({
      voiceStatus: z.boolean().optional(),
      events: z.boolean().optional(),
      moderation: z.boolean().optional(),
-      channels: z.boolean().optional(),
    })
    .optional(),
  replyToMode: ReplyToModeSchema.optional(),
@@ -326,21 +326,6 @@ export const ClawdbotSchema = z
              .passthrough(),
          )
          .optional(),
-        installs: z
-          .record(
-            z.string(),
-            z
-              .object({
-                source: z.union([z.literal("npm"), z.literal("archive"), z.literal("path")]),
-                spec: z.string().optional(),
-                sourcePath: z.string().optional(),
-                installPath: z.string().optional(),
-                version: z.string().optional(),
-                installedAt: z.string().optional(),
-              })
-              .passthrough(),
-          )
-          .optional(),
      })
      .optional(),
  })
@@ -25,14 +25,14 @@ describe("parseSystemdExecStart", () => {
    ]);
  });

-  it("parses path arguments", () => {
-    const execStart = "/usr/bin/clawdbot gateway start --path /tmp/clawdbot";
+  it("preserves backslashes in arguments", () => {
+    const execStart = String.raw`/usr/bin/clawdbot gateway start --path \/tmp\/clawdbot`;
    expect(parseSystemdExecStart(execStart)).toEqual([
      "/usr/bin/clawdbot",
      "gateway",
      "start",
      "--path",
-      "/tmp/clawdbot",
+      "\\/tmp\\/clawdbot",
    ]);
  });
 });
@@ -172,61 +172,6 @@ describe("installPluginFromArchive", () => {
    expect(second.error).toContain("already exists");
  });

-  it("allows updates when mode is update", async () => {
-    const stateDir = makeTempDir();
-    const workDir = makeTempDir();
-    const pkgDir = path.join(workDir, "package");
-    fs.mkdirSync(path.join(pkgDir, "dist"), { recursive: true });
-    fs.writeFileSync(
-      path.join(pkgDir, "package.json"),
-      JSON.stringify({
-        name: "@clawdbot/voice-call",
-        version: "0.0.1",
-        clawdbot: { extensions: ["./dist/index.js"] },
-      }),
-      "utf-8",
-    );
-    fs.writeFileSync(path.join(pkgDir, "dist", "index.js"), "export {};", "utf-8");
-
-    const archiveV1 = packToArchive({
-      pkgDir,
-      outDir: workDir,
-      outName: "plugin-v1.tgz",
-    });
-
-    const archiveV2 = (() => {
-      fs.writeFileSync(
-        path.join(pkgDir, "package.json"),
-        JSON.stringify({
-          name: "@clawdbot/voice-call",
-          version: "0.0.2",
-          clawdbot: { extensions: ["./dist/index.js"] },
-        }),
-        "utf-8",
-      );
-      return packToArchive({
-        pkgDir,
-        outDir: workDir,
-        outName: "plugin-v2.tgz",
-      });
-    })();
-
-    const result = await withStateDir(stateDir, async () => {
-      const { installPluginFromArchive } = await import("./install.js");
-      const first = await installPluginFromArchive({ archivePath: archiveV1 });
-      const second = await installPluginFromArchive({ archivePath: archiveV2, mode: "update" });
-      return { first, second };
-    });
-
-    expect(result.first.ok).toBe(true);
-    expect(result.second.ok).toBe(true);
-    if (!result.second.ok) return;
-    const manifest = JSON.parse(
-      fs.readFileSync(path.join(result.second.targetDir, "package.json"), "utf-8"),
-    ) as { version?: string };
-    expect(manifest.version).toBe("0.0.2");
-  });
-
  it("rejects packages without clawdbot.extensions", async () => {
    const stateDir = makeTempDir();
    const workDir = makeTempDir();
@@ -12,7 +12,6 @@ type PluginInstallLogger = {

 type PackageManifest = {
  name?: string;
-  version?: string;
  dependencies?: Record<string, string>;
  clawdbot?: { extensions?: string[] };
 };
@@ -23,7 +22,6 @@ export type InstallPluginResult =
      pluginId: string;
      targetDir: string;
      manifestName?: string;
-      version?: string;
      extensions: string[];
    }
  | { ok: false; error: string };
@@ -72,13 +70,6 @@ async function resolvePackedPackageDir(extractDir: string): Promise<string> {
  return path.join(extractDir, onlyDir);
 }

-export function resolvePluginInstallDir(pluginId: string, extensionsDir?: string): string {
-  const extensionsBase = extensionsDir
-    ? resolveUserPath(extensionsDir)
-    : path.join(CONFIG_DIR, "extensions");
-  return path.join(extensionsBase, safeDirName(pluginId));
-}
-
 async function ensureClawdbotExtensions(manifest: PackageManifest) {
  const extensions = manifest.clawdbot?.extensions;
  if (!Array.isArray(extensions)) {
@@ -113,14 +104,9 @@ export async function installPluginFromArchive(params: {
  extensionsDir?: string;
  timeoutMs?: number;
  logger?: PluginInstallLogger;
-  mode?: "install" | "update";
-  dryRun?: boolean;
-  expectedPluginId?: string;
 }): Promise<InstallPluginResult> {
  const logger = params.logger ?? defaultLogger;
  const timeoutMs = params.timeoutMs ?? 120_000;
-  const mode = params.mode ?? "install";
-  const dryRun = params.dryRun ?? false;

  const archivePath = resolveUserPath(params.archivePath);
  if (!(await fileExists(archivePath))) {
@@ -171,47 +157,17 @@ export async function installPluginFromArchive(params: {

  const pkgName = typeof manifest.name === "string" ? manifest.name : "";
  const pluginId = pkgName ? unscopedPackageName(pkgName) : "plugin";
-  if (params.expectedPluginId && params.expectedPluginId !== pluginId) {
-    return {
-      ok: false,
-      error: `plugin id mismatch: expected ${params.expectedPluginId}, got ${pluginId}`,
-    };
-  }
  const targetDir = path.join(extensionsDir, safeDirName(pluginId));

-  if (mode === "install" && (await fileExists(targetDir))) {
+  if (await fileExists(targetDir)) {
    return {
      ok: false,
      error: `plugin already exists: ${targetDir} (delete it first)`,
    };
  }

-  if (dryRun) {
-    return {
-      ok: true,
-      pluginId,
-      targetDir,
-      manifestName: pkgName || undefined,
-      version: typeof manifest.version === "string" ? manifest.version : undefined,
-      extensions,
-    };
-  }
-
  logger.info?.(`Installing to ${targetDir}…`);
-  let backupDir: string | null = null;
-  if (mode === "update" && (await fileExists(targetDir))) {
-    backupDir = `${targetDir}.backup-${Date.now()}`;
-    await fs.rename(targetDir, backupDir);
-  }
-  try {
-    await fs.cp(packageDir, targetDir, { recursive: true });
-  } catch (err) {
-    if (backupDir) {
-      await fs.rm(targetDir, { recursive: true, force: true }).catch(() => undefined);
-      await fs.rename(backupDir, targetDir).catch(() => undefined);
-    }
-    return { ok: false, error: `failed to copy plugin: ${String(err)}` };
-  }
+  await fs.cp(packageDir, targetDir, { recursive: true });

  for (const entry of extensions) {
    const resolvedEntry = path.resolve(targetDir, entry);
@@ -229,10 +185,6 @@ export async function installPluginFromArchive(params: {
      cwd: targetDir,
    });
    if (npmRes.code !== 0) {
-      if (backupDir) {
-        await fs.rm(targetDir, { recursive: true, force: true }).catch(() => undefined);
-        await fs.rename(backupDir, targetDir).catch(() => undefined);
-      }
      return {
        ok: false,
        error: `npm install failed: ${npmRes.stderr.trim() || npmRes.stdout.trim()}`,
@@ -240,16 +192,11 @@ export async function installPluginFromArchive(params: {
    }
  }

-  if (backupDir) {
-    await fs.rm(backupDir, { recursive: true, force: true }).catch(() => undefined);
-  }
-
  return {
    ok: true,
    pluginId,
    targetDir,
    manifestName: pkgName || undefined,
-    version: typeof manifest.version === "string" ? manifest.version : undefined,
    extensions,
  };
 }
@@ -259,15 +206,9 @@ export async function installPluginFromNpmSpec(params: {
  extensionsDir?: string;
  timeoutMs?: number;
  logger?: PluginInstallLogger;
-  mode?: "install" | "update";
-  dryRun?: boolean;
-  expectedPluginId?: string;
 }): Promise<InstallPluginResult> {
  const logger = params.logger ?? defaultLogger;
  const timeoutMs = params.timeoutMs ?? 120_000;
-  const mode = params.mode ?? "install";
-  const dryRun = params.dryRun ?? false;
-  const expectedPluginId = params.expectedPluginId;
  const spec = params.spec.trim();
  if (!spec) return { ok: false, error: "missing npm spec" };

@@ -300,8 +241,5 @@ export async function installPluginFromNpmSpec(params: {
    extensionsDir: params.extensionsDir,
    timeoutMs,
    logger,
-    mode,
-    dryRun,
-    expectedPluginId,
  });
 }
@@ -1,27 +0,0 @@
-import type { ClawdbotConfig } from "../config/config.js";
-import type { PluginInstallRecord } from "../config/types.plugins.js";
-
-export type PluginInstallUpdate = PluginInstallRecord & { pluginId: string };
-
-export function recordPluginInstall(cfg: ClawdbotConfig, update: PluginInstallUpdate): ClawdbotConfig {
-  const { pluginId, ...record } = update;
-  const installs = {
-    ...cfg.plugins?.installs,
-    [pluginId]: {
-      ...cfg.plugins?.installs?.[pluginId],
-      ...record,
-      installedAt: record.installedAt ?? new Date().toISOString(),
-    },
-  };
-
-  return {
-    ...cfg,
-    plugins: {
-      ...cfg.plugins,
-      installs: {
-        ...installs,
-        [pluginId]: installs[pluginId],
-      },
-    },
-  };
-}
@@ -99,7 +99,7 @@ describe("telegram inbound media", () => {
    async () => {
      const { createTelegramBot } = await import("./bot.js");
      const replyModule = await import("../auto-reply/reply.js");
-      const replySpy = replyModule.__replySpy as unknown as ReturnType<typeof vi.fn>;
+      const replySpy = replyModule.getReplyFromConfig as unknown as ReturnType<typeof vi.fn>;

      onSpy.mockReset();
      replySpy.mockReset();
@@ -143,7 +143,7 @@ describe("telegram inbound media", () => {
    async () => {
      const { createTelegramBot } = await import("./bot.js");
      const replyModule = await import("../auto-reply/reply.js");
-      const replySpy = replyModule.__replySpy as unknown as ReturnType<typeof vi.fn>;
+      const replySpy = replyModule.getReplyFromConfig as unknown as ReturnType<typeof vi.fn>;

      onSpy.mockReset();
      replySpy.mockReset();
@@ -3,7 +3,9 @@ import os from "node:os";
 import path from "node:path";

 import { DisconnectReason } from "@whiskeysockets/baileys";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.useFakeTimers();

 const rmMock = vi.spyOn(fs, "rm");

@@ -49,13 +51,9 @@ const { loginWeb } = await import("./login.js");

 describe("loginWeb coverage", () => {
  beforeEach(() => {
-    vi.useFakeTimers();
    vi.clearAllMocks();
    rmMock.mockClear();
  });
-  afterEach(() => {
-    vi.useRealTimers();
-  });

  it("restarts once when WhatsApp requests code 515", async () => {
    waitForWaConnection
Author	SHA1	Message	Date
Peter Steinberger	860dc74639	fix: adjust systemd ExecStart escape test (#995 ) (thanks @roshanasingh4)	2026-01-16 06:03:17 +00:00
Roshan Singh	97acca47ac	Fix systemd ExecStart parsing whitespace	2026-01-16 05:41:30 +00:00