fix: handle repeated compaction failures (#1187 ) (thanks @fayrose)

fix: add reserveTokensFloor suggestion to compaction error messages
When context limit is exceeded, the error message now suggests setting agents.defaults.compaction.reserveTokensFloor to 4000 or higher to prevent future occurrences.
2026-01-18 22:02:22 +00:00 · 2026-01-18 21:54:04 +00:00 · 2026-01-18 21:54:04 +00:00 · 2026-01-18 21:54:04 +00:00
313 changed files with 19904 additions and 23166 deletions
@@ -1,5 +1,4 @@
 node_modules
-**/node_modules/
 .env
 docker-compose.extra.yml
 dist
@@ -1 +0,0 @@
-src/canvas-host/a2ui/a2ui.bundle.js
@@ -8,10 +8,6 @@
 - Docs: `docs/` (images, queue, Pi config). Built output lives in `dist/`.
 - Plugins/extensions: live under `extensions/*` (workspace packages). Keep plugin-only deps in the extension `package.json`; do not add them to the root `package.json` unless core uses them.
 - Installers served from `https://clawd.bot/*`: live in the sibling repo `../clawd.bot` (`public/install.sh`, `public/install-cli.sh`, `public/install.ps1`).
- Messaging channels: always consider **all** built-in + extension channels when refactoring shared logic (routing, allowlists, pairing, command gating, onboarding, docs).
-  - Core channel docs: `docs/channels/`
-  - Core channel code: `src/telegram`, `src/discord`, `src/slack`, `src/signal`, `src/imessage`, `src/web` (WhatsApp web), `src/channels`, `src/routing`
-  - Extensions (channel plugins): `extensions/*` (e.g. `extensions/msteams`, `extensions/matrix`, `extensions/zalo`, `extensions/zalouser`, `extensions/voice-call`)

 ## Docs Linking (Mintlify)
 - Docs are hosted on Mintlify (docs.clawd.bot).
@@ -84,7 +80,6 @@

 ## Agent-Specific Notes
 - Vocabulary: "makeup" = "mac app".
- Never edit `node_modules` (global/Homebrew/npm/git installs too). Updates overwrite. Skill notes go in `tools.md` or `AGENTS.md`.
 - When working on a GitHub Issue or PR, print the full URL at the end of the task.
 - When answering questions, respond with high-confidence answers only: verify in code; do not guess.
 - Never update the Carbon dependency.
@@ -2,45 +2,17 @@

 Docs: https://docs.clawd.bot

-## 2026.1.19-1
-
-### Breaking
- **BREAKING:** Reject invalid/unknown config entries and refuse to start the gateway for safety; run `clawdbot doctor --fix` to repair. 
-
-### Changes
- Usage: add `/usage cost` summaries and macOS menu cost submenu with daily charting.
- Agents: clarify node_modules read-only guidance in agent instructions.
- TUI: add syntax highlighting for code blocks. (#1200) — thanks @vignesh07.
-
-### Fixes
- Plugins: surface plugin load/register/config errors in gateway logs with plugin/source context.
-<<<<<<< Updated upstream
- Agents: propagate accountId into embedded runs so sub-agent announce routing honors the originating account. (#1058)
-||||||| Stash base
-=======
- Compaction: include tool failure summaries in safeguard compaction to prevent retry loops. (#1084)
->>>>>>> Stashed changes
-
 ## 2026.1.18-5

 ### Changes
 - Dependencies: update core + plugin deps (grammy, vitest, openai, Microsoft agents hosting, etc.).
- Onboarding: add allowlist prompts and username-to-id resolution across core and extension channels.
- TUI: add searchable model picker for quicker model selection. (#1198) — thanks @vignesh07.
- Docs: clarify allowlist input types and onboarding behavior for messaging channels.
+- Agents: make inbound message envelopes configurable (timezone/timestamp/elapsed) and surface elapsed gaps. (#1150) — thanks @shiv19.

 ### Fixes
 - Configure: hide OpenRouter auto routing model from the model picker. (#1182) — thanks @zerone0x.
- Docs: make docs:list fail fast with a clear error if the docs directory is missing.
+- Agents: retry compaction reset once, then surface a user-facing error on repeat failure. (#1187) — thanks @fayrose.
 - macOS: load menu session previews asynchronously so items populate while the menu is open.
 - macOS: use label colors for session preview text so previews render in menu subviews.
- macOS: suppress usage error text in the menubar cost view.
- Telegram: honor pairing allowlists for native slash commands.
- TUI: highlight model search matches and stabilize search ordering.
- CLI: keep banners on routed commands, restore config guarding outside fast-path routing, and tighten fast-path flag parsing while skipping console capture for extra speed. (#1195) — thanks @gumadeiras.
- Slack: resolve Bolt import interop for Bun + Node. (#1191) — thanks @CoreyH.
- Gateway: require authorized restarts for SIGUSR1 (restart/apply/update) so config gating can't be bypassed.
- Discord: stop reconnecting the gateway after aborts to prevent duplicate listeners.

 ## 2026.1.18-4

@@ -11,13 +11,12 @@
 <p align="center">
  <a href="https://github.com/clawdbot/clawdbot/actions/workflows/ci.yml?branch=main"><img src="https://img.shields.io/github/actions/workflow/status/clawdbot/clawdbot/ci.yml?branch=main&style=for-the-badge" alt="CI status"></a>
  <a href="https://github.com/clawdbot/clawdbot/releases"><img src="https://img.shields.io/github/v/release/clawdbot/clawdbot?include_prereleases&style=for-the-badge" alt="GitHub release"></a>
-  <a href="https://deepwiki.com/clawdbot/clawdbot"><img src="https://img.shields.io/badge/DeepWiki-clawdbot-111111?style=for-the-badge" alt="DeepWiki"></a>
  <a href="https://discord.gg/clawd"><img src="https://img.shields.io/discord/1456350064065904867?label=Discord&logo=discord&logoColor=white&color=5865F2&style=for-the-badge" alt="Discord"></a>
  <a href="LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg?style=for-the-badge" alt="MIT License"></a>
 </p>

 **Clawdbot** is a *personal AI assistant* you run on your own devices.
-It answers you on the channels you already use (WhatsApp, Telegram, Slack, Discord, Signal, iMessage, Microsoft Teams, WebChat), plus extension channels like BlueBubbles, Matrix, Zalo, and Zalo Personal. It can speak and listen on macOS/iOS/Android, and can render a live Canvas you control. The Gateway is just the control plane — the product is the assistant.
+It answers you on the channels you already use (WhatsApp, Telegram, Slack, Discord, Signal, iMessage, Microsoft Teams, WebChat), can speak and listen on macOS/iOS/Android, and can render a live Canvas you control. The Gateway is just the control plane — the product is the assistant.

 If you want a personal, single-user assistant that feels local, fast, and always-on, this is it.

@@ -65,7 +64,7 @@ clawdbot gateway --port 18789 --verbose
 # Send a message
 clawdbot message send --to +1234567890 --message "Hello from Clawdbot"

-# Talk to the assistant (optionally deliver back to any connected channel: WhatsApp/Telegram/Slack/Discord/Signal/iMessage/BlueBubbles/Microsoft Teams/Matrix/Zalo/Zalo Personal/WebChat)
+# Talk to the assistant (optionally deliver back to WhatsApp/Telegram/Slack/Discord/Microsoft Teams)
 clawdbot agent --message "Ship checklist" --thinking high
 ```

@@ -107,7 +106,7 @@ Run `clawdbot doctor` to surface risky/misconfigured DM policies.
 ## Highlights

 - **[Local-first Gateway](https://docs.clawd.bot/gateway)** — single control plane for sessions, channels, tools, and events.
- **[Multi-channel inbox](https://docs.clawd.bot/channels)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, BlueBubbles, Microsoft Teams, Matrix, Zalo, Zalo Personal, WebChat, macOS, iOS/Android.
+- **[Multi-channel inbox](https://docs.clawd.bot/channels)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, Microsoft Teams, WebChat, macOS, iOS/Android.
 - **[Multi-agent routing](https://docs.clawd.bot/gateway/configuration)** — route inbound channels/accounts/peers to isolated agents (workspaces + per-agent sessions).
 - **[Voice Wake](https://docs.clawd.bot/nodes/voicewake) + [Talk Mode](https://docs.clawd.bot/nodes/talk)** — always-on speech for macOS/iOS/Android with ElevenLabs.
 - **[Live Canvas](https://docs.clawd.bot/platforms/mac/canvas)** — agent-driven visual workspace with [A2UI](https://docs.clawd.bot/platforms/mac/canvas#canvas-a2ui).
@@ -129,7 +128,7 @@ Run `clawdbot doctor` to surface risky/misconfigured DM policies.
 - [Media pipeline](https://docs.clawd.bot/nodes/images): images/audio/video, transcription hooks, size caps, temp file lifecycle. Audio details: [Audio](https://docs.clawd.bot/nodes/audio).

 ### Channels
- [Channels](https://docs.clawd.bot/channels): [WhatsApp](https://docs.clawd.bot/channels/whatsapp) (Baileys), [Telegram](https://docs.clawd.bot/channels/telegram) (grammY), [Slack](https://docs.clawd.bot/channels/slack) (Bolt), [Discord](https://docs.clawd.bot/channels/discord) (discord.js), [Signal](https://docs.clawd.bot/channels/signal) (signal-cli), [iMessage](https://docs.clawd.bot/channels/imessage) (imsg), [BlueBubbles](https://docs.clawd.bot/channels/bluebubbles) (extension), [Microsoft Teams](https://docs.clawd.bot/channels/msteams) (extension), [Matrix](https://docs.clawd.bot/channels/matrix) (extension), [Zalo](https://docs.clawd.bot/channels/zalo) (extension), [Zalo Personal](https://docs.clawd.bot/channels/zalouser) (extension), [WebChat](https://docs.clawd.bot/web/webchat).
+- [Channels](https://docs.clawd.bot/channels): [WhatsApp](https://docs.clawd.bot/channels/whatsapp) (Baileys), [Telegram](https://docs.clawd.bot/channels/telegram) (grammY), [Slack](https://docs.clawd.bot/channels/slack) (Bolt), [Discord](https://docs.clawd.bot/channels/discord) (discord.js), [Signal](https://docs.clawd.bot/channels/signal) (signal-cli), [iMessage](https://docs.clawd.bot/channels/imessage) (imsg), [Microsoft Teams](https://docs.clawd.bot/channels/msteams) (Bot Framework), [WebChat](https://docs.clawd.bot/web/webchat).
 - [Group routing](https://docs.clawd.bot/concepts/group-messages): mention gating, reply tags, per-channel chunking and routing. Channel rules: [Channels](https://docs.clawd.bot/channels).

 ### Apps + nodes
@@ -160,7 +159,7 @@ Run `clawdbot doctor` to surface risky/misconfigured DM policies.
 ## How it works (short)

 ```
-WhatsApp / Telegram / Slack / Discord / Signal / iMessage / BlueBubbles / Microsoft Teams / Matrix / Zalo / Zalo Personal / WebChat
+WhatsApp / Telegram / Slack / Discord / Signal / iMessage / Microsoft Teams / WebChat
               │
               ▼
 ┌───────────────────────────────┐
@@ -12,9 +12,6 @@ final class ConnectionModeCoordinator {
    func apply(mode: AppState.ConnectionMode, paused: Bool) async {
        switch mode {
        case .unconfigured:
-            if let error = await NodeServiceManager.stop() {
-                NodesStore.shared.lastError = "Node service stop failed: \(error)"
-            }
            await RemoteTunnelManager.shared.stopAll()
            WebChatManager.shared.resetTunnels()
            GatewayProcessManager.shared.stop()
@@ -23,9 +20,6 @@ final class ConnectionModeCoordinator {
            Task.detached { await PortGuardian.shared.sweep(mode: .unconfigured) }

        case .local:
-            if let error = await NodeServiceManager.stop() {
-                NodesStore.shared.lastError = "Node service stop failed: \(error)"
-            }
            await RemoteTunnelManager.shared.stopAll()
            WebChatManager.shared.resetTunnels()
            let shouldStart = GatewayAutostartPolicy.shouldStartGateway(mode: .local, paused: paused)
@@ -56,9 +50,6 @@ final class ConnectionModeCoordinator {
            WebChatManager.shared.resetTunnels()

            do {
-                if let error = await NodeServiceManager.start() {
-                    NodesStore.shared.lastError = "Node service start failed: \(error)"
-                }
                _ = try await GatewayEndpointStore.shared.ensureRemoteControlTunnel()
                let settings = CommandResolver.connectionSettings()
                try await ControlChannel.shared.configure(mode: .remote(
@@ -1,99 +0,0 @@
-import Charts
-import SwiftUI
-
-struct CostUsageHistoryMenuView: View {
-    let summary: GatewayCostUsageSummary
-    let width: CGFloat
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 10) {
-            self.header
-            self.chart
-            self.footer
-        }
-        .padding(.horizontal, 12)
-        .padding(.vertical, 10)
-        .frame(width: max(1, self.width), alignment: .leading)
-    }
-
-    private var header: some View {
-        let todayKey = CostUsageMenuDateParser.format(Date())
-        let todayEntry = self.summary.daily.first { $0.date == todayKey }
-        let todayCost = CostUsageFormatting.formatUsd(todayEntry?.totalCost) ?? "n/a"
-        let totalCost = CostUsageFormatting.formatUsd(self.summary.totals.totalCost) ?? "n/a"
-
-        return HStack(alignment: .firstTextBaseline, spacing: 12) {
-            VStack(alignment: .leading, spacing: 2) {
-                Text("Today")
-                    .font(.caption2)
-                    .foregroundStyle(.secondary)
-                Text(todayCost)
-                    .font(.system(size: 14, weight: .semibold))
-            }
-            VStack(alignment: .leading, spacing: 2) {
-                Text("Last \(self.summary.days)d")
-                    .font(.caption2)
-                    .foregroundStyle(.secondary)
-                Text(totalCost)
-                    .font(.system(size: 14, weight: .semibold))
-            }
-            Spacer()
-        }
-    }
-
-    private var chart: some View {
-        let entries = self.summary.daily.compactMap { entry -> (Date, Double)? in
-            guard let date = CostUsageMenuDateParser.parse(entry.date) else { return nil }
-            return (date, entry.totalCost)
-        }
-
-        return Chart(entries, id: \.0) { entry in
-            BarMark(
-                x: .value("Day", entry.0),
-                y: .value("Cost", entry.1))
-                .foregroundStyle(Color.accentColor)
-                .cornerRadius(3)
-        }
-        .chartXAxis {
-            AxisMarks(values: .stride(by: .day, count: 7)) {
-                AxisGridLine().foregroundStyle(.clear)
-                AxisValueLabel(format: .dateTime.month().day())
-            }
-        }
-        .chartYAxis {
-            AxisMarks(position: .leading) {
-                AxisGridLine()
-                AxisValueLabel()
-            }
-        }
-        .frame(height: 110)
-    }
-
-    private var footer: some View {
-        if self.summary.totals.missingCostEntries == 0 {
-            return AnyView(EmptyView())
-        }
-        return AnyView(
-            Text("Partial: \(self.summary.totals.missingCostEntries) entries missing cost")
-                .font(.caption2)
-                .foregroundStyle(.secondary))
-    }
-}
-
-private enum CostUsageMenuDateParser {
-    static let formatter: DateFormatter = {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd"
-        formatter.locale = Locale(identifier: "en_US_POSIX")
-        formatter.timeZone = TimeZone.current
-        return formatter
-    }()
-
-    static func parse(_ value: String) -> Date? {
-        self.formatter.date(from: value)
-    }
-
-    static func format(_ date: Date) -> String {
-        self.formatter.string(from: date)
-    }
-}
@@ -27,10 +27,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
    private var cachedUsageErrorText: String?
    private var usageCacheUpdatedAt: Date?
    private let usageRefreshIntervalSeconds: TimeInterval = 30
-    private var cachedCostSummary: GatewayCostUsageSummary?
-    private var cachedCostErrorText: String?
-    private var costCacheUpdatedAt: Date?
-    private let costRefreshIntervalSeconds: TimeInterval = 45
    private let nodesStore = NodesStore.shared
    #if DEBUG
    private var testControlChannelConnected: Bool?
@@ -68,7 +64,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
            guard let self else { return }
            await self.refreshCache(force: forceRefresh)
            await self.refreshUsageCache(force: forceRefresh)
-            await self.refreshCostUsageCache(force: forceRefresh)
            await MainActor.run {
                guard self.isMenuOpen else { return }
                self.inject(into: menu)
@@ -205,7 +200,6 @@ extension MenuSessionsInjector {
        }

        cursor = self.insertUsageSection(into: menu, at: cursor, width: width)
-        cursor = self.insertCostUsageSection(into: menu, at: cursor, width: width)

        DispatchQueue.main.async { [weak self, weak headerView] in
            guard let self, let headerView else { return }
@@ -350,28 +344,6 @@ extension MenuSessionsInjector {
        return cursor
    }

-    private func insertCostUsageSection(into menu: NSMenu, at cursor: Int, width: CGFloat) -> Int {
-        guard self.isControlChannelConnected else { return cursor }
-        guard let submenu = self.buildCostUsageSubmenu(width: width) else { return cursor }
-        var cursor = cursor
-
-        if cursor > 0, !menu.items[cursor - 1].isSeparatorItem {
-            let separator = NSMenuItem.separator()
-            separator.tag = self.tag
-            menu.insertItem(separator, at: cursor)
-            cursor += 1
-        }
-
-        let item = NSMenuItem(title: "Usage cost (30 days)", action: nil, keyEquivalent: "")
-        item.tag = self.tag
-        item.isEnabled = true
-        item.image = NSImage(systemSymbolName: "chart.bar.xaxis", accessibilityDescription: nil)
-        item.submenu = submenu
-        menu.insertItem(item, at: cursor)
-        cursor += 1
-        return cursor
-    }
-
    private var selectedUsageProviderId: String? {
        guard let model = self.cachedSnapshot?.defaults.model.nonEmpty else { return nil }
        let trimmed = model.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -421,36 +393,6 @@ extension MenuSessionsInjector {
        }
    }

-    private func buildCostUsageSubmenu(width: CGFloat) -> NSMenu? {
-        if let error = self.cachedCostErrorText, !error.isEmpty, self.cachedCostSummary == nil {
-            let menu = NSMenu()
-            let item = NSMenuItem(title: error, action: nil, keyEquivalent: "")
-            item.isEnabled = false
-            menu.addItem(item)
-            return menu
-        }
-
-        guard let summary = self.cachedCostSummary else { return nil }
-        guard !summary.daily.isEmpty else { return nil }
-
-        let menu = NSMenu()
-        menu.delegate = self
-
-        let chartView = CostUsageHistoryMenuView(summary: summary, width: width)
-        let hosting = NSHostingView(rootView: AnyView(chartView))
-        let controller = NSHostingController(rootView: AnyView(chartView))
-        let size = controller.sizeThatFits(in: CGSize(width: width, height: .greatestFiniteMagnitude))
-        hosting.frame = NSRect(origin: .zero, size: NSSize(width: width, height: size.height))
-
-        let chartItem = NSMenuItem()
-        chartItem.view = hosting
-        chartItem.isEnabled = false
-        chartItem.representedObject = "costUsageChart"
-        menu.addItem(chartItem)
-
-        return menu
-    }
-
    private func gatewayEntry() -> NodeInfo? {
        let mode = AppStateStore.shared.connectionMode
        let isConnected = self.isControlChannelConnected
@@ -639,31 +581,6 @@ extension MenuSessionsInjector {
        self.usageCacheUpdatedAt = Date()
    }

-    private func refreshCostUsageCache(force: Bool) async {
-        if !force,
-           let updated = self.costCacheUpdatedAt,
-           Date().timeIntervalSince(updated) < self.costRefreshIntervalSeconds
-        {
-            return
-        }
-
-        guard self.isControlChannelConnected else {
-            self.cachedCostSummary = nil
-            self.cachedCostErrorText = nil
-            self.costCacheUpdatedAt = Date()
-            return
-        }
-
-        do {
-            self.cachedCostSummary = try await CostUsageLoader.loadSummary()
-            self.cachedCostErrorText = nil
-        } catch {
-            self.cachedCostSummary = nil
-            self.cachedCostErrorText = self.compactUsageError(error)
-        }
-        self.costCacheUpdatedAt = Date()
-    }
-
    private func compactUsageError(_ error: Error) -> String {
        let message = error.localizedDescription.trimmingCharacters(in: .whitespacesAndNewlines)
        if message.isEmpty { return "Usage unavailable" }
@@ -443,6 +443,7 @@ actor MacNodeRuntime {
        let approvals = ExecApprovalsStore.resolve(agentId: agentId)
        let security = approvals.agent.security
        let ask = approvals.agent.ask
+        let askFallback = approvals.agent.askFallback
        let autoAllowSkills = approvals.agent.autoAllowSkills
        let sessionKey = (params.sessionKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
            ? params.sessionKey!.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -488,7 +489,7 @@ actor MacNodeRuntime {

        var approvedByAsk = false
        if requiresAsk {
-            let decision = await ExecApprovalsPromptPresenter.prompt(
+            let decision: ExecApprovalDecision? = await ExecApprovalsPromptPresenter.prompt(
                ExecApprovalPromptRequest(
                    command: displayCommand,
                    cwd: params.cwd,
@@ -499,7 +500,7 @@ actor MacNodeRuntime {
                    resolvedPath: resolution?.resolvedPath))

            switch decision {
-            case .deny:
+            case .deny?:
                await self.emitExecEvent(
                    "exec.denied",
                    payload: ExecEventPayload(
@@ -512,7 +513,41 @@ actor MacNodeRuntime {
                    req,
                    code: .unavailable,
                    message: "SYSTEM_RUN_DENIED: user denied")
-            case .allowAlways:
+            case nil:
+                if askFallback == .full {
+                    approvedByAsk = true
+                } else if askFallback == .allowlist {
+                    if allowlistMatch != nil || skillAllow {
+                        approvedByAsk = true
+                    } else {
+                        await self.emitExecEvent(
+                            "exec.denied",
+                            payload: ExecEventPayload(
+                                sessionKey: sessionKey,
+                                runId: runId,
+                                host: "node",
+                                command: displayCommand,
+                                reason: "approval-required"))
+                        return Self.errorResponse(
+                            req,
+                            code: .unavailable,
+                            message: "SYSTEM_RUN_DENIED: approval required")
+                    }
+                } else {
+                    await self.emitExecEvent(
+                        "exec.denied",
+                        payload: ExecEventPayload(
+                            sessionKey: sessionKey,
+                            runId: runId,
+                            host: "node",
+                            command: displayCommand,
+                            reason: "approval-required"))
+                    return Self.errorResponse(
+                        req,
+                        code: .unavailable,
+                        message: "SYSTEM_RUN_DENIED: approval required")
+                }
+            case .allowAlways?:
                approvedByAsk = true
                if security == .allowlist {
                    let pattern = resolution?.resolvedPath ??
@@ -523,7 +558,7 @@ actor MacNodeRuntime {
                        ExecApprovalsStore.addAllowlistEntry(agentId: agentId, pattern: pattern)
                    }
                }
-            case .allowOnce:
+            case .allowOnce?:
                approvedByAsk = true
            }
        }
@@ -1,150 +0,0 @@
-import Foundation
-import OSLog
-
-enum NodeServiceManager {
-    private static let logger = Logger(subsystem: "com.clawdbot", category: "node.service")
-
-    static func start() async -> String? {
-        let result = await self.runServiceCommandResult(
-            ["node", "start"],
-            timeout: 20,
-            quiet: false)
-        if let error = self.errorMessage(from: result, treatNotLoadedAsError: true) {
-            self.logger.error("node service start failed: \(error, privacy: .public)")
-            return error
-        }
-        return nil
-    }
-
-    static func stop() async -> String? {
-        let result = await self.runServiceCommandResult(
-            ["node", "stop"],
-            timeout: 15,
-            quiet: false)
-        if let error = self.errorMessage(from: result, treatNotLoadedAsError: false) {
-            self.logger.error("node service stop failed: \(error, privacy: .public)")
-            return error
-        }
-        return nil
-    }
-}
-
-extension NodeServiceManager {
-    private struct CommandResult {
-        let success: Bool
-        let payload: Data?
-        let message: String?
-        let parsed: ParsedServiceJson?
-    }
-
-    private struct ParsedServiceJson {
-        let text: String
-        let object: [String: Any]
-        let ok: Bool?
-        let result: String?
-        let message: String?
-        let error: String?
-        let hints: [String]
-    }
-
-    private static func runServiceCommandResult(
-        _ args: [String],
-        timeout: Double,
-        quiet: Bool) async -> CommandResult
-    {
-        let command = CommandResolver.clawdbotCommand(
-            subcommand: "service",
-            extraArgs: self.withJsonFlag(args),
-            // Service management must always run locally, even if remote mode is configured.
-            configRoot: ["gateway": ["mode": "local"]])
-        var env = ProcessInfo.processInfo.environment
-        env["PATH"] = CommandResolver.preferredPaths().joined(separator: ":")
-        let response = await ShellExecutor.runDetailed(command: command, cwd: nil, env: env, timeout: timeout)
-        let parsed = self.parseServiceJson(from: response.stdout) ?? self.parseServiceJson(from: response.stderr)
-        let ok = parsed?.ok
-        let message = parsed?.error ?? parsed?.message
-        let payload = parsed?.text.data(using: .utf8)
-            ?? (response.stdout.isEmpty ? response.stderr : response.stdout).data(using: .utf8)
-        let success = ok ?? response.success
-        if success {
-            return CommandResult(success: true, payload: payload, message: nil, parsed: parsed)
-        }
-
-        if quiet {
-            return CommandResult(success: false, payload: payload, message: message, parsed: parsed)
-        }
-
-        let detail = message ?? self.summarize(response.stderr) ?? self.summarize(response.stdout)
-        let exit = response.exitCode.map { "exit \($0)" } ?? (response.errorMessage ?? "failed")
-        let fullMessage = detail.map { "Node service command failed (\(exit)): \($0)" }
-            ?? "Node service command failed (\(exit))"
-        self.logger.error("\(fullMessage, privacy: .public)")
-        return CommandResult(success: false, payload: payload, message: detail, parsed: parsed)
-    }
-
-    private static func errorMessage(from result: CommandResult, treatNotLoadedAsError: Bool) -> String? {
-        if !result.success {
-            return result.message ?? "Node service command failed"
-        }
-        guard let parsed = result.parsed else { return nil }
-        if parsed.ok == false {
-            return self.mergeHints(message: parsed.error ?? parsed.message, hints: parsed.hints)
-        }
-        if treatNotLoadedAsError, parsed.result == "not-loaded" {
-            let base = parsed.message ?? "Node service not loaded."
-            return self.mergeHints(message: base, hints: parsed.hints)
-        }
-        return nil
-    }
-
-    private static func withJsonFlag(_ args: [String]) -> [String] {
-        if args.contains("--json") { return args }
-        return args + ["--json"]
-    }
-
-    private static func parseServiceJson(from raw: String) -> ParsedServiceJson? {
-        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard let start = trimmed.firstIndex(of: "{"),
-              let end = trimmed.lastIndex(of: "}")
-        else {
-            return nil
-        }
-        let jsonText = String(trimmed[start...end])
-        guard let data = jsonText.data(using: .utf8) else { return nil }
-        guard let object = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return nil }
-        let ok = object["ok"] as? Bool
-        let result = object["result"] as? String
-        let message = object["message"] as? String
-        let error = object["error"] as? String
-        let hints = (object["hints"] as? [String]) ?? []
-        return ParsedServiceJson(
-            text: jsonText,
-            object: object,
-            ok: ok,
-            result: result,
-            message: message,
-            error: error,
-            hints: hints)
-    }
-
-    private static func mergeHints(message: String?, hints: [String]) -> String? {
-        let trimmed = message?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let nonEmpty = trimmed?.isEmpty == false ? trimmed : nil
-        guard !hints.isEmpty else { return nonEmpty }
-        let hintText = hints.prefix(2).joined(separator: " · ")
-        if let nonEmpty {
-            return "\(nonEmpty) (\(hintText))"
-        }
-        return hintText
-    }
-
-    private static func summarize(_ text: String) -> String? {
-        let lines = text
-            .split(whereSeparator: \.isNewline)
-            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
-            .filter { !$0.isEmpty }
-        guard let last = lines.last else { return nil }
-        let normalized = last.replacingOccurrences(of: "\\s+", with: " ", options: .regularExpression)
-        return normalized.count > 200 ? String(normalized.prefix(199)) + "…" : normalized
-    }
-}
@@ -210,7 +210,6 @@ extension OnboardingView {
        title: String,
        subtitle: String,
        systemImage: String,
-        buttonTitle: String,
        action: @escaping () -> Void) -> some View
    {
        HStack(alignment: .top, spacing: 12) {
@@ -223,7 +222,7 @@ extension OnboardingView {
                Text(subtitle)
                    .font(.subheadline)
                    .foregroundStyle(.secondary)
-                Button(buttonTitle, action: action)
+                Button("Open Settings → Skills", action: action)
                    .buttonStyle(.link)
                    .padding(.top, 2)
            }
@@ -695,8 +695,7 @@ extension OnboardingView {
                self.featureActionRow(
                    title: "Connect WhatsApp or Telegram",
                    subtitle: "Open Settings → Channels to link channels and monitor status.",
-                    systemImage: "link",
-                    buttonTitle: "Open Settings → Channels")
+                    systemImage: "link")
                {
                    self.openSettings(tab: .channels)
                }
@@ -712,8 +711,7 @@ extension OnboardingView {
                self.featureActionRow(
                    title: "Give your agent more powers",
                    subtitle: "Enable optional skills (Peekaboo, oracle, camsnap, …) from Settings → Skills.",
-                    systemImage: "sparkles",
-                    buttonTitle: "Open Settings → Skills")
+                    systemImage: "sparkles")
                {
                    self.openSettings(tab: .skills)
                }
@@ -78,7 +78,6 @@ extension OnboardingView {
            title: "Action",
            subtitle: "Action subtitle",
            systemImage: "gearshape",
-            buttonTitle: "Action",
            action: {})
        _ = view.gatewaySubtitle(for: gateway)
        _ = view.isSelectedGateway(gateway)
@@ -1,60 +0,0 @@
-import Foundation
-
-struct GatewayCostUsageTotals: Codable {
-    let input: Int
-    let output: Int
-    let cacheRead: Int
-    let cacheWrite: Int
-    let totalTokens: Int
-    let totalCost: Double
-    let missingCostEntries: Int
-}
-
-struct GatewayCostUsageDay: Codable {
-    let date: String
-    let input: Int
-    let output: Int
-    let cacheRead: Int
-    let cacheWrite: Int
-    let totalTokens: Int
-    let totalCost: Double
-    let missingCostEntries: Int
-}
-
-struct GatewayCostUsageSummary: Codable {
-    let updatedAt: Double
-    let days: Int
-    let daily: [GatewayCostUsageDay]
-    let totals: GatewayCostUsageTotals
-}
-
-enum CostUsageFormatting {
-    static func formatUsd(_ value: Double?) -> String? {
-        guard let value, value.isFinite else { return nil }
-        if value >= 1 { return String(format: "$%.2f", value) }
-        if value >= 0.01 { return String(format: "$%.2f", value) }
-        return String(format: "$%.4f", value)
-    }
-
-    static func formatTokenCount(_ value: Int?) -> String? {
-        guard let value else { return nil }
-        let safe = max(0, value)
-        if safe >= 1_000_000 { return String(format: "%.1fm", Double(safe) / 1_000_000.0) }
-        if safe >= 1000 { return safe >= 10000
-            ? String(format: "%.0fk", Double(safe) / 1000.0)
-            : String(format: "%.1fk", Double(safe) / 1000.0)
-        }
-        return String(safe)
-    }
-}
-
-@MainActor
-enum CostUsageLoader {
-    static func loadSummary() async throws -> GatewayCostUsageSummary {
-        let data = try await ControlChannel.shared.request(
-            method: "usage.cost",
-            params: nil,
-            timeoutMs: 7000)
-        return try JSONDecoder().decode(GatewayCostUsageSummary.self, from: data)
-    }
-}
@@ -75,6 +75,18 @@ struct UsageRow: Identifiable {
 extension GatewayUsageSummary {
    func primaryRows() -> [UsageRow] {
        self.providers.compactMap { provider in
+            if let error = provider.error, provider.windows.isEmpty {
+                return UsageRow(
+                    id: provider.provider,
+                    providerId: provider.provider,
+                    displayName: provider.displayName,
+                    plan: provider.plan,
+                    windowLabel: nil,
+                    usedPercent: nil,
+                    resetAt: nil,
+                    error: error)
+            }
+
            guard let window = provider.windows.max(by: { $0.usedPercent < $1.usedPercent }) else {
                return nil
            }
@@ -87,7 +99,7 @@ extension GatewayUsageSummary {
                windowLabel: window.label,
                usedPercent: window.usedPercent,
                resetAt: window.resetAt.map { Date(timeIntervalSince1970: $0 / 1000) },
-                error: nil)
+                error: provider.error)
        }
    }
 }
@@ -37,12 +37,14 @@ struct UsageMenuLabelView: View {

                Spacer(minLength: 4)

-                Text(self.row.detailText())
-                    .font(.caption.monospacedDigit())
-                    .foregroundStyle(self.secondaryTextColor)
-                    .lineLimit(1)
-                    .truncationMode(.tail)
-                    .layoutPriority(2)
+                if !self.row.hasError {
+                    Text(self.row.detailText())
+                        .font(.caption.monospacedDigit())
+                        .foregroundStyle(self.secondaryTextColor)
+                        .lineLimit(1)
+                        .truncationMode(.tail)
+                        .layoutPriority(2)
+                }

                if self.showsChevron {
                    Image(systemName: "chevron.right")
@@ -52,6 +54,15 @@ struct UsageMenuLabelView: View {
                }
            }

+            if let error = self.row.error?.nonEmpty {
+                Text(error)
+                    .font(.caption)
+                    .foregroundStyle(self.secondaryTextColor)
+                    .multilineTextAlignment(.leading)
+                    .lineLimit(2)
+                    .truncationMode(.tail)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
        }
        .padding(.vertical, 10)
        .padding(.leading, self.paddingLeading)
@@ -424,18 +424,14 @@ public struct PollParams: Codable, Sendable {

 public struct AgentParams: Codable, Sendable {
    public let message: String
-    public let agentid: String?
    public let to: String?
-    public let replyto: String?
    public let sessionid: String?
    public let sessionkey: String?
    public let thinking: String?
    public let deliver: Bool?
    public let attachments: [AnyCodable]?
    public let channel: String?
-    public let replychannel: String?
    public let accountid: String?
-    public let replyaccountid: String?
    public let timeout: Int?
    public let lane: String?
    public let extrasystemprompt: String?
@@ -445,18 +441,14 @@ public struct AgentParams: Codable, Sendable {

    public init(
        message: String,
-        agentid: String?,
        to: String?,
-        replyto: String?,
        sessionid: String?,
        sessionkey: String?,
        thinking: String?,
        deliver: Bool?,
        attachments: [AnyCodable]?,
        channel: String?,
-        replychannel: String?,
        accountid: String?,
-        replyaccountid: String?,
        timeout: Int?,
        lane: String?,
        extrasystemprompt: String?,
@@ -465,18 +457,14 @@ public struct AgentParams: Codable, Sendable {
        spawnedby: String?
    ) {
        self.message = message
-        self.agentid = agentid
        self.to = to
-        self.replyto = replyto
        self.sessionid = sessionid
        self.sessionkey = sessionkey
        self.thinking = thinking
        self.deliver = deliver
        self.attachments = attachments
        self.channel = channel
-        self.replychannel = replychannel
        self.accountid = accountid
-        self.replyaccountid = replyaccountid
        self.timeout = timeout
        self.lane = lane
        self.extrasystemprompt = extrasystemprompt
@@ -486,18 +474,14 @@ public struct AgentParams: Codable, Sendable {
    }
    private enum CodingKeys: String, CodingKey {
        case message
-        case agentid = "agentId"
        case to
-        case replyto = "replyTo"
        case sessionid = "sessionId"
        case sessionkey = "sessionKey"
        case thinking
        case deliver
        case attachments
        case channel
-        case replychannel = "replyChannel"
        case accountid = "accountId"
-        case replyaccountid = "replyAccountId"
        case timeout
        case lane
        case extrasystemprompt = "extraSystemPrompt"
@@ -287,7 +287,7 @@ ack reaction after the bot replies.

 - `dm.enabled`: set `false` to ignore all DMs (default `true`).
 - `dm.policy`: DM access control (`pairing` recommended). `"open"` requires `dm.allowFrom=["*"]`.
- `dm.allowFrom`: DM allowlist (user ids or names). Used by `dm.policy="allowlist"` and for `dm.policy="open"` validation. The wizard accepts usernames and resolves them to ids when the bot can search members.
+- `dm.allowFrom`: DM allowlist (user ids or names). Used by `dm.policy="allowlist"` and for `dm.policy="open"` validation.
 - `dm.groupEnabled`: enable group DMs (default `false`).
 - `dm.groupChannels`: optional allowlist for group DM channel ids or slugs.
 - `groupPolicy`: controls guild channel handling (`open|disabled|allowlist`); `allowlist` requires channel allowlists.
@@ -244,7 +244,7 @@ Provider options:
 - `channels.imessage.service`: `imessage | sms | auto`.
 - `channels.imessage.region`: SMS region.
 - `channels.imessage.dmPolicy`: `pairing | allowlist | open | disabled` (default: pairing).
- `channels.imessage.allowFrom`: DM allowlist (handles, emails, E.164 numbers, or `chat_id:*`). `open` requires `"*"`. iMessage has no usernames; use handles or chat targets.
+- `channels.imessage.allowFrom`: DM allowlist (handles or `chat_id:*`). `open` requires `"*"`.
 - `channels.imessage.groupPolicy`: `open | allowlist | disabled` (default: allowlist).
 - `channels.imessage.groupAllowFrom`: group sender allowlist.
 - `channels.imessage.historyLimit` / `channels.imessage.accounts.*.historyLimit`: max group messages to include as context (0 disables).
@@ -70,7 +70,7 @@ Matrix is an open messaging protocol. Clawdbot connects as a Matrix user and lis
  - `clawdbot pairing list matrix`
  - `clawdbot pairing approve matrix <CODE>`
 - Public DMs: `channels.matrix.dm.policy="open"` plus `channels.matrix.dm.allowFrom=["*"]`.
- `channels.matrix.dm.allowFrom` accepts user IDs or display names. The wizard resolves display names to user IDs when directory search is available.
+- `channels.matrix.dm.allowFrom` accepts user IDs or display names (resolved at startup when directory search is available).

 ## Rooms (groups)
 - Default: `channels.matrix.groupPolicy = "allowlist"` (mention-gated). Use `channels.defaults.groupPolicy` to override the default when unset.
@@ -121,7 +121,7 @@ Provider options:
 - `channels.matrix.threadReplies`: `off | inbound | always` (default: inbound).
 - `channels.matrix.textChunkLimit`: outbound text chunk size (chars).
 - `channels.matrix.dm.policy`: `pairing | allowlist | open | disabled` (default: pairing).
- `channels.matrix.dm.allowFrom`: DM allowlist (user IDs or display names). `open` requires `"*"`. The wizard resolves names to IDs when possible.
+- `channels.matrix.dm.allowFrom`: DM allowlist. `open` requires `"*"`.
 - `channels.matrix.groupPolicy`: `allowlist | open | disabled` (default: allowlist).
 - `channels.matrix.allowlistOnly`: force allowlist rules for DMs + rooms.
 - `channels.matrix.rooms`: per-room settings and allowlist.
@@ -76,7 +76,7 @@ Disable with:

 **DM access**
 - Default: `channels.msteams.dmPolicy = "pairing"`. Unknown senders are ignored until approved.
- `channels.msteams.allowFrom` accepts AAD object IDs, UPNs, or display names. The wizard resolves names to IDs via Microsoft Graph when credentials allow.
+- `channels.msteams.allowFrom` accepts AAD object IDs, UPNs, or display names (resolved at startup when Graph allows).

 **Group access**
 - Default: `channels.msteams.groupPolicy = "allowlist"` (blocked unless you add `groupAllowFrom`). Use `channels.defaults.groupPolicy` to override the default when unset.
@@ -413,7 +413,7 @@ Key settings (see `/gateway/configuration` for shared channel patterns):
 - `channels.msteams.webhook.port` (default `3978`)
 - `channels.msteams.webhook.path` (default `/api/messages`)
 - `channels.msteams.dmPolicy`: `pairing | allowlist | open | disabled` (default: pairing)
- `channels.msteams.allowFrom`: allowlist for DMs (AAD object IDs, UPNs, or display names). The wizard resolves names to IDs during setup when Graph access is available.
+- `channels.msteams.allowFrom`: allowlist for DMs (AAD object IDs or UPNs).
 - `channels.msteams.textChunkLimit`: outbound text chunk size.
 - `channels.msteams.mediaAllowHosts`: allowlist for inbound attachment hosts (defaults to Microsoft/Teams domains).
 - `channels.msteams.requireMention`: require @mention in channels/groups (default true).
@@ -120,7 +120,7 @@ Provider options:
 - `channels.signal.ignoreStories`: ignore stories from the daemon.
 - `channels.signal.sendReadReceipts`: forward read receipts.
 - `channels.signal.dmPolicy`: `pairing | allowlist | open | disabled` (default: pairing).
- `channels.signal.allowFrom`: DM allowlist (E.164 or `uuid:<id>`). `open` requires `"*"`. Signal has no usernames; use phone/UUID ids.
+- `channels.signal.allowFrom`: DM allowlist (E.164 or `uuid:<id>`). `open` requires `"*"`.
 - `channels.signal.groupPolicy`: `open | allowlist | disabled` (default: allowlist).
 - `channels.signal.groupAllowFrom`: group sender allowlist.
 - `channels.signal.historyLimit`: max group messages to include as context (0 disables).
@@ -378,7 +378,7 @@ For fine-grained control, use these tags in agent responses:
 - Default: `channels.slack.dm.policy="pairing"` — unknown DM senders get a pairing code (expires after 1 hour).
 - Approve via: `clawdbot pairing approve slack <code>`.
 - To allow anyone: set `channels.slack.dm.policy="open"` and `channels.slack.dm.allowFrom=["*"]`.
- `channels.slack.dm.allowFrom` accepts user IDs, @handles, or emails (resolved at startup when tokens allow). The wizard accepts usernames and resolves them to ids during setup when tokens allow.
+- `channels.slack.dm.allowFrom` accepts user IDs, @handles, or emails (resolved at startup when tokens allow).

 ## Group policy
 - `channels.slack.groupPolicy` controls channel handling (`open|disabled|allowlist`).
@@ -305,7 +305,7 @@ Use the global setting when all Telegram bots/accounts should behave the same. U
  - `clawdbot pairing list telegram`
  - `clawdbot pairing approve telegram <CODE>`
 - Pairing is the default token exchange used for Telegram DMs. Details: [Pairing](/start/pairing)
- `channels.telegram.allowFrom` accepts numeric user IDs (recommended) or `@username` entries. It is **not** the bot username; use the human sender’s ID. The wizard accepts `@username` and resolves it to the numeric ID when possible.
+- `channels.telegram.allowFrom` accepts numeric user IDs (recommended) or `@username` entries. It is **not** the bot username; use the human sender’s ID.

 #### Finding your Telegram user ID
 Safer (no third-party bot):
@@ -308,7 +308,7 @@ WhatsApp can automatically send emoji reactions to incoming messages immediately
 ## Config quick map
 - `channels.whatsapp.dmPolicy` (DM policy: pairing/allowlist/open/disabled).
 - `channels.whatsapp.selfChatMode` (same-phone setup; bot uses your personal WhatsApp number).
- `channels.whatsapp.allowFrom` (DM allowlist). WhatsApp uses E.164 phone numbers (no usernames).
+- `channels.whatsapp.allowFrom` (DM allowlist).
 - `channels.whatsapp.mediaMaxMb` (inbound media save cap).
 - `channels.whatsapp.ackReaction` (auto-reaction on message receipt: `{emoji, direct, group}`).
 - `channels.whatsapp.accounts.<accountId>.*` (per-account settings + optional `authDir`).
@@ -92,7 +92,7 @@ Multi-account support: use `channels.zalo.accounts` with per-account tokens and
  - `clawdbot pairing list zalo`
  - `clawdbot pairing approve zalo <CODE>`
 - Pairing is the default token exchange. Details: [Pairing](/start/pairing)
- `channels.zalo.allowFrom` accepts numeric user IDs (no username lookup available).
+- `channels.zalo.allowFrom` accepts numeric user IDs.

 ## Long-polling vs webhook
 - Default: long-polling (no public URL required).
@@ -147,7 +147,7 @@ Provider options:
 - `channels.zalo.botToken`: bot token from Zalo Bot Platform.
 - `channels.zalo.tokenFile`: read token from file path.
 - `channels.zalo.dmPolicy`: `pairing | allowlist | open | disabled` (default: pairing).
- `channels.zalo.allowFrom`: DM allowlist (user IDs). `open` requires `"*"`. The wizard will ask for numeric IDs.
+- `channels.zalo.allowFrom`: DM allowlist (user IDs). `open` requires `"*"`.
 - `channels.zalo.mediaMaxMb`: inbound/outbound media cap (MB, default 5).
 - `channels.zalo.webhookUrl`: enable webhook mode (HTTPS required).
 - `channels.zalo.webhookSecret`: webhook secret (8-256 chars).
@@ -66,7 +66,7 @@ clawdbot directory groups list --channel zalouser --query "work"

 ## Access control (DMs)
 `channels.zalouser.dmPolicy` supports: `pairing | allowlist | open | disabled` (default: `pairing`).
-`channels.zalouser.allowFrom` accepts user IDs or names. The wizard resolves names to IDs via `zca friend find` when available.
+`channels.zalouser.allowFrom` accepts user IDs or names (resolved at startup when available).

 Approve via:
 - `clawdbot pairing list zalouser`
@@ -7,7 +7,6 @@ read_when:
 # `clawdbot agent`

 Run an agent turn via the Gateway (use `--local` for embedded).
-Use `--agent <id>` to target a configured agent directly.

 Related:
 - Agent send tool: [Agent send](/tools/agent-send)
@@ -16,7 +15,6 @@ Related:

 ```bash
 clawdbot agent --to +15555550123 --message "status update" --deliver
-clawdbot agent --agent ops --message "Summarize logs"
 clawdbot agent --session-id 1234 --message "Summarize inbox" --thinking medium
-clawdbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"
 ```
+
@@ -28,7 +28,7 @@ clawdbot gateway
 Notes:
 - By default, the Gateway refuses to start unless `gateway.mode=local` is set in `~/.clawdbot/clawdbot.json`. Use `--allow-unconfigured` for ad-hoc/dev runs.
 - Binding beyond loopback without auth is blocked (safety guardrail).
- `SIGUSR1` triggers an in-process restart when authorized (enable `commands.restart` or use the gateway tool/config apply/update).
+- `SIGUSR1` triggers an in-process restart (useful without a supervisor).
 - `SIGINT`/`SIGTERM` handlers stop the gateway process, but they don’t restore any custom terminal state. If you wrap the CLI with a TUI or raw-mode input, restore the terminal before exit.

 ### Options
@@ -89,15 +89,6 @@ clawdbot sandbox recreate --all
 clawdbot sandbox recreate --all
 ```

-### After changing setupCommand
-
-```bash
-clawdbot sandbox recreate --all
-# or just one agent:
-clawdbot sandbox recreate --agent family
-```
-
-
 ### For a specific agent only

 ```bash
@@ -293,9 +293,6 @@ Starting with v2026.1.6, each agent can have its own sandbox and tool restrictio
 }
 ```

-Note: `setupCommand` lives under `sandbox.docker` and runs once on container creation.
-Per-agent `sandbox.docker.*` overrides are ignored when the resolved scope is `"shared"`.
-
 **Benefits:**
 - **Security isolation**: Restrict tools for untrusted agents
 - **Resource control**: Sandbox specific agents while keeping others on host
@@ -13,7 +13,6 @@ read_when:
 ## Where it shows up
 - `/status` in chats: emoji‑rich status card with session tokens + estimated cost (API key only). Provider usage shows for the **current model provider** when available.
 - `/usage off|tokens|full` in chats: per-response usage footer (OAuth shows tokens only).
- `/usage cost` in chats: local cost summary aggregated from Clawdbot session logs.
 - CLI: `clawdbot status --usage` prints a full per-provider breakdown.
 - CLI: `clawdbot channels list` prints the same usage snapshot alongside provider config (use `--no-usage` to skip).
 - macOS menu bar: “Usage” section under Context (only if available).
@@ -17,19 +17,6 @@ If the file is missing, Clawdbot uses safe-ish defaults (embedded Pi agent + per

 > **New to configuration?** Check out the [Configuration Examples](/gateway/configuration-examples) guide for complete examples with detailed explanations!

-## Strict config validation
-
-Clawdbot only accepts configurations that fully match the schema.
-Unknown keys, malformed types, or invalid values cause the Gateway to **refuse to start** for safety.
-
-When validation fails:
- The Gateway does not boot.
- Only diagnostic commands are allowed (for example: `clawdbot doctor`, `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot service`, `clawdbot help`).
- Run `clawdbot doctor` to see the exact issues.
- Run `clawdbot doctor --fix` (or `--yes`) to apply migrations/repairs.
-
-Doctor never writes changes unless you explicitly opt into `--fix`/`--yes`.
-
 ## Schema + UI hints

 The Gateway exposes a JSON Schema representation of the config via `config.schema` for UI editors.
@@ -2003,9 +1990,6 @@ cross-session isolation. Use `scope: "session"` for per-session isolation.
 Legacy: `perSession` is still supported (`true` → `scope: "session"`,
 `false` → `scope: "shared"`).

-`setupCommand` runs **once** after the container is created (inside the container via `sh -lc`).
-For package installs, ensure network egress, a writable root FS, and a root user.
-
 ```json5
 {
  agents: {
@@ -34,7 +34,7 @@ pnpm gateway:watch
 - Pass `--verbose` to mirror debug logging (handshakes, req/res, events) from the log file into stdio when troubleshooting.
 - `--force` uses `lsof` to find listeners on the chosen port, sends SIGTERM, logs what it killed, then starts the gateway (fails fast if `lsof` is missing).
 - If you run under a supervisor (launchd/systemd/mac app child-process mode), a stop/restart typically sends **SIGTERM**; older builds may surface this as `pnpm` `ELIFECYCLE` exit code **143** (SIGTERM), which is a normal shutdown, not a crash.
- **SIGUSR1** triggers an in-process restart when authorized (gateway tool/config apply/update, or enable `commands.restart` for manual restarts).
+- **SIGUSR1** triggers an in-process restart (no external supervisor required). This is what the `gateway` agent tool uses.
 - Gateway auth: set `gateway.auth.mode=token` + `gateway.auth.token` (or pass `--token <value>` / `CLAWDBOT_GATEWAY_TOKEN`) to require clients to send `connect.params.auth.token`.
 - The wizard now generates a token by default, even on loopback.
 - Port precedence: `--port` > `CLAWDBOT_GATEWAY_PORT` > `gateway.port` > default `18789`.
@@ -116,20 +116,6 @@ Override with `agents.defaults.sandbox.docker.network`.
 Docker installs and the containerized gateway live here:
 [Docker](/install/docker)

-## setupCommand (one-time container setup)
-`setupCommand` runs **once** after the sandbox container is created (not on every run).
-It executes inside the container via `sh -lc`.
-
-Paths:
- Global: `agents.defaults.sandbox.docker.setupCommand`
- Per-agent: `agents.list[].sandbox.docker.setupCommand`
-
-
-Common pitfalls:
- Default `docker.network` is `"none"` (no egress), so package installs will fail.
- `readOnlyRoot: true` prevents writes; set `readOnlyRoot: false` or bake a custom image.
- `user` must be root for package installs (omit `user` or set `user: "0:0"`).
-
 ## Tool policy + escape hatches
 Tool allow/deny policies still apply before sandbox rules. If a tool is denied
 globally or per-agent, sandboxing doesn’t bring it back.
@@ -5,6 +5,13 @@ read_when:
 ---
 # Security 🔒

+Running an AI agent with shell access on your machine is... *spicy*. Here’s how to not get pwned.
+
+Clawdbot is both a product and an experiment: you’re wiring frontier-model behavior into real messaging surfaces and real tools. **There is no “perfectly secure” setup.** The goal is to be deliberate about:
+- who can talk to your bot
+- where the bot is allowed to act
+- what the bot can touch
+
 ## Quick check: `clawdbot security audit`

 Run this regularly (especially after changing config or exposing network surfaces):
@@ -22,13 +29,6 @@ It flags common footguns (Gateway auth exposure, browser control exposure, eleva
 - Turn `logging.redactSensitive="off"` back to `"tools"`.
 - Tighten local perms (`~/.clawdbot` → `700`, config file → `600`, plus common state files like `credentials/*.json`, `agents/*/agent/auth-profiles.json`, and `agents/*/sessions/sessions.json`).

-Running an AI agent with shell access on your machine is... *spicy*. Here’s how to not get pwned.
-
-Clawdbot is both a product and an experiment: you’re wiring frontier-model behavior into real messaging surfaces and real tools. **There is no “perfectly secure” setup.** The goal is to be deliberate about:
- who can talk to your bot
- where the bot is allowed to act
- what the bot can touch
-
 ### What the audit checks (high level)

 - **Inbound access** (DM policies, group policies, allowlists): can strangers trigger the bot?
@@ -326,22 +326,6 @@ Clawdbot keeps conversation history in memory.

 ## Common troubleshooting

-### “Gateway won’t start — configuration invalid”
-
-Clawdbot now refuses to start when the config contains unknown keys, malformed values, or invalid types.
-This is intentional for safety.
-
-Fix it with Doctor:
-```bash
-clawdbot doctor
-clawdbot doctor --fix
-```
-
-Notes:
- `clawdbot doctor` reports every invalid entry.
- `clawdbot doctor --fix` applies migrations/repairs and rewrites the config.
- Diagnostic commands like `clawdbot logs`, `clawdbot health`, `clawdbot status`, and `clawdbot service` still run even if the config is invalid.
-
 ### “All models failed” — what should I check first?

 - **Credentials** present for the provider(s) being tried (auth profiles + env vars).
@@ -254,14 +254,6 @@ precedence, and troubleshooting.

 ### Enable sandboxing

-If you plan to install packages in `setupCommand`, note:
- Default `docker.network` is `"none"` (no egress).
- `readOnlyRoot: true` blocks package installs.
- `user` must be root for `apt-get` (omit `user` or set `user: "0:0"`).
-Clawdbot auto-recreates containers when `setupCommand` (or docker config) changes
-unless the container was **recently used** (within ~5 minutes). Hot containers
-log a warning with the exact `clawdbot sandbox recreate ...` command.
-
 ```json5
 {
  agents: {
@@ -18,9 +18,6 @@ This allows you to run multiple agents with different security profiles:
 - Family/work agents with restricted tools
 - Public-facing agents in sandboxes

-`setupCommand` belongs under `sandbox.docker` (global or per-agent) and runs once
-when the container is created.
-
 Auth is per-agent: each agent reads from its own `agentDir` auth store at:

 ```
@@ -5,7 +5,9 @@ read_when:
 ---
 # Clawdbot macOS IPC architecture

-**Current model:** a local Unix socket connects the **node service** to the **macOS app** for exec approvals + `system.run`. There is no `clawdbot-mac` CLI; agent actions still flow through the Gateway WebSocket and `node.invoke`. UI automation uses PeekabooBridge.
+**Current model:** there is **no local control socket** and no `clawdbot-mac` CLI. All agent actions go through the Gateway WebSocket and `node.invoke`. UI automation still uses PeekabooBridge.
+
+**Planned model:** add a local Unix socket between the **node service** and the **macOS app**. The app owns `system.run` (UI/TCC context); the node service forwards exec requests over IPC.

 ## Goals
 - Single GUI app instance that owns all TCC-facing work (notifications, screen recording, mic, speech, AppleScript).
@@ -13,11 +15,11 @@ read_when:
 - Predictable permissions: always the same signed bundle ID, launched by launchd, so TCC grants stick.

 ## How it works
-### Gateway + node bridge
+### Gateway + node bridge (current)
 - The app runs the Gateway (local mode) and connects to it as a node.
 - Agent actions are performed via `node.invoke` (e.g. `system.run`, `system.notify`, `canvas.*`).

-### Node service + app IPC
+### Node service + app IPC (planned)
 - A headless node service connects to the Gateway bridge.
 - `system.run` requests are forwarded to the macOS app over a local Unix socket.
 - The app performs the exec in UI context, prompts if needed, and returns output.
@@ -36,6 +38,10 @@ Agent -> Gateway -> Bridge -> Node Service (TS)
 - Security: bridge hosts require an allowed TeamID; DEBUG-only same-UID escape hatch is guarded by `PEEKABOO_ALLOW_UNSIGNED_SOCKET_CLIENTS=1` (Peekaboo convention).
 - See: [PeekabooBridge usage](/platforms/mac/peekaboo) for details.

+### Mach/XPC
+- Not required for automation; `node.invoke` + PeekabooBridge cover current needs.
+- Planned IPC keeps Unix sockets (no XPC helper).
+
 ## Operational flows
 - Restart/rebuild: `SIGN_IDENTITY="Apple Development: <Developer Name> (<TEAMID>)" scripts/restart-mac.sh`
  - Kills existing instances
@@ -48,4 +54,4 @@ Agent -> Gateway -> Bridge -> Node Service (TS)
 - PeekabooBridge: `PEEKABOO_ALLOW_UNSIGNED_SOCKET_CLIENTS=1` (DEBUG-only) may allow same-UID callers for local development.
 - All communication remains local-only; no network sockets are exposed.
 - TCC prompts originate only from the GUI app bundle; keep the signed bundle ID stable across rebuilds.
- IPC hardening: socket mode `0600`, token, peer-UID checks, HMAC challenge/response, short TTL.
+- Planned IPC hardening: socket mode `0600`, token, peer-UID checks, HMAC challenge/response, short TTL.
@@ -17,17 +17,19 @@ capabilities to the agent as a node.
  Speech Recognition, Automation/AppleScript).
 - Runs or connects to the Gateway (local or remote).
 - Exposes macOS‑only tools (Canvas, Camera, Screen Recording, `system.run`).
- Starts the local node host service in **remote** mode (launchd), and stops it in **local** mode.
 - Optionally hosts **PeekabooBridge** for UI automation.
 - Installs the global CLI (`clawdbot`) via npm/pnpm on request (bun not recommended for the Gateway runtime).

+Planned:
+- Run a headless **node service** locally (launchd).
+- Keep `system.run` in the app (UI/TCC context), with the node service forwarding via IPC.
+
 ## Local vs remote mode

 - **Local** (default): the app attaches to a running local Gateway if present;
  otherwise it enables the launchd service via `clawdbot daemon`.
 - **Remote**: the app connects to a Gateway over SSH/Tailscale and never starts
  a local process.
-  The app starts the local **node host service** so the remote Gateway can reach this Mac.
 The app does not spawn the Gateway as a child process.

 ## Launchd control
@@ -56,9 +58,9 @@ The macOS app presents itself as a node. Common commands:

 The node reports a `permissions` map so agents can decide what’s allowed.

-Node service + app IPC:
- When the headless node service is running (remote mode), it connects to the Gateway bridge.
- `system.run` executes in the macOS app (UI/TCC context) over a local Unix socket; prompts + output stay in-app.
+Planned split:
+- Node service advertises the node surface to the Gateway.
+- macOS app performs `system.run` in UI context over IPC.

 Diagram (SCI):
 ```
@@ -1,78 +0,0 @@
---
-summary: "Strict config validation + doctor-only migrations"
-read_when:
-  - Designing or implementing config validation behavior
-  - Working on config migrations or doctor workflows
-  - Handling plugin config schemas or plugin load gating
---
-# Strict config validation (doctor-only migrations)
-
-## Goals
- **Reject unknown config keys everywhere** (root + nested).
- **Reject plugin config without a schema**; don’t load that plugin.
- **Remove legacy auto-migration on load**; migrations run via doctor only.
- **Auto-run doctor (dry-run) on startup**; if invalid, block non-diagnostic commands.
-
-## Non-goals
- Backward compatibility on load (legacy keys do not auto-migrate).
- Silent drops of unrecognized keys.
-
-## Strict validation rules
- Config must match the schema exactly at every level.
- Unknown keys are validation errors (no passthrough at root or nested).
- `plugins.entries.<id>.config` must be validated by the plugin’s schema.
-  - If a plugin lacks a schema, **reject plugin load** and surface a clear error.
-
-## Plugin schema enforcement
- Each plugin provides a strict schema for its config (no passthrough).
- Plugin load flow:
-  1) Resolve plugin schema by plugin id.
-  2) Validate config against the schema.
-  3) If missing schema or invalid config: block plugin load, record error.
- Error message includes:
-  - Plugin id
-  - Reason (missing schema / invalid config)
-  - Path(s) that failed validation
-
-## Doctor flow
- Doctor runs **every time** config is loaded (dry-run by default).
- If config invalid:
-  - Print a summary + actionable errors.
-  - Instruct: `clawdbot doctor --fix`.
- `clawdbot doctor --fix`:
-  - Applies migrations.
-  - Removes unknown keys.
-  - Writes updated config.
-
-## Command gating (when config is invalid)
-Allowed (diagnostic-only):
- `clawdbot doctor`
- `clawdbot logs`
- `clawdbot health`
- `clawdbot help`
- `clawdbot status`
- `clawdbot service`
-
-Everything else must hard-fail with: “Config invalid. Run `clawdbot doctor --fix`.”
-
-## Error UX format
- Single summary header.
- Grouped sections:
-  - Unknown keys (full paths)
-  - Legacy keys / migrations needed
-  - Plugin load failures (plugin id + reason + path)
-
-## Implementation touchpoints
- `src/config/zod-schema.ts`: remove root passthrough; strict objects everywhere.
- `src/config/zod-schema.providers.ts`: ensure strict channel schemas.
- `src/config/validation.ts`: fail on unknown keys; do not apply legacy migrations.
- `src/config/io.ts`: remove legacy auto-migrations; always run doctor dry-run.
- `src/config/legacy*.ts`: move usage to doctor only.
- `src/plugins/*`: add schema registry + gating.
- CLI command gating in `src/cli`.
-
-## Tests
- Unknown key rejection (root + nested).
- Plugin missing schema → plugin load blocked with clear error.
- Invalid config → gateway startup blocked except diagnostic commands.
- Doctor dry-run auto; `doctor --fix` writes corrected config.
@@ -15,11 +15,6 @@ Use these when a task is clearly tied to a script; otherwise prefer the CLI.
 - Prefer CLI surfaces when they exist (example: auth monitoring uses `clawdbot models status --check`).
 - Assume scripts are host‑specific; read them before running on a new machine.

-## Git hooks
-
- `scripts/setup-git-hooks.js`: best-effort setup for `core.hooksPath` when inside a git repo.
- `scripts/format-staged.js`: pre-commit formatter for staged `src/` and `test/` files.
-
 ## Auth monitoring scripts

 Auth monitoring scripts are documented here:
@@ -45,7 +45,6 @@ Use these in chat:
 - `/usage off|tokens|full` → appends a **per-response usage footer** to every reply.
  - Persists per session (stored as `responseUsage`).
  - OAuth auth **hides cost** (tokens only).
- `/usage cost` → shows a local cost summary from Clawdbot session logs.

 Other surfaces:

@@ -14,15 +14,13 @@ runtime on the current machine.
 - Required: `--message <text>`
 - Session selection:
  - `--to <dest>` derives the session key (group/channel targets preserve isolation; direct chats collapse to `main`), **or**
-  - `--session-id <id>` reuses an existing session by id, **or**
-  - `--agent <id>` targets a configured agent directly (uses that agent's `main` session key)
+  - `--session-id <id>` reuses an existing session by id
 - Runs the same embedded agent runtime as normal inbound replies.
 - Thinking/verbose flags persist into the session store.
 - Output:
  - default: prints reply text (plus `MEDIA:<url>` lines)
  - `--json`: prints structured payload + metadata
 - Optional delivery back to a channel with `--deliver` + `--channel` (target formats match `clawdbot message --target`).
- Use `--reply-channel`/`--reply-to`/`--reply-account` to override delivery without changing the session.

 If the Gateway is unreachable, the CLI **falls back** to the embedded local run.

@@ -30,21 +28,16 @@ If the Gateway is unreachable, the CLI **falls back** to the embedded local run.

 ```bash
 clawdbot agent --to +15555550123 --message "status update"
-clawdbot agent --agent ops --message "Summarize logs"
 clawdbot agent --session-id 1234 --message "Summarize inbox" --thinking medium
 clawdbot agent --to +15555550123 --message "Trace logs" --verbose on --json
 clawdbot agent --to +15555550123 --message "Summon reply" --deliver
-clawdbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"
 ```

 ## Flags

 - `--local`: run locally (requires model provider API keys in your shell)
- `--deliver`: send the reply to the chosen channel
- `--channel`: delivery channel (`whatsapp|telegram|discord|slack|signal|imessage`, default: `whatsapp`)
- `--reply-to`: delivery target override
- `--reply-channel`: delivery channel override
- `--reply-account`: delivery account id override
+- `--deliver`: send the reply to the chosen channel (requires `--to`)
+- `--channel`: `whatsapp|telegram|discord|slack|signal|imessage` (default: `whatsapp`)
 - `--thinking <off|minimal|low|medium|high|xhigh>`: persist thinking level (GPT-5.2 + Codex models only)
 - `--verbose <on|full|off>`: persist verbose level
 - `--timeout <seconds>`: override agent timeout
@@ -40,28 +40,6 @@ Notes:
 - `tools.exec.security` (default: `deny`)
 - `tools.exec.ask` (default: `on-miss`)
 - `tools.exec.node` (default: unset)
- `tools.exec.pathPrepend`: list of directories to prepend to `PATH` for exec runs.
-
-Example:
-```json5
-{
-  tools: {
-    exec: {
-      pathPrepend: ["~/bin", "/opt/oss/bin"]
-    }
-  }
-}
-```
-
-### PATH handling
-
- `host=gateway`: uses the Gateway process `PATH`. Daemons install a minimal `PATH`:
-  - macOS: `/opt/homebrew/bin`, `/usr/local/bin`, `/usr/bin`, `/bin`
-  - Linux: `/usr/local/bin`, `/usr/bin`, `/bin`
- `host=sandbox`: runs `sh -lc` (login shell) inside the container, so `/etc/profile` may reset `PATH`.
-  Clawdbot prepends `env.PATH` after profile sourcing; `tools.exec.pathPrepend` applies here too.
- `host=node`: only env overrides you pass are sent to the node. `tools.exec.pathPrepend` only applies
-  if the exec call already sets `env.PATH`.

 Per-agent node binding (use the agent list index in config):

@@ -356,7 +356,7 @@ Notes:
 Restart or apply updates to the running Gateway process (in-place).

 Core actions:
- `restart` (authorizes + sends `SIGUSR1` for in-process restart; `clawdbot gateway` restart in-place)
+- `restart` (sends `SIGUSR1` to the current process; `clawdbot gateway` restart in-place)
 - `config.get` / `config.schema`
 - `config.apply` (validate + write config + restart + wake)
 - `update.run` (run update + restart + wake)
@@ -111,8 +111,6 @@ Note on sandboxing:
 - `requires.bins` is checked on the **host** at skill load time.
 - If an agent is sandboxed, the binary must also exist **inside the container**.
  Install it via `agents.defaults.sandbox.docker.setupCommand` (or a custom image).
-  `setupCommand` runs once after the container is created.
-  Package installs also require network egress, a writable root FS, and a root user in the sandbox.
  Example: the `summarize` skill (`skills/summarize/SKILL.md`) needs the `summarize` CLI
  in the sandbox container to run there.

@@ -64,7 +64,7 @@ Text + native (when enabled):
 - `/subagents list|stop|log|info|send` (inspect, stop, log, or message sub-agent runs for the current session)
 - `/config show|get|set|unset` (persist config to disk, owner-only; requires `commands.config: true`)
 - `/debug show|set|unset|reset` (runtime overrides, owner-only; requires `commands.debug: true`)
- `/usage off|tokens|full|cost` (per-response usage footer or local cost summary)
+- `/usage off|tokens|full` (per-response usage footer)
 - `/stop`
 - `/restart`
 - `/dock-telegram` (alias: `/dock_telegram`) (switch replies to Telegram)
@@ -91,7 +91,7 @@ Text-only:
 Notes:
 - Commands accept an optional `:` between the command and args (e.g. `/think: high`, `/send: on`, `/help:`).
 - For full provider usage breakdown, use `clawdbot status --usage`.
- `/usage` controls the per-response usage footer; `/usage cost` prints a local cost summary from Clawdbot session logs.
+- `/usage` controls the per-response usage footer. It only shows dollar cost when the model uses an API key (OAuth hides cost).
 - `/restart` is disabled by default; set `commands.restart: true` to enable it.
 - `/verbose` is meant for debugging and extra visibility; keep it **off** in normal use.
 - `/reasoning` (and `/verbose`) are risky in group settings: they may reveal internal reasoning or tool output you did not intend to expose. Prefer leaving them off, especially in group chats.
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { bluebubblesPlugin } from "./src/channel.js";
 import { handleBlueBubblesWebhookRequest } from "./src/monitor.js";
@@ -9,7 +8,6 @@ const plugin = {
  id: "bluebubbles",
  name: "BlueBubbles",
  description: "BlueBubbles channel plugin (macOS app)",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setBlueBubblesRuntime(api.runtime);
    api.registerChannel({ plugin: bluebubblesPlugin });
@@ -1,5 +1,3 @@
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";
-
 const DEFAULT_BASE_URL = "http://localhost:3000/v1";
 const DEFAULT_API_KEY = "n/a";
 const DEFAULT_CONTEXT_WINDOW = 128_000;
@@ -63,7 +61,6 @@ const copilotProxyPlugin = {
  id: "copilot-proxy",
  name: "Copilot Proxy",
  description: "Local Copilot Proxy (VS Code LM) provider plugin",
-  configSchema: emptyPluginConfigSchema(),
  register(api) {
    api.registerProvider({
      id: "copilot-proxy",
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { discordPlugin } from "./src/channel.js";
 import { setDiscordRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "discord",
  name: "Discord",
  description: "Discord channel plugin",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setDiscordRuntime(api.runtime);
    api.registerChannel({ plugin: discordPlugin });
@@ -1,7 +1,6 @@
 import { createHash, randomBytes } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { createServer } from "node:http";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 // OAuth constants - decoded from pi-ai's base64 encoded values to stay in sync
 const decode = (s: string) => Buffer.from(s, "base64").toString();
@@ -361,7 +360,6 @@ const antigravityPlugin = {
  id: "google-antigravity-auth",
  name: "Google Antigravity Auth",
  description: "OAuth flow for Google Antigravity (Cloud Code Assist)",
-  configSchema: emptyPluginConfigSchema(),
  register(api) {
    api.registerProvider({
      id: "google-antigravity",
@@ -1,5 +1,3 @@
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";
-
 import { loginGeminiCliOAuth } from "./oauth.js";

 const PROVIDER_ID = "google-gemini-cli";
@@ -16,7 +14,6 @@ const geminiCliPlugin = {
  id: "google-gemini-cli-auth",
  name: "Google Gemini CLI Auth",
  description: "OAuth flow for Gemini CLI (Google Code Assist)",
-  configSchema: emptyPluginConfigSchema(),
  register(api) {
    api.registerProvider({
      id: PROVIDER_ID,
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { imessagePlugin } from "./src/channel.js";
 import { setIMessageRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "imessage",
  name: "iMessage",
  description: "iMessage channel plugin",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setIMessageRuntime(api.runtime);
    api.registerChannel({ plugin: imessagePlugin });
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { matrixPlugin } from "./src/channel.js";
 import { setMatrixRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "matrix",
  name: "Matrix",
  description: "Matrix channel plugin (matrix-js-sdk)",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setMatrixRuntime(api.runtime);
    api.registerChannel({ plugin: matrixPlugin });
@@ -7,7 +7,6 @@ import {
  type WizardPrompter,
 } from "clawdbot/plugin-sdk";
 import { listMatrixDirectoryGroupsLive } from "./directory-live.js";
-import { listMatrixDirectoryPeersLive } from "./directory-live.js";
 import { resolveMatrixAccount } from "./matrix/accounts.js";
 import { ensureMatrixSdkInstalled, isMatrixSdkAvailable } from "./matrix/deps.js";
 import type { CoreConfig, DmPolicy } from "./types.js";
@@ -50,86 +49,40 @@ async function promptMatrixAllowFrom(params: {
 }): Promise<CoreConfig> {
  const { cfg, prompter } = params;
  const existingAllowFrom = cfg.channels?.matrix?.dm?.allowFrom ?? [];
-  const account = resolveMatrixAccount({ cfg });
-  const canResolve = Boolean(account.configured);
+  const entry = await prompter.text({
+    message: "Matrix allowFrom (user id)",
+    placeholder: "@user:server",
+    initialValue: existingAllowFrom[0] ? String(existingAllowFrom[0]) : undefined,
+    validate: (value) => {
+      const raw = String(value ?? "").trim();
+      if (!raw) return "Required";
+      if (!raw.startsWith("@")) return "Matrix user IDs should start with @";
+      if (!raw.includes(":")) return "Matrix user IDs should include a server (:@server)";
+      return undefined;
+    },
+  });
+  const normalized = String(entry).trim();
+  const merged = [
+    ...existingAllowFrom.map((item) => String(item).trim()).filter(Boolean),
+    normalized,
+  ];
+  const unique = [...new Set(merged)];

-  const parseInput = (raw: string) =>
-    raw
-      .split(/[\n,;]+/g)
-      .map((entry) => entry.trim())
-      .filter(Boolean);
-
-  const isFullUserId = (value: string) => value.startsWith("@") && value.includes(":");
-
-  while (true) {
-    const entry = await prompter.text({
-      message: "Matrix allowFrom (username or user id)",
-      placeholder: "@user:server",
-      initialValue: existingAllowFrom[0] ? String(existingAllowFrom[0]) : undefined,
-      validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
-    });
-    const parts = parseInput(String(entry));
-    const resolvedIds: string[] = [];
-    let unresolved: string[] = [];
-
-    for (const part of parts) {
-      if (isFullUserId(part)) {
-        resolvedIds.push(part);
-        continue;
-      }
-      if (!canResolve) {
-        unresolved.push(part);
-        continue;
-      }
-      const results = await listMatrixDirectoryPeersLive({
-        cfg,
-        query: part,
-        limit: 5,
-      }).catch(() => []);
-      const match = results.find((result) => result.id);
-      if (match?.id) {
-        resolvedIds.push(match.id);
-        if (results.length > 1) {
-          await prompter.note(
-            `Multiple matches for "${part}", using ${match.id}.`,
-            "Matrix allowlist",
-          );
-        }
-      } else {
-        unresolved.push(part);
-      }
-    }
-
-    if (unresolved.length > 0) {
-      await prompter.note(
-        `Could not resolve: ${unresolved.join(", ")}. Use full @user:server IDs.`,
-        "Matrix allowlist",
-      );
-      continue;
-    }
-
-    const unique = [
-      ...new Set([
-        ...existingAllowFrom.map((item) => String(item).trim()).filter(Boolean),
-        ...resolvedIds,
-      ]),
-    ];
-    return {
-      ...cfg,
-      channels: {
-        ...cfg.channels,
-        matrix: {
-          ...cfg.channels?.matrix,
-          enabled: true,
-          dm: {
-            ...cfg.channels?.matrix?.dm,
-            policy: "allowlist",
-            allowFrom: unique,
-          },
+  return {
+    ...cfg,
+    channels: {
+      ...cfg.channels,
+      matrix: {
+        ...cfg.channels?.matrix,
+        enabled: true,
+        dm: {
+          ...cfg.channels?.matrix?.dm,
+          policy: "allowlist",
+          allowFrom: unique,
        },
      },
-    };
-  }
+    },
+  };
 }

 function setMatrixGroupPolicy(cfg: CoreConfig, groupPolicy: "open" | "allowlist" | "disabled") {
@@ -168,7 +121,6 @@ const dmPolicy: ChannelOnboardingDmPolicy = {
  allowFromKey: "channels.matrix.dm.allowFrom",
  getCurrent: (cfg) => (cfg as CoreConfig).channels?.matrix?.dm?.policy ?? "pairing",
  setPolicy: (cfg, policy) => setMatrixDmPolicy(cfg as CoreConfig, policy),
-  promptAllowFrom: promptMatrixAllowFrom,
 };

 export const matrixOnboardingAdapter: ChannelOnboardingAdapter = {
@@ -1,12 +1,10 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 const memoryCorePlugin = {
  id: "memory-core",
  name: "Memory (Core)",
  description: "File-backed memory search tools and CLI",
  kind: "memory",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    api.registerTool(
      (ctx) => {
@@ -24,16 +24,6 @@ const EMBEDDING_DIMENSIONS: Record<string, number> = {
  "text-embedding-3-large": 3072,
 };

-function assertAllowedKeys(
-  value: Record<string, unknown>,
-  allowed: string[],
-  label: string,
-) {
-  const unknown = Object.keys(value).filter((key) => !allowed.includes(key));
-  if (unknown.length === 0) return;
-  throw new Error(`${label} has unknown keys: ${unknown.join(", ")}`);
-}
-
 export function vectorDimsForModel(model: string): number {
  const dims = EMBEDDING_DIMENSIONS[model];
  if (!dims) {
@@ -64,13 +54,11 @@ export const memoryConfigSchema = {
      throw new Error("memory config required");
    }
    const cfg = value as Record<string, unknown>;
-    assertAllowedKeys(cfg, ["embedding", "dbPath", "autoCapture", "autoRecall"], "memory config");

    const embedding = cfg.embedding as Record<string, unknown> | undefined;
    if (!embedding || typeof embedding.apiKey !== "string") {
      throw new Error("embedding.apiKey is required");
    }
-    assertAllowedKeys(embedding, ["apiKey", "model"], "embedding config");

    const model = resolveEmbeddingModel(embedding);

@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { msteamsPlugin } from "./src/channel.js";
 import { setMSTeamsRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "msteams",
  name: "Microsoft Teams",
  description: "Microsoft Teams channel plugin (Bot Framework)",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setMSTeamsRuntime(api.runtime);
    api.registerChannel({ plugin: msteamsPlugin });
@@ -16,7 +16,6 @@ import { resolveMSTeamsCredentials } from "./token.js";
 import {
  parseMSTeamsTeamEntry,
  resolveMSTeamsChannelAllowlist,
-  resolveMSTeamsUserAllowlist,
 } from "./resolve-allowlist.js";

 const channel = "msteams" as const;
@@ -39,97 +38,6 @@ function setMSTeamsDmPolicy(cfg: ClawdbotConfig, dmPolicy: DmPolicy) {
  };
 }

-function setMSTeamsAllowFrom(cfg: ClawdbotConfig, allowFrom: string[]): ClawdbotConfig {
-  return {
-    ...cfg,
-    channels: {
-      ...cfg.channels,
-      msteams: {
-        ...cfg.channels?.msteams,
-        allowFrom,
-      },
-    },
-  };
-}
-
-function parseAllowFromInput(raw: string): string[] {
-  return raw
-    .split(/[\n,;]+/g)
-    .map((entry) => entry.trim())
-    .filter(Boolean);
-}
-
-function looksLikeGuid(value: string): boolean {
-  return /^[0-9a-fA-F-]{16,}$/.test(value);
-}
-
-async function promptMSTeamsAllowFrom(params: {
-  cfg: ClawdbotConfig;
-  prompter: WizardPrompter;
-}): Promise<ClawdbotConfig> {
-  const existing = params.cfg.channels?.msteams?.allowFrom ?? [];
-  await params.prompter.note(
-    [
-      "Allowlist MS Teams DMs by display name, UPN/email, or user id.",
-      "We resolve names to user IDs via Microsoft Graph when credentials allow.",
-      "Examples:",
-      "- alex@example.com",
-      "- Alex Johnson",
-      "- 00000000-0000-0000-0000-000000000000",
-    ].join("\n"),
-    "MS Teams allowlist",
-  );
-
-  while (true) {
-    const entry = await params.prompter.text({
-      message: "MS Teams allowFrom (usernames or ids)",
-      placeholder: "alex@example.com, Alex Johnson",
-      initialValue: existing[0] ? String(existing[0]) : undefined,
-      validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
-    });
-    const parts = parseAllowFromInput(String(entry));
-    if (parts.length === 0) {
-      await params.prompter.note("Enter at least one user.", "MS Teams allowlist");
-      continue;
-    }
-
-    const resolved = await resolveMSTeamsUserAllowlist({
-      cfg: params.cfg,
-      entries: parts,
-    }).catch(() => null);
-
-    if (!resolved) {
-      const ids = parts.filter((part) => looksLikeGuid(part));
-      if (ids.length !== parts.length) {
-        await params.prompter.note(
-          "Graph lookup unavailable. Use user IDs only.",
-          "MS Teams allowlist",
-        );
-        continue;
-      }
-      const unique = [
-        ...new Set([...existing.map((v) => String(v).trim()).filter(Boolean), ...ids]),
-      ];
-      return setMSTeamsAllowFrom(params.cfg, unique);
-    }
-
-    const unresolved = resolved.filter((item) => !item.resolved || !item.id);
-    if (unresolved.length > 0) {
-      await params.prompter.note(
-        `Could not resolve: ${unresolved.map((item) => item.input).join(", ")}`,
-        "MS Teams allowlist",
-      );
-      continue;
-    }
-
-    const ids = resolved.map((item) => item.id as string);
-    const unique = [
-      ...new Set([...existing.map((v) => String(v).trim()).filter(Boolean), ...ids]),
-    ];
-    return setMSTeamsAllowFrom(params.cfg, unique);
-  }
-}
-
 async function noteMSTeamsCredentialHelp(prompter: WizardPrompter): Promise<void> {
  await prompter.note(
    [
@@ -198,7 +106,6 @@ const dmPolicy: ChannelOnboardingDmPolicy = {
  allowFromKey: "channels.msteams.allowFrom",
  getCurrent: (cfg) => cfg.channels?.msteams?.dmPolicy ?? "pairing",
  setPolicy: (cfg, policy) => setMSTeamsDmPolicy(cfg, policy),
-  promptAllowFrom: promptMSTeamsAllowFrom,
 };

 export const msteamsOnboardingAdapter: ChannelOnboardingAdapter = {
@@ -1,5 +1,3 @@
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";
-
 import { loginQwenPortalOAuth } from "./oauth.js";

 const PROVIDER_ID = "qwen-portal";
@@ -32,7 +30,6 @@ const qwenPortalPlugin = {
  id: "qwen-portal-auth",
  name: "Qwen OAuth",
  description: "OAuth flow for Qwen (free-tier) models",
-  configSchema: emptyPluginConfigSchema(),
  register(api) {
    api.registerProvider({
      id: PROVIDER_ID,
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { signalPlugin } from "./src/channel.js";
 import { setSignalRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "signal",
  name: "Signal",
  description: "Signal channel plugin",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setSignalRuntime(api.runtime);
    api.registerChannel({ plugin: signalPlugin });
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { slackPlugin } from "./src/channel.js";
 import { setSlackRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "slack",
  name: "Slack",
  description: "Slack channel plugin",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setSlackRuntime(api.runtime);
    api.registerChannel({ plugin: slackPlugin });
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { telegramPlugin } from "./src/channel.js";
 import { setTelegramRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "telegram",
  name: "Telegram",
  description: "Telegram channel plugin",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setTelegramRuntime(api.runtime);
    api.registerChannel({ plugin: telegramPlugin });
@@ -35,36 +35,30 @@ export type InboundPolicy = z.infer<typeof InboundPolicySchema>;
 // Provider-Specific Configuration
 // -----------------------------------------------------------------------------

-export const TelnyxConfigSchema = z
-  .object({
+export const TelnyxConfigSchema = z.object({
  /** Telnyx API v2 key */
  apiKey: z.string().min(1).optional(),
  /** Telnyx connection ID (from Call Control app) */
  connectionId: z.string().min(1).optional(),
  /** Public key for webhook signature verification */
  publicKey: z.string().min(1).optional(),
-})
-  .strict();
+});
 export type TelnyxConfig = z.infer<typeof TelnyxConfigSchema>;

-export const TwilioConfigSchema = z
-  .object({
+export const TwilioConfigSchema = z.object({
  /** Twilio Account SID */
  accountSid: z.string().min(1).optional(),
  /** Twilio Auth Token */
  authToken: z.string().min(1).optional(),
-})
-  .strict();
+});
 export type TwilioConfig = z.infer<typeof TwilioConfigSchema>;

-export const PlivoConfigSchema = z
-  .object({
+export const PlivoConfigSchema = z.object({
  /** Plivo Auth ID (starts with MA/SA) */
  authId: z.string().min(1).optional(),
  /** Plivo Auth Token */
  authToken: z.string().min(1).optional(),
-})
-  .strict();
+});
 export type PlivoConfig = z.infer<typeof PlivoConfigSchema>;

 // -----------------------------------------------------------------------------
@@ -78,7 +72,6 @@ export const SttConfigSchema = z
    /** Whisper model to use */
    model: z.string().min(1).default("whisper-1"),
  })
-  .strict()
  .default({ provider: "openai", model: "whisper-1" });
 export type SttConfig = z.infer<typeof SttConfigSchema>;

@@ -104,7 +97,6 @@ export const TtsConfigSchema = z
     */
    instructions: z.string().optional(),
  })
-  .strict()
  .default({ provider: "openai", model: "gpt-4o-mini-tts", voice: "coral" });
 export type TtsConfig = z.infer<typeof TtsConfigSchema>;

@@ -121,7 +113,6 @@ export const VoiceCallServeConfigSchema = z
    /** Webhook path */
    path: z.string().min(1).default("/voice/webhook"),
  })
-  .strict()
  .default({ port: 3334, bind: "127.0.0.1", path: "/voice/webhook" });
 export type VoiceCallServeConfig = z.infer<typeof VoiceCallServeConfigSchema>;

@@ -137,7 +128,6 @@ export const VoiceCallTailscaleConfigSchema = z
    /** Path for Tailscale serve/funnel (should usually match serve.path) */
    path: z.string().min(1).default("/voice/webhook"),
  })
-  .strict()
  .default({ mode: "off", path: "/voice/webhook" });
 export type VoiceCallTailscaleConfig = z.infer<
  typeof VoiceCallTailscaleConfigSchema
@@ -171,7 +161,6 @@ export const VoiceCallTunnelConfigSchema = z
     */
    allowNgrokFreeTier: z.boolean().default(true),
  })
-  .strict()
  .default({ provider: "none", allowNgrokFreeTier: true });
 export type VoiceCallTunnelConfig = z.infer<typeof VoiceCallTunnelConfigSchema>;

@@ -194,7 +183,6 @@ export const OutboundConfigSchema = z
    /** Seconds to wait after TTS before auto-hangup in notify mode */
    notifyHangupDelaySec: z.number().int().nonnegative().default(3),
  })
-  .strict()
  .default({ defaultMode: "notify", notifyHangupDelaySec: 3 });
 export type OutboundConfig = z.infer<typeof OutboundConfigSchema>;

@@ -219,7 +207,6 @@ export const VoiceCallStreamingConfigSchema = z
    /** WebSocket path for media stream connections */
    streamPath: z.string().min(1).default("/voice/stream"),
  })
-  .strict()
  .default({
    enabled: false,
    sttProvider: "openai-realtime",
@@ -236,8 +223,7 @@ export type VoiceCallStreamingConfig = z.infer<
 // Main Voice Call Configuration
 // -----------------------------------------------------------------------------

-export const VoiceCallConfigSchema = z
-  .object({
+export const VoiceCallConfigSchema = z.object({
  /** Enable voice call functionality */
  enabled: z.boolean().default(false),

@@ -321,8 +307,7 @@ export const VoiceCallConfigSchema = z

  /** Timeout for response generation in ms (default 30s) */
  responseTimeoutMs: z.number().int().positive().default(30000),
-})
-  .strict();
+});

 export type VoiceCallConfig = z.infer<typeof VoiceCallConfigSchema>;

@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { whatsappPlugin } from "./src/channel.js";
 import { setWhatsAppRuntime } from "./src/runtime.js";
@@ -8,7 +7,6 @@ const plugin = {
  id: "whatsapp",
  name: "WhatsApp",
  description: "WhatsApp channel plugin",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setWhatsAppRuntime(api.runtime);
    api.registerChannel({ plugin: whatsappPlugin });
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { zaloDock, zaloPlugin } from "./src/channel.js";
 import { handleZaloWebhookRequest } from "./src/monitor.js";
@@ -9,7 +8,6 @@ const plugin = {
  id: "zalo",
  name: "Zalo",
  description: "Zalo channel plugin (Bot API)",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setZaloRuntime(api.runtime);
    api.registerChannel({ plugin: zaloPlugin, dock: zaloDock });
@@ -207,17 +207,6 @@ const dmPolicy: ChannelOnboardingDmPolicy = {
  allowFromKey: "channels.zalo.allowFrom",
  getCurrent: (cfg) => (cfg.channels?.zalo?.dmPolicy ?? "pairing") as "pairing",
  setPolicy: (cfg, policy) => setZaloDmPolicy(cfg as ClawdbotConfig, policy),
-  promptAllowFrom: async ({ cfg, prompter, accountId }) => {
-    const id =
-      accountId && normalizeAccountId(accountId)
-        ? normalizeAccountId(accountId) ?? DEFAULT_ACCOUNT_ID
-        : resolveDefaultZaloAccountId(cfg as ClawdbotConfig);
-    return promptZaloAllowFrom({
-      cfg: cfg as ClawdbotConfig,
-      prompter,
-      accountId: id,
-    });
-  },
 };

 export const zaloOnboardingAdapter: ChannelOnboardingAdapter = {
@@ -1,5 +1,4 @@
 import type { ClawdbotPluginApi } from "clawdbot/plugin-sdk";
-import { emptyPluginConfigSchema } from "clawdbot/plugin-sdk";

 import { zalouserPlugin } from "./src/channel.js";
 import { ZalouserToolSchema, executeZalouserTool } from "./src/tool.js";
@@ -9,7 +8,6 @@ const plugin = {
  id: "zalouser",
  name: "Zalo Personal",
  description: "Zalo personal account messaging via zca-cli",
-  configSchema: emptyPluginConfigSchema(),
  register(api: ClawdbotPluginApi) {
    setZalouserRuntime(api.runtime);
    // Register channel plugin (for onboarding & gateway)
@@ -19,7 +19,7 @@ import {
  checkZcaAuthenticated,
 } from "./accounts.js";
 import { runZca, runZcaInteractive, checkZcaInstalled, parseJsonOutput } from "./zca.js";
-import type { ZcaFriend, ZcaGroup } from "./types.js";
+import type { ZcaGroup } from "./types.js";

 const channel = "zalouser" as const;

@@ -67,73 +67,25 @@ async function promptZalouserAllowFrom(params: {
  const { cfg, prompter, accountId } = params;
  const resolved = resolveZalouserAccountSync({ cfg, accountId });
  const existingAllowFrom = resolved.config.allowFrom ?? [];
-  const parseInput = (raw: string) =>
-    raw
-      .split(/[\n,;]+/g)
-      .map((entry) => entry.trim())
-      .filter(Boolean);
-
-  const resolveUserId = async (input: string): Promise<string | null> => {
-    const trimmed = input.trim();
-    if (!trimmed) return null;
-    if (/^\d+$/.test(trimmed)) return trimmed;
-    const ok = await checkZcaInstalled();
-    if (!ok) return null;
-    const result = await runZca(["friend", "find", trimmed], {
-      profile: resolved.profile,
-      timeout: 15000,
-    });
-    if (!result.ok) return null;
-    const parsed = parseJsonOutput<ZcaFriend[]>(result.stdout);
-    const rows = Array.isArray(parsed) ? parsed : [];
-    const match = rows[0];
-    if (!match?.userId) return null;
-    if (rows.length > 1) {
-      await prompter.note(
-        `Multiple matches for "${trimmed}", using ${match.displayName ?? match.userId}.`,
-        "Zalo Personal allowlist",
-      );
-    }
-    return String(match.userId);
-  };
-
-  while (true) {
-    const entry = await prompter.text({
-      message: "Zalouser allowFrom (username or user id)",
-      placeholder: "Alice, 123456789",
-      initialValue: existingAllowFrom[0] ? String(existingAllowFrom[0]) : undefined,
-      validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
-    });
-    const parts = parseInput(String(entry));
-    const results = await Promise.all(parts.map((part) => resolveUserId(part)));
-    const unresolved = parts.filter((_, idx) => !results[idx]);
-    if (unresolved.length > 0) {
-      await prompter.note(
-        `Could not resolve: ${unresolved.join(", ")}. Use numeric user ids or ensure zca is available.`,
-        "Zalo Personal allowlist",
-      );
-      continue;
-    }
-    const merged = [
-      ...existingAllowFrom.map((item) => String(item).trim()).filter(Boolean),
-      ...(results.filter(Boolean) as string[]),
-    ];
-    const unique = [...new Set(merged)];
-    if (accountId === DEFAULT_ACCOUNT_ID) {
-      return {
-        ...cfg,
-        channels: {
-          ...cfg.channels,
-          zalouser: {
-            ...cfg.channels?.zalouser,
-            enabled: true,
-            dmPolicy: "allowlist",
-            allowFrom: unique,
-          },
-        },
-      } as ClawdbotConfig;
-    }
+  const entry = await prompter.text({
+    message: "Zalouser allowFrom (user id)",
+    placeholder: "123456789",
+    initialValue: existingAllowFrom[0] ? String(existingAllowFrom[0]) : undefined,
+    validate: (value) => {
+      const raw = String(value ?? "").trim();
+      if (!raw) return "Required";
+      if (!/^\d+$/.test(raw)) return "Use a numeric Zalo user id";
+      return undefined;
+    },
+  });
+  const normalized = String(entry).trim();
+  const merged = [
+    ...existingAllowFrom.map((item) => String(item).trim()).filter(Boolean),
+    normalized,
+  ];
+  const unique = [...new Set(merged)];

+  if (accountId === DEFAULT_ACCOUNT_ID) {
    return {
      ...cfg,
      channels: {
@@ -141,19 +93,32 @@ async function promptZalouserAllowFrom(params: {
        zalouser: {
          ...cfg.channels?.zalouser,
          enabled: true,
-          accounts: {
-            ...(cfg.channels?.zalouser?.accounts ?? {}),
-            [accountId]: {
-              ...(cfg.channels?.zalouser?.accounts?.[accountId] ?? {}),
-              enabled: cfg.channels?.zalouser?.accounts?.[accountId]?.enabled ?? true,
-              dmPolicy: "allowlist",
-              allowFrom: unique,
-            },
-          },
+          dmPolicy: "allowlist",
+          allowFrom: unique,
        },
      },
    } as ClawdbotConfig;
  }
+
+  return {
+    ...cfg,
+    channels: {
+      ...cfg.channels,
+      zalouser: {
+        ...cfg.channels?.zalouser,
+        enabled: true,
+        accounts: {
+          ...(cfg.channels?.zalouser?.accounts ?? {}),
+          [accountId]: {
+            ...(cfg.channels?.zalouser?.accounts?.[accountId] ?? {}),
+            enabled: cfg.channels?.zalouser?.accounts?.[accountId]?.enabled ?? true,
+            dmPolicy: "allowlist",
+            allowFrom: unique,
+          },
+        },
+      },
+    },
+  } as ClawdbotConfig;
 }

 function setZalouserGroupPolicy(
@@ -272,17 +237,6 @@ const dmPolicy: ChannelOnboardingDmPolicy = {
  allowFromKey: "channels.zalouser.allowFrom",
  getCurrent: (cfg) => ((cfg as ClawdbotConfig).channels?.zalouser?.dmPolicy ?? "pairing") as "pairing",
  setPolicy: (cfg, policy) => setZalouserDmPolicy(cfg as ClawdbotConfig, policy),
-  promptAllowFrom: async ({ cfg, prompter, accountId }) => {
-    const id =
-      accountId && normalizeAccountId(accountId)
-        ? normalizeAccountId(accountId) ?? DEFAULT_ACCOUNT_ID
-        : resolveDefaultZalouserAccountId(cfg as ClawdbotConfig);
-    return promptZalouserAllowFrom({
-      cfg: cfg as ClawdbotConfig,
-      prompter,
-      accountId: id,
-    });
-  },
 };

 export const zalouserOnboardingAdapter: ChannelOnboardingAdapter = {
@@ -1,4 +0,0 @@
-#!/bin/sh
-ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
-[ -z "$ROOT" ] && exit 0
-node "$ROOT/scripts/format-staged.js"
@@ -55,9 +55,6 @@
    "CHANGELOG.md",
    "LICENSE",
    "scripts/postinstall.js",
-    "scripts/format-staged.js",
-    "scripts/setup-git-hooks.js",
-    "git-hooks/**",
    "dist/terminal/**",
    "dist/routing/**",
    "dist/utils/**",
@@ -164,7 +161,6 @@
    "chalk": "^5.6.2",
    "chokidar": "^5.0.0",
    "chromium-bidi": "12.0.1",
-    "cli-highlight": "^2.1.11",
    "commander": "^14.0.2",
    "croner": "^9.1.0",
    "detect-libc": "^2.1.2",
@@ -76,9 +76,6 @@ importers:
      chromium-bidi:
        specifier: 12.0.1
        version: 12.0.1(devtools-protocol@0.0.1561482)
-      cli-highlight:
-        specifier: ^2.1.11
-        version: 2.1.11
      commander:
        specifier: ^14.0.2
        version: 14.0.2
@@ -268,13 +265,7 @@ importers:
        specifier: 40.0.0
        version: 40.0.0

-  extensions/memory-core:
-    dependencies:
-      clawdbot:
-        specifier: workspace:*
-        version: link:../..
-
-  extensions/memory-lancedb:
+  extensions/memory:
    dependencies:
      '@lancedb/lancedb':
        specifier: ^0.15.0
@@ -286,6 +277,12 @@ importers:
        specifier: ^4.104.0
        version: 4.104.0(ws@8.19.0)(zod@3.25.76)

+  extensions/memory-core:
+    dependencies:
+      clawdbot:
+        specifier: workspace:*
+        version: link:../..
+
  extensions/msteams:
    dependencies:
      '@microsoft/agents-hosting':
@@ -6628,7 +6625,7 @@ snapshots:

  '@types/node-fetch@2.6.13':
    dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 18.19.130
      form-data: 4.0.5

  '@types/node@10.17.60': {}
@@ -49,16 +49,6 @@ for file in "${files[@]}"; do
  fi
 done

-# Prevent staging node_modules even if a path is forced.
-for file in "${files[@]}"; do
-  case "$file" in
-    *node_modules* | */node_modules | */node_modules/* | node_modules)
-      printf 'Error: node_modules paths are not allowed: %s\n' "$file" >&2
-      exit 1
-      ;;
-  esac
-done
-
 last_commit_error=''

 run_git_commit() {
@@ -1,6 +1,6 @@
 #!/usr/bin/env node

-import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
+import { readdirSync, readFileSync } from 'node:fs';
 import { join, relative } from 'node:path';

 process.stdout.on('error', (error) => {
@@ -11,14 +11,6 @@ process.stdout.on('error', (error) => {
 });

 const DOCS_DIR = join(process.cwd(), 'docs');
-if (!existsSync(DOCS_DIR)) {
-  console.error('docs:list: missing docs directory. Run from repo root.');
-  process.exit(1);
-}
-if (!statSync(DOCS_DIR).isDirectory()) {
-  console.error('docs:list: docs path is not a directory.');
-  process.exit(1);
-}

 const EXCLUDED_DIRS = new Set(['archive', 'research']);

@@ -1,148 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-
-const OXFMT_EXTENSIONS = new Set([
-  ".cjs",
-  ".js",
-  ".json",
-  ".jsonc",
-  ".jsx",
-  ".mjs",
-  ".ts",
-  ".tsx",
-]);
-
-function getRepoRoot() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, "..");
-}
-
-function runGitCommand(args, options = {}) {
-  return spawnSync("git", args, {
-    cwd: options.cwd,
-    encoding: "utf-8",
-    stdio: options.stdio ?? "pipe",
-  });
-}
-
-function splitNullDelimited(value) {
-  if (!value) return [];
-  const text = String(value);
-  return text.split("\0").filter(Boolean);
-}
-
-function normalizeGitPath(filePath) {
-  return filePath.replace(/\\/g, "/");
-}
-
-function filterOxfmtTargets(paths) {
-  return paths
-    .map(normalizeGitPath)
-    .filter((filePath) =>
-      (filePath.startsWith("src/") || filePath.startsWith("test/")) &&
-      OXFMT_EXTENSIONS.has(path.posix.extname(filePath)),
-    );
-}
-
-function findPartiallyStagedFiles(stagedFiles, unstagedFiles) {
-  const unstaged = new Set(unstagedFiles.map(normalizeGitPath));
-  return stagedFiles.filter((filePath) => unstaged.has(normalizeGitPath(filePath)));
-}
-
-function filterOutPartialTargets(targets, partialTargets) {
-  if (partialTargets.length === 0) return targets;
-  const partial = new Set(partialTargets.map(normalizeGitPath));
-  return targets.filter((filePath) => !partial.has(normalizeGitPath(filePath)));
-}
-
-function resolveOxfmtCommand(repoRoot) {
-  const binName = process.platform === "win32" ? "oxfmt.cmd" : "oxfmt";
-  const local = path.join(repoRoot, "node_modules", ".bin", binName);
-  if (fs.existsSync(local)) {
-    return { command: local, args: [] };
-  }
-
-  const result = spawnSync("oxfmt", ["--version"], { stdio: "ignore" });
-  if (result.status === 0) {
-    return { command: "oxfmt", args: [] };
-  }
-
-  return null;
-}
-
-function getGitPaths(args, repoRoot) {
-  const result = runGitCommand(args, { cwd: repoRoot });
-  if (result.status !== 0) return [];
-  return splitNullDelimited(result.stdout ?? "");
-}
-
-function formatFiles(repoRoot, oxfmt, files) {
-  const result = spawnSync(oxfmt.command, ["--write", ...oxfmt.args, ...files], {
-    cwd: repoRoot,
-    stdio: "inherit",
-  });
-  return result.status === 0;
-}
-
-function stageFiles(repoRoot, files) {
-  if (files.length === 0) return true;
-  const result = runGitCommand(["add", "--", ...files], { cwd: repoRoot, stdio: "inherit" });
-  return result.status === 0;
-}
-
-function main() {
-  const repoRoot = getRepoRoot();
-  const staged = getGitPaths([
-    "diff",
-    "--cached",
-    "--name-only",
-    "-z",
-    "--diff-filter=ACMR",
-  ], repoRoot);
-  const targets = filterOxfmtTargets(staged);
-  if (targets.length === 0) return;
-
-  const unstaged = getGitPaths(["diff", "--name-only", "-z"], repoRoot);
-  const partial = findPartiallyStagedFiles(targets, unstaged);
-  if (partial.length > 0) {
-    process.stderr.write("[pre-commit] Skipping partially staged files:\n");
-    for (const filePath of partial) {
-      process.stderr.write(`- ${filePath}\n`);
-    }
-    process.stderr.write("Stage full files to format them automatically.\n");
-  }
-
-  const filteredTargets = filterOutPartialTargets(targets, partial);
-  if (filteredTargets.length === 0) return;
-
-  const oxfmt = resolveOxfmtCommand(repoRoot);
-  if (!oxfmt) {
-    process.stderr.write("[pre-commit] oxfmt not found; skipping format.\n");
-    return;
-  }
-
-  if (!formatFiles(repoRoot, oxfmt, filteredTargets)) {
-    process.exitCode = 1;
-    return;
-  }
-
-  if (!stageFiles(repoRoot, filteredTargets)) {
-    process.exitCode = 1;
-  }
-}
-
-export {
-  filterOxfmtTargets,
-  filterOutPartialTargets,
-  findPartiallyStagedFiles,
-  getRepoRoot,
-  normalizeGitPath,
-  resolveOxfmtCommand,
-  splitNullDelimited,
-};
-
-if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
-  main();
-}
@@ -2,7 +2,6 @@ import fs from "node:fs";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
-import { setupGitHooks } from "./setup-git-hooks.js";

 function detectPackageManager(ua = process.env.npm_config_user_agent ?? "") {
  // Examples:
@@ -253,7 +252,6 @@ function main() {
  process.chdir(repoRoot);

  ensureExecutable(path.join(repoRoot, "dist", "entry.js"));
-  setupGitHooks({ repoRoot });

  if (!shouldApplyPnpmPatchedDependenciesFallback()) {
    return;
@@ -1,96 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-
-const DEFAULT_HOOKS_PATH = "git-hooks";
-const PRE_COMMIT_HOOK = "pre-commit";
-
-function getRepoRoot() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, "..");
-}
-
-function runGitCommand(args, options = {}) {
-  return spawnSync("git", args, {
-    cwd: options.cwd,
-    encoding: "utf-8",
-    stdio: options.stdio ?? "pipe",
-  });
-}
-
-function ensureExecutable(targetPath) {
-  if (process.platform === "win32") return;
-  if (!fs.existsSync(targetPath)) return;
-  try {
-    const mode = fs.statSync(targetPath).mode & 0o777;
-    if (mode & 0o100) return;
-    fs.chmodSync(targetPath, 0o755);
-  } catch (err) {
-    console.warn(`[setup-git-hooks] chmod failed: ${err}`);
-  }
-}
-
-function isGitAvailable({ repoRoot = getRepoRoot(), runGit = runGitCommand } = {}) {
-  const result = runGit(["--version"], { cwd: repoRoot, stdio: "ignore" });
-  return result.status === 0;
-}
-
-function isGitRepo({ repoRoot = getRepoRoot(), runGit = runGitCommand } = {}) {
-  const result = runGit(["rev-parse", "--is-inside-work-tree"], {
-    cwd: repoRoot,
-    stdio: "pipe",
-  });
-  if (result.status !== 0) return false;
-  return String(result.stdout ?? "").trim() === "true";
-}
-
-function setHooksPath({
-  repoRoot = getRepoRoot(),
-  hooksPath = DEFAULT_HOOKS_PATH,
-  runGit = runGitCommand,
-} = {}) {
-  const result = runGit(["config", "core.hooksPath", hooksPath], {
-    cwd: repoRoot,
-    stdio: "ignore",
-  });
-  return result.status === 0;
-}
-
-function setupGitHooks({
-  repoRoot = getRepoRoot(),
-  hooksPath = DEFAULT_HOOKS_PATH,
-  runGit = runGitCommand,
-} = {}) {
-  if (!isGitAvailable({ repoRoot, runGit })) {
-    return { ok: false, reason: "git-missing" };
-  }
-
-  if (!isGitRepo({ repoRoot, runGit })) {
-    return { ok: false, reason: "not-repo" };
-  }
-
-  if (!setHooksPath({ repoRoot, hooksPath, runGit })) {
-    return { ok: false, reason: "config-failed" };
-  }
-
-  ensureExecutable(path.join(repoRoot, hooksPath, PRE_COMMIT_HOOK));
-
-  return { ok: true };
-}
-
-export {
-  DEFAULT_HOOKS_PATH,
-  PRE_COMMIT_HOOK,
-  ensureExecutable,
-  getRepoRoot,
-  isGitAvailable,
-  isGitRepo,
-  runGitCommand,
-  setHooksPath,
-  setupGitHooks,
-};
-
-if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
-  setupGitHooks();
-}
@@ -6,7 +6,6 @@ import path from "node:path";
 import { type Api, completeSimple, type Model } from "@mariozechner/pi-ai";
 import { discoverAuthStorage, discoverModels } from "@mariozechner/pi-coding-agent";
 import { describe, expect, it } from "vitest";
-import { isTruthyEnvValue } from "../infra/env.js";
 import {
  ANTHROPIC_SETUP_TOKEN_PREFIX,
  validateAnthropicSetupToken,
@@ -22,7 +21,7 @@ import { getApiKeyForModel } from "./model-auth.js";
 import { normalizeProviderId, parseModelRef } from "./model-selection.js";
 import { ensureClawdbotModelsJson } from "./models-config.js";

-const LIVE = isTruthyEnvValue(process.env.LIVE) || isTruthyEnvValue(process.env.CLAWDBOT_LIVE_TEST);
+const LIVE = process.env.LIVE === "1" || process.env.CLAWDBOT_LIVE_TEST === "1";
 const SETUP_TOKEN_RAW = process.env.CLAWDBOT_LIVE_SETUP_TOKEN?.trim() ?? "";
 const SETUP_TOKEN_VALUE = process.env.CLAWDBOT_LIVE_SETUP_TOKEN_VALUE?.trim() ?? "";
 const SETUP_TOKEN_PROFILE = process.env.CLAWDBOT_LIVE_SETUP_TOKEN_PROFILE?.trim() ?? "";
@@ -1,6 +1,5 @@
 import crypto from "node:crypto";
 import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
-import path from "node:path";
 import type { AgentTool, AgentToolResult } from "@mariozechner/pi-agent-core";
 import { Type } from "@sinclair/typebox";

@@ -90,7 +89,6 @@ export type ExecToolDefaults = {
  security?: ExecSecurity;
  ask?: ExecAsk;
  node?: string;
-  pathPrepend?: string[];
  agentId?: string;
  backgroundMs?: number;
  timeoutSec?: number;
@@ -209,47 +207,6 @@ function normalizeNotifyOutput(value: string) {
  return value.replace(/\s+/g, " ").trim();
 }

-function normalizePathPrepend(entries?: string[]) {
-  if (!Array.isArray(entries)) return [];
-  const seen = new Set<string>();
-  const normalized: string[] = [];
-  for (const entry of entries) {
-    if (typeof entry !== "string") continue;
-    const trimmed = entry.trim();
-    if (!trimmed || seen.has(trimmed)) continue;
-    seen.add(trimmed);
-    normalized.push(trimmed);
-  }
-  return normalized;
-}
-
-function mergePathPrepend(existing: string | undefined, prepend: string[]) {
-  if (prepend.length === 0) return existing;
-  const partsExisting = (existing ?? "")
-    .split(path.delimiter)
-    .map((part) => part.trim())
-    .filter(Boolean);
-  const merged: string[] = [];
-  const seen = new Set<string>();
-  for (const part of [...prepend, ...partsExisting]) {
-    if (seen.has(part)) continue;
-    seen.add(part);
-    merged.push(part);
-  }
-  return merged.join(path.delimiter);
-}
-
-function applyPathPrepend(
-  env: Record<string, string>,
-  prepend: string[],
-  options?: { requireExisting?: boolean },
-) {
-  if (prepend.length === 0) return;
-  if (options?.requireExisting && !env.PATH) return;
-  const merged = mergePathPrepend(env.PATH, prepend);
-  if (merged) env.PATH = merged;
-}
-
 function maybeNotifyOnExit(session: ProcessSession, status: "completed" | "failed") {
  if (!session.backgrounded || !session.notifyOnExit || session.exitNotified) return;
  const sessionKey = session.sessionKey?.trim();
@@ -283,7 +240,6 @@ export function createExecTool(
    typeof defaults?.timeoutSec === "number" && defaults.timeoutSec > 0
      ? defaults.timeoutSec
      : 1800;
-  const defaultPathPrepend = normalizePathPrepend(defaults?.pathPrepend);
  const notifyOnExit = defaults?.notifyOnExit !== false;
  const notifySessionKey = defaults?.sessionKey?.trim() || undefined;

@@ -423,7 +379,6 @@ export function createExecTool(
            containerWorkdir: containerWorkdir ?? sandbox.containerWorkdir,
          })
        : mergedEnv;
-      applyPathPrepend(env, defaultPathPrepend);

      if (host === "node") {
        if (security === "deny") {
@@ -462,10 +417,6 @@ export function createExecTool(
          );
        }
        const argv = buildNodeShellCommand(params.command, nodeInfo?.platform);
-        const nodeEnv = params.env ? { ...params.env } : undefined;
-        if (nodeEnv) {
-          applyPathPrepend(nodeEnv, defaultPathPrepend, { requireExisting: true });
-        }
        const invokeParams: Record<string, unknown> = {
          nodeId,
          command: "system.run",
@@ -473,7 +424,7 @@ export function createExecTool(
            command: argv,
            rawCommand: params.command,
            cwd: workdir,
-            env: nodeEnv,
+            env: params.env,
            timeoutMs: typeof params.timeout === "number" ? params.timeout * 1000 : undefined,
            agentId: defaults?.agentId,
            sessionKey: defaults?.sessionKey,
@@ -1,5 +1,3 @@
-import path from "node:path";
-
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { peekSystemEvents, resetSystemEventsForTest } from "../infra/system-events.js";
 import { getFinishedSession, resetProcessRegistryForTests } from "./bash-process-registry.js";
@@ -277,34 +275,6 @@ describe("exec notifyOnExit", () => {
  });
 });

-describe("exec PATH handling", () => {
-  const originalPath = process.env.PATH;
-  const originalShell = process.env.SHELL;
-
-  beforeEach(() => {
-    if (!isWin) process.env.SHELL = "/bin/bash";
-  });
-
-  afterEach(() => {
-    process.env.PATH = originalPath;
-    if (!isWin) process.env.SHELL = originalShell;
-  });
-
-  it("prepends configured path entries", async () => {
-    const basePath = isWin ? "C:\\Windows\\System32" : "/usr/bin";
-    const prepend = isWin ? ["C:\\custom\\bin", "C:\\oss\\bin"] : ["/custom/bin", "/opt/oss/bin"];
-    process.env.PATH = basePath;
-
-    const tool = createExecTool({ pathPrepend: prepend });
-    const result = await tool.execute("call1", {
-      command: isWin ? "Write-Output $env:PATH" : "echo $PATH",
-    });
-
-    const text = normalizeText(result.content.find((c) => c.type === "text")?.text);
-    expect(text).toBe([...prepend, basePath].join(path.delimiter));
-  });
-});
-
 describe("buildDockerExecArgs", () => {
  it("prepends custom PATH after login shell sourcing to preserve both custom and system tools", () => {
    const args = buildDockerExecArgs({
@@ -22,16 +22,6 @@ vi.mock("../config/config.js", async (importOriginal) => {

 import { createClawdbotTools } from "./clawdbot-tools.js";

-const waitForCalls = async (getCount: () => number, count: number, timeoutMs = 2000) => {
-  const start = Date.now();
-  while (getCount() < count) {
-    if (Date.now() - start > timeoutMs) {
-      throw new Error(`timed out waiting for ${count} calls`);
-    }
-    await new Promise((resolve) => setTimeout(resolve, 0));
-  }
-};
-
 describe("sessions tools", () => {
  it("uses number (not integer) in tool schemas for Gemini compatibility", () => {
    const tools = createClawdbotTools();
@@ -250,9 +240,8 @@ describe("sessions tools", () => {
      runId: "run-1",
      delivery: { status: "pending", mode: "announce" },
    });
-    await waitForCalls(() => calls.filter((call) => call.method === "agent").length, 4);
-    await waitForCalls(() => calls.filter((call) => call.method === "agent.wait").length, 4);
-    await waitForCalls(() => calls.filter((call) => call.method === "chat.history").length, 4);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await new Promise((resolve) => setTimeout(resolve, 0));

    const waitPromise = tool.execute("call6", {
      sessionKey: "main",
@@ -266,9 +255,8 @@ describe("sessions tools", () => {
      delivery: { status: "pending", mode: "announce" },
    });
    expect(typeof (waited.details as { runId?: string }).runId).toBe("string");
-    await waitForCalls(() => calls.filter((call) => call.method === "agent").length, 8);
-    await waitForCalls(() => calls.filter((call) => call.method === "agent.wait").length, 8);
-    await waitForCalls(() => calls.filter((call) => call.method === "chat.history").length, 8);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await new Promise((resolve) => setTimeout(resolve, 0));

    const agentCalls = calls.filter((call) => call.method === "agent");
    const waitCalls = calls.filter((call) => call.method === "agent.wait");
@@ -157,79 +157,4 @@ describe("clawdbot-tools: subagents", () => {
    // Session should be deleted since cleanup=delete
    expect(deletedKey?.startsWith("agent:main:subagent:")).toBe(true);
  });
-
-  it("sessions_spawn announces with requester accountId", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
-    const calls: Array<{ method?: string; params?: unknown }> = [];
-    let agentCallCount = 0;
-    let childRunId: string | undefined;
-
-    callGatewayMock.mockImplementation(async (opts: unknown) => {
-      const request = opts as { method?: string; params?: unknown };
-      calls.push(request);
-      if (request.method === "agent") {
-        agentCallCount += 1;
-        const runId = `run-${agentCallCount}`;
-        const params = request.params as { lane?: string; sessionKey?: string } | undefined;
-        if (params?.lane === "subagent") {
-          childRunId = runId;
-        }
-        return {
-          runId,
-          status: "accepted",
-          acceptedAt: 4000 + agentCallCount,
-        };
-      }
-      if (request.method === "agent.wait") {
-        const params = request.params as { runId?: string; timeoutMs?: number } | undefined;
-        return { runId: params?.runId ?? "run-1", status: "ok", startedAt: 1000, endedAt: 2000 };
-      }
-      if (request.method === "sessions.delete" || request.method === "sessions.patch") {
-        return { ok: true };
-      }
-      return {};
-    });
-
-    const tool = createClawdbotTools({
-      agentSessionKey: "main",
-      agentChannel: "whatsapp",
-      agentAccountId: "kev",
-    }).find((candidate) => candidate.name === "sessions_spawn");
-    if (!tool) throw new Error("missing sessions_spawn tool");
-
-    const result = await tool.execute("call2", {
-      task: "do thing",
-      runTimeoutSeconds: 1,
-      cleanup: "keep",
-    });
-    expect(result.details).toMatchObject({
-      status: "accepted",
-      runId: "run-1",
-    });
-
-    if (!childRunId) throw new Error("missing child runId");
-    emitAgentEvent({
-      runId: childRunId,
-      stream: "lifecycle",
-      data: {
-        phase: "end",
-        startedAt: 1000,
-        endedAt: 2000,
-      },
-    });
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
-    const agentCalls = calls.filter((call) => call.method === "agent");
-    expect(agentCalls).toHaveLength(2);
-    const announceParams = agentCalls[1]?.params as
-      | { accountId?: string; channel?: string; deliver?: boolean }
-      | undefined;
-    expect(announceParams?.deliver).toBe(true);
-    expect(announceParams?.channel).toBe("whatsapp");
-    expect(announceParams?.accountId).toBe("kev");
-  });
 });
@@ -2,9 +2,8 @@ import type { ImageContent } from "@mariozechner/pi-ai";
 import { resolveHeartbeatPrompt } from "../auto-reply/heartbeat.js";
 import type { ThinkLevel } from "../auto-reply/thinking.js";
 import type { ClawdbotConfig } from "../config/config.js";
-import { isTruthyEnvValue } from "../infra/env.js";
 import { shouldLogVerbose } from "../globals.js";
-import { createSubsystemLogger } from "../logging/subsystem.js";
+import { createSubsystemLogger } from "../logging.js";
 import { runCommandWithTimeout } from "../process/exec.js";
 import { resolveUserPath } from "../utils.js";
 import { resolveClawdbotDocsPath } from "./docs-path.js";
@@ -165,7 +164,7 @@ export async function runCliAgent(params: {
      log.info(
        `cli exec: provider=${params.provider} model=${normalizedModel} promptChars=${params.prompt.length}`,
      );
-      const logOutputText = isTruthyEnvValue(process.env.CLAWDBOT_CLAUDE_CLI_LOG_OUTPUT);
+      const logOutputText = process.env.CLAWDBOT_CLAUDE_CLI_LOG_OUTPUT === "1";
      if (logOutputText) {
        const logArgs: string[] = [];
        for (let i = 0; i < args.length; i += 1) {
@@ -1,9 +1,8 @@
 import { completeSimple, getModel } from "@mariozechner/pi-ai";
 import { describe, expect, it } from "vitest";
-import { isTruthyEnvValue } from "../infra/env.js";

 const GEMINI_KEY = process.env.GEMINI_API_KEY ?? "";
-const LIVE = isTruthyEnvValue(process.env.GEMINI_LIVE_TEST) || isTruthyEnvValue(process.env.LIVE);
+const LIVE = process.env.GEMINI_LIVE_TEST === "1" || process.env.LIVE === "1";

 const describeLive = LIVE && GEMINI_KEY ? describe : describe.skip;

@@ -1,11 +1,10 @@
 import { completeSimple, type Model } from "@mariozechner/pi-ai";
 import { describe, expect, it } from "vitest";
-import { isTruthyEnvValue } from "../infra/env.js";

 const MINIMAX_KEY = process.env.MINIMAX_API_KEY ?? "";
 const MINIMAX_BASE_URL = process.env.MINIMAX_BASE_URL?.trim() || "https://api.minimax.io/anthropic";
 const MINIMAX_MODEL = process.env.MINIMAX_MODEL?.trim() || "MiniMax-M2.1";
-const LIVE = isTruthyEnvValue(process.env.MINIMAX_LIVE_TEST) || isTruthyEnvValue(process.env.LIVE);
+const LIVE = process.env.MINIMAX_LIVE_TEST === "1" || process.env.LIVE === "1";

 const describeLive = LIVE && MINIMAX_KEY ? describe : describe.skip;

@@ -3,7 +3,6 @@ import { discoverAuthStorage, discoverModels } from "@mariozechner/pi-coding-age
 import { Type } from "@sinclair/typebox";
 import { describe, expect, it } from "vitest";
 import { loadConfig } from "../config/config.js";
-import { isTruthyEnvValue } from "../infra/env.js";
 import { resolveClawdbotAgentDir } from "./agent-paths.js";
 import {
  collectAnthropicApiKeys,
@@ -15,9 +14,9 @@ import { getApiKeyForModel } from "./model-auth.js";
 import { ensureClawdbotModelsJson } from "./models-config.js";
 import { isRateLimitErrorMessage } from "./pi-embedded-helpers/errors.js";

-const LIVE = isTruthyEnvValue(process.env.LIVE) || isTruthyEnvValue(process.env.CLAWDBOT_LIVE_TEST);
+const LIVE = process.env.LIVE === "1" || process.env.CLAWDBOT_LIVE_TEST === "1";
 const DIRECT_ENABLED = Boolean(process.env.CLAWDBOT_LIVE_MODELS?.trim());
-const REQUIRE_PROFILE_KEYS = isTruthyEnvValue(process.env.CLAWDBOT_LIVE_REQUIRE_PROFILE_KEYS);
+const REQUIRE_PROFILE_KEYS = process.env.CLAWDBOT_LIVE_REQUIRE_PROFILE_KEYS === "1";

 const describeLive = LIVE ? describe : describe.skip;

@@ -1,12 +1,11 @@
 import type { Model } from "@mariozechner/pi-ai";
 import { getModel, streamSimple } from "@mariozechner/pi-ai";
 import { describe, expect, it } from "vitest";
-import { isTruthyEnvValue } from "../infra/env.js";
 import type { ClawdbotConfig } from "../config/config.js";
 import { applyExtraParamsToAgent } from "./pi-embedded-runner.js";

 const OPENAI_KEY = process.env.OPENAI_API_KEY ?? "";
-const LIVE = isTruthyEnvValue(process.env.OPENAI_LIVE_TEST) || isTruthyEnvValue(process.env.LIVE);
+const LIVE = process.env.OPENAI_LIVE_TEST === "1" || process.env.LIVE === "1";

 const describeLive = LIVE && OPENAI_KEY ? describe : describe.skip;

@@ -1,3 +1,3 @@
-import { createSubsystemLogger } from "../../logging/subsystem.js";
+import { createSubsystemLogger } from "../../logging.js";

 export const log = createSubsystemLogger("agent/embedded");
@@ -2,9 +2,8 @@ import fs from "node:fs";
 import path from "node:path";

 import { resolveStateDir } from "../config/paths.js";
-import { isTruthyEnvValue } from "../infra/env.js";

-const RAW_STREAM_ENABLED = isTruthyEnvValue(process.env.CLAWDBOT_RAW_STREAM);
+const RAW_STREAM_ENABLED = process.env.CLAWDBOT_RAW_STREAM === "1";
 const RAW_STREAM_PATH =
  process.env.CLAWDBOT_RAW_STREAM_PATH?.trim() ||
  path.join(resolveStateDir(), "logs", "raw-stream.jsonl");
@@ -1,6 +1,6 @@
 import { parseReplyDirectives } from "../auto-reply/reply/reply-directives.js";
 import { formatToolAggregate } from "../auto-reply/tool-meta.js";
-import { createSubsystemLogger } from "../logging/subsystem.js";
+import { createSubsystemLogger } from "../logging.js";
 import type { InlineCodeState } from "../markdown/code-spans.js";
 import { buildCodeSpanIndex, createInlineCodeState } from "../markdown/code-spans.js";
 import { EmbeddedBlockChunker } from "./pi-embedded-block-chunker.js";
@@ -1,98 +0,0 @@
-import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import { describe, expect, it } from "vitest";
-
-import { __testing } from "./compaction-safeguard.js";
-
-const { collectToolFailures, formatToolFailuresSection } = __testing;
-
-describe("compaction-safeguard tool failures", () => {
-  it("formats tool failures with meta and summary", () => {
-    const messages: AgentMessage[] = [
-      {
-        role: "toolResult",
-        toolCallId: "call-1",
-        toolName: "exec",
-        isError: true,
-        details: { status: "failed", exitCode: 1 },
-        content: [{ type: "text", text: "ENOENT: missing file" }],
-        timestamp: Date.now(),
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call-2",
-        toolName: "read",
-        isError: false,
-        content: [{ type: "text", text: "ok" }],
-        timestamp: Date.now(),
-      },
-    ];
-
-    const failures = collectToolFailures(messages);
-    expect(failures).toHaveLength(1);
-
-    const section = formatToolFailuresSection(failures);
-    expect(section).toContain("## Tool Failures");
-    expect(section).toContain("exec (status=failed exitCode=1): ENOENT: missing file");
-  });
-
-  it("dedupes by toolCallId and handles empty output", () => {
-    const messages: AgentMessage[] = [
-      {
-        role: "toolResult",
-        toolCallId: "call-1",
-        toolName: "exec",
-        isError: true,
-        details: { exitCode: 2 },
-        content: [],
-        timestamp: Date.now(),
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call-1",
-        toolName: "exec",
-        isError: true,
-        content: [{ type: "text", text: "ignored" }],
-        timestamp: Date.now(),
-      },
-    ];
-
-    const failures = collectToolFailures(messages);
-    expect(failures).toHaveLength(1);
-
-    const section = formatToolFailuresSection(failures);
-    expect(section).toContain("exec (exitCode=2): failed");
-  });
-
-  it("caps the number of failures and adds overflow line", () => {
-    const messages: AgentMessage[] = Array.from({ length: 9 }, (_, idx) => ({
-      role: "toolResult",
-      toolCallId: `call-${idx}`,
-      toolName: "exec",
-      isError: true,
-      content: [{ type: "text", text: `error ${idx}` }],
-      timestamp: Date.now(),
-    }));
-
-    const failures = collectToolFailures(messages);
-    const section = formatToolFailuresSection(failures);
-    expect(section).toContain("## Tool Failures");
-    expect(section).toContain("...and 1 more");
-  });
-
-  it("omits section when there are no tool failures", () => {
-    const messages: AgentMessage[] = [
-      {
-        role: "toolResult",
-        toolCallId: "ok",
-        toolName: "exec",
-        isError: false,
-        content: [{ type: "text", text: "ok" }],
-        timestamp: Date.now(),
-      },
-    ];
-
-    const failures = collectToolFailures(messages);
-    const section = formatToolFailuresSection(failures);
-    expect(section).toBe("");
-  });
-});
@@ -10,101 +10,6 @@ const FALLBACK_SUMMARY =
 const TURN_PREFIX_INSTRUCTIONS =
  "This summary covers the prefix of a split turn. Focus on the original request," +
  " early progress, and any details needed to understand the retained suffix.";
-const MAX_TOOL_FAILURES = 8;
-const MAX_TOOL_FAILURE_CHARS = 240;
-
-type ToolFailure = {
-  toolCallId: string;
-  toolName: string;
-  summary: string;
-  meta?: string;
-};
-
-function normalizeFailureText(text: string): string {
-  return text.replace(/\s+/g, " ").trim();
-}
-
-function truncateFailureText(text: string, maxChars: number): string {
-  if (text.length <= maxChars) return text;
-  return `${text.slice(0, Math.max(0, maxChars - 3))}...`;
-}
-
-function formatToolFailureMeta(details: unknown): string | undefined {
-  if (!details || typeof details !== "object") return undefined;
-  const record = details as Record<string, unknown>;
-  const status = typeof record.status === "string" ? record.status : undefined;
-  const exitCode =
-    typeof record.exitCode === "number" && Number.isFinite(record.exitCode)
-      ? record.exitCode
-      : undefined;
-  const parts: string[] = [];
-  if (status) parts.push(`status=${status}`);
-  if (exitCode !== undefined) parts.push(`exitCode=${exitCode}`);
-  return parts.length > 0 ? parts.join(" ") : undefined;
-}
-
-function extractToolResultText(content: unknown): string {
-  if (!Array.isArray(content)) return "";
-  const parts: string[] = [];
-  for (const block of content) {
-    if (!block || typeof block !== "object") continue;
-    const rec = block as { type?: unknown; text?: unknown };
-    if (rec.type === "text" && typeof rec.text === "string") {
-      parts.push(rec.text);
-    }
-  }
-  return parts.join("\n");
-}
-
-function collectToolFailures(messages: AgentMessage[]): ToolFailure[] {
-  const failures: ToolFailure[] = [];
-  const seen = new Set<string>();
-
-  for (const message of messages) {
-    if (!message || typeof message !== "object") continue;
-    const role = (message as { role?: unknown }).role;
-    if (role !== "toolResult") continue;
-    const toolResult = message as {
-      toolCallId?: unknown;
-      toolName?: unknown;
-      content?: unknown;
-      details?: unknown;
-      isError?: unknown;
-    };
-    if (toolResult.isError !== true) continue;
-    const toolCallId =
-      typeof toolResult.toolCallId === "string" ? toolResult.toolCallId : "";
-    if (!toolCallId || seen.has(toolCallId)) continue;
-    seen.add(toolCallId);
-
-    const toolName =
-      typeof toolResult.toolName === "string" && toolResult.toolName.trim()
-        ? toolResult.toolName
-        : "tool";
-    const rawText = extractToolResultText(toolResult.content);
-    const meta = formatToolFailureMeta(toolResult.details);
-    const normalized = normalizeFailureText(rawText);
-    const summary = truncateFailureText(
-      normalized || (meta ? "failed" : "failed (no output)"),
-      MAX_TOOL_FAILURE_CHARS,
-    );
-    failures.push({ toolCallId, toolName, summary, meta });
-  }
-
-  return failures;
-}
-
-function formatToolFailuresSection(failures: ToolFailure[]): string {
-  if (failures.length === 0) return "";
-  const lines = failures.slice(0, MAX_TOOL_FAILURES).map((failure) => {
-    const meta = failure.meta ? ` (${failure.meta})` : "";
-    return `- ${failure.toolName}${meta}: ${failure.summary}`;
-  });
-  if (failures.length > MAX_TOOL_FAILURES) {
-    lines.push(`- ...and ${failures.length - MAX_TOOL_FAILURES} more`);
-  }
-  return `\n\n## Tool Failures\n${lines.join("\n")}`;
-}

 function computeFileLists(fileOps: FileOperations): {
  readFiles: string[];
@@ -198,12 +103,7 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
    const { preparation, customInstructions, signal } = event;
    const { readFiles, modifiedFiles } = computeFileLists(preparation.fileOps);
    const fileOpsSummary = formatFileOperations(readFiles, modifiedFiles);
-    const toolFailures = collectToolFailures([
-      ...preparation.messagesToSummarize,
-      ...preparation.turnPrefixMessages,
-    ]);
-    const toolFailureSection = formatToolFailuresSection(toolFailures);
-    const fallbackSummary = `${FALLBACK_SUMMARY}${toolFailureSection}${fileOpsSummary}`;
+    const fallbackSummary = `${FALLBACK_SUMMARY}${fileOpsSummary}`;

    const model = ctx.model;
    if (!model) {
@@ -262,7 +162,6 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
        summary = `${historySummary}\n\n---\n\n**Turn Context (split turn):**\n\n${prefixSummary}`;
      }

-      summary += toolFailureSection;
      summary += fileOpsSummary;

      return {
@@ -290,8 +189,3 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
    }
  });
 }
-
-export const __testing = {
-  collectToolFailures,
-  formatToolFailuresSection,
-} as const;
@@ -81,7 +81,6 @@ function resolveExecConfig(cfg: ClawdbotConfig | undefined) {
    security: globalExec?.security,
    ask: globalExec?.ask,
    node: globalExec?.node,
-    pathPrepend: globalExec?.pathPrepend,
    backgroundMs: globalExec?.backgroundMs,
    timeoutSec: globalExec?.timeoutSec,
    cleanupMs: globalExec?.cleanupMs,
@@ -208,7 +207,6 @@ export function createClawdbotCodingTools(options?: {
    security: options?.exec?.security ?? execConfig.security,
    ask: options?.exec?.ask ?? execConfig.ask,
    node: options?.exec?.node ?? execConfig.node,
-    pathPrepend: options?.exec?.pathPrepend ?? execConfig.pathPrepend,
    agentId,
    cwd: options?.workspaceDir,
    allowBackground,
@@ -1,41 +0,0 @@
-import crypto from "node:crypto";
-
-import type { SandboxDockerConfig, SandboxWorkspaceAccess } from "./types.js";
-
-type SandboxHashInput = {
-  docker: SandboxDockerConfig;
-  workspaceAccess: SandboxWorkspaceAccess;
-  workspaceDir: string;
-  agentWorkspaceDir: string;
-};
-
-function isPrimitive(value: unknown): value is string | number | boolean | bigint | symbol | null {
-  return value === null || (typeof value !== "object" && typeof value !== "function");
-}
-function normalizeForHash(value: unknown): unknown {
-  if (value === undefined) return undefined;
-  if (Array.isArray(value)) {
-    const normalized = value.map(normalizeForHash).filter((item): item is unknown => item !== undefined);
-    const primitives = normalized.filter(isPrimitive);
-    if (primitives.length === normalized.length) {
-      return [...primitives].sort((a, b) => String(a).localeCompare(String(b)));
-    }
-    return normalized;
-  }
-  if (value && typeof value === "object") {
-    const entries = Object.entries(value).sort(([a], [b]) => a.localeCompare(b));
-    const normalized: Record<string, unknown> = {};
-    for (const [key, entryValue] of entries) {
-      const next = normalizeForHash(entryValue);
-      if (next !== undefined) normalized[key] = next;
-    }
-    return normalized;
-  }
-  return value;
-}
-
-export function computeSandboxConfigHash(input: SandboxHashInput): string {
-  const payload = normalizeForHash(input);
-  const raw = JSON.stringify(payload);
-  return crypto.createHash("sha1").update(raw).digest("hex");
-}
@@ -1,14 +1,10 @@
 import { spawn } from "node:child_process";

-import { defaultRuntime } from "../../runtime.js";
 import { DEFAULT_SANDBOX_IMAGE, SANDBOX_AGENT_WORKSPACE_MOUNT } from "./constants.js";
-import { readRegistry, updateRegistry } from "./registry.js";
-import { computeSandboxConfigHash } from "./config-hash.js";
-import { resolveSandboxAgentId, resolveSandboxScopeKey, slugifySessionKey } from "./shared.js";
+import { updateRegistry } from "./registry.js";
+import { resolveSandboxScopeKey, slugifySessionKey } from "./shared.js";
 import type { SandboxConfig, SandboxDockerConfig, SandboxWorkspaceAccess } from "./types.js";

-const HOT_CONTAINER_WINDOW_MS = 5 * 60 * 1000;
-
 export function execDocker(args: string[], opts?: { allowFailure?: boolean }) {
  return new Promise<{ stdout: string; stderr: string; code: number }>((resolve, reject) => {
    const child = spawn("docker", args, {
@@ -103,16 +99,12 @@ export function buildSandboxCreateArgs(params: {
  scopeKey: string;
  createdAtMs?: number;
  labels?: Record<string, string>;
-  configHash?: string;
 }) {
  const createdAtMs = params.createdAtMs ?? Date.now();
  const args = ["create", "--name", params.name];
  args.push("--label", "clawdbot.sandbox=1");
  args.push("--label", `clawdbot.sessionKey=${params.scopeKey}`);
  args.push("--label", `clawdbot.createdAtMs=${createdAtMs}`);
-  if (params.configHash) {
-    args.push("--label", `clawdbot.configHash=${params.configHash}`);
-  }
  for (const [key, value] of Object.entries(params.labels ?? {})) {
    if (key && value) args.push("--label", `${key}=${value}`);
  }
@@ -169,7 +161,6 @@ async function createSandboxContainer(params: {
  workspaceAccess: SandboxWorkspaceAccess;
  agentWorkspaceDir: string;
  scopeKey: string;
-  configHash?: string;
 }) {
  const { name, cfg, workspaceDir, scopeKey } = params;
  await ensureDockerImage(cfg.image);
@@ -178,7 +169,6 @@ async function createSandboxContainer(params: {
    name,
    cfg,
    scopeKey,
-    configHash: params.configHash,
  });
  args.push("--workdir", cfg.workdir);
  const mainMountSuffix =
@@ -201,28 +191,6 @@ async function createSandboxContainer(params: {
  }
 }

-async function readContainerConfigHash(containerName: string): Promise<string | null> {
-  const result = await execDocker(
-    ["inspect", "-f", '{{ index .Config.Labels "clawdbot.configHash" }}', containerName],
-    { allowFailure: true },
-  );
-  if (result.code !== 0) return null;
-  const raw = result.stdout.trim();
-  if (!raw || raw === "<no value>") return null;
-  return raw;
-}
-
-function formatSandboxRecreateHint(params: { scope: SandboxConfig["scope"]; sessionKey: string }) {
-  if (params.scope === "session") {
-    return `clawdbot sandbox recreate --session ${params.sessionKey}`;
-  }
-  if (params.scope === "agent") {
-    const agentId = resolveSandboxAgentId(params.sessionKey) ?? "main";
-    return `clawdbot sandbox recreate --agent ${agentId}`;
-  }
-  return "clawdbot sandbox recreate --all";
-}
-
 export async function ensureSandboxContainer(params: {
  sessionKey: string;
  workspaceDir: string;
@@ -233,51 +201,8 @@ export async function ensureSandboxContainer(params: {
  const slug = params.cfg.scope === "shared" ? "shared" : slugifySessionKey(scopeKey);
  const name = `${params.cfg.docker.containerPrefix}${slug}`;
  const containerName = name.slice(0, 63);
-  const expectedHash = computeSandboxConfigHash({
-    docker: params.cfg.docker,
-    workspaceAccess: params.cfg.workspaceAccess,
-    workspaceDir: params.workspaceDir,
-    agentWorkspaceDir: params.agentWorkspaceDir,
-  });
-  const now = Date.now();
  const state = await dockerContainerState(containerName);
-  let hasContainer = state.exists;
-  let running = state.running;
-  let currentHash: string | null = null;
-  let hashMismatch = false;
-  let registryEntry:
-    | {
-        lastUsedAtMs: number;
-        configHash?: string;
-      }
-    | undefined;
-  if (hasContainer) {
-    const registry = await readRegistry();
-    registryEntry = registry.entries.find((entry) => entry.containerName === containerName);
-    currentHash = await readContainerConfigHash(containerName);
-    if (!currentHash) {
-      currentHash =
-        registryEntry?.configHash ?? null;
-    }
-    hashMismatch = !currentHash || currentHash !== expectedHash;
-    if (hashMismatch) {
-      const lastUsedAtMs = registryEntry?.lastUsedAtMs;
-      const isHot =
-        running &&
-        (typeof lastUsedAtMs !== "number" || now - lastUsedAtMs < HOT_CONTAINER_WINDOW_MS);
-      if (isHot) {
-        const hint = formatSandboxRecreateHint({ scope: params.cfg.scope, sessionKey: scopeKey });
-        defaultRuntime.log(
-          `Sandbox config changed for ${containerName} (recently used). Recreate to apply: ${hint}`,
-        );
-      } else {
-        await execDocker(["rm", "-f", containerName], { allowFailure: true });
-        hasContainer = false;
-        running = false;
-      }
-    }
-  }
-  if (!hasContainer) {
+  if (!state.exists) {
    await createSandboxContainer({
      name: containerName,
      cfg: params.cfg.docker,
@@ -285,18 +210,17 @@ export async function ensureSandboxContainer(params: {
      workspaceAccess: params.cfg.workspaceAccess,
      agentWorkspaceDir: params.agentWorkspaceDir,
      scopeKey,
-      configHash: expectedHash,
    });
-  } else if (!running) {
+  } else if (!state.running) {
    await execDocker(["start", containerName]);
  }
+  const now = Date.now();
  await updateRegistry({
    containerName,
    sessionKey: scopeKey,
    createdAtMs: now,
    lastUsedAtMs: now,
    image: params.cfg.docker.image,
-    configHash: hashMismatch && running ? currentHash ?? undefined : expectedHash,
  });
  return containerName;
 }
Author	SHA1	Message	Date
Peter Steinberger	adbc4d093e	fix: handle repeated compaction failures (#1187 ) (thanks @fayrose)	2026-01-18 22:02:22 +00:00
Lauren Rosenberg	0c1ac41085	fix: add reserveTokensFloor suggestion to compaction error messages When context limit is exceeded, the error message now suggests setting agents.defaults.compaction.reserveTokensFloor to 4000 or higher to prevent future occurrences.	2026-01-18 21:54:04 +00:00
Lauren Rosenberg	a8c204e9fa	style: apply prettier formatting	2026-01-18 21:54:04 +00:00
Lauren Rosenberg	1ac6f3ce92	fix: return user-facing error when session reset after compaction failure Previously, when auto-compaction failed due to context overflow, the system would reset the session and silently continue the execution loop without sending any response to the user. This made it appear as if messages were being ignored. This change ensures users receive a clear error message explaining that the context limit was exceeded and the conversation has been reset, consistent with how role ordering conflicts are already handled. Fixes the silent failure case where message + compaction exceeds context limits.	2026-01-18 21:54:04 +00:00