fix: enforce node invoke timeouts (#1357 ) (thanks @vignesh07)

fix(node): enforce node.invoke timeout in node client
Use the timeout provided on node invoke requests to ensure node clients always respond with a result. This prevents gateway-side node.invoke calls from hanging until the gateway timeout when a node command stalls. Tests: - swift test --filter GatewayNodeSessionTests
2026-01-21 05:48:54 +00:00 · 2026-01-21 05:07:30 +00:00 · 2026-01-21 05:01:32 +00:00 · 2026-01-21 04:52:54 +00:00 · 2026-01-21 04:48:34 +00:00 · 2026-01-21 04:48:33 +00:00
55 changed files with 1962 additions and 634 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Docs: https://docs.clawd.bot

 ### Changes
 - Deps: update workspace + memory-lancedb dependencies.
+- Dev: use tsgo for dev/watch builds by default; set `CLAWDBOT_TS_COMPILER=tsc` to opt out.
 - Repo: remove the Peekaboo git submodule now that the SPM release is used.
 - Update: sync plugin sources on channel switches and update npm-installed plugins during `clawdbot update`.
 - Plugins: share npm plugin update logic between `clawdbot update` and `clawdbot plugins update`.
@@ -22,6 +23,7 @@ Docs: https://docs.clawd.bot
 - Skills: add download installs with OS-filtered install options; add local sherpa-onnx-tts skill.
 - Docs: clarify WhatsApp voice notes and Windows WSL portproxy LAN access notes.
 - UI: add copy-as-markdown with error feedback and drop legacy list view. (#1345) — thanks @bradleypriest.
+- TUI: add input history (up/down) for submitted messages. (#1348) — thanks @vignesh07.
 ### Fixes
 - Discovery: shorten Bonjour DNS-SD service type to `_clawdbot-gw._tcp` and update discovery clients/docs.
 - Agents: preserve subagent announce thread/topic routing + queued replies across channels. (#1241) — thanks @gnarco.
@@ -30,6 +32,7 @@ Docs: https://docs.clawd.bot
 - Diagnostics: emit message-flow diagnostics across channels via shared dispatch; gate heartbeat/webhook logging. (#1244) — thanks @oscargavin.
 - CLI: preserve cron delivery settings when editing message payloads. (#1322) — thanks @KrauseFx.
 - CLI: keep `clawdbot logs` output resilient to broken pipes while preserving progress output.
+- Nodes: enforce node.invoke timeouts for node handlers. (#1357) — thanks @vignesh07.
 - Model catalog: avoid caching import failures, log transient discovery errors, and keep partial results. (#1332) — thanks @dougvk.
 - Doctor: clarify plugin auto-enable hint text in the startup banner.
 - Gateway: clarify unauthorized handshake responses with token/password mismatch guidance.
--- a/apps/macos/Sources/Clawdbot/ControlChannel.swift
+++ b/apps/macos/Sources/Clawdbot/ControlChannel.swift
@@ -87,15 +87,7 @@ final class ControlChannel {

    func configure() async {
        self.logger.info("control channel configure mode=local")
-        self.state = .connecting
-        do {
-            try await GatewayConnection.shared.refresh()
-            self.state = .connected
-            PresenceReporter.shared.sendImmediate(reason: "connect")
-        } catch {
-            let message = self.friendlyGatewayMessage(error)
-            self.state = .degraded(message)
-        }
+        await self.refreshEndpoint(reason: "configure")
    }

    func configure(mode: Mode = .local) async throws {
@@ -111,7 +103,7 @@ final class ControlChannel {
                        "target=\(target, privacy: .public) identitySet=\(idSet, privacy: .public)")
                self.state = .connecting
                _ = try await GatewayEndpointStore.shared.ensureRemoteControlTunnel()
-                await self.configure()
+                await self.refreshEndpoint(reason: "configure")
            } catch {
                self.state = .degraded(error.localizedDescription)
                throw error
@@ -119,6 +111,19 @@ final class ControlChannel {
        }
    }

+    func refreshEndpoint(reason: String) async {
+        self.logger.info("control channel refresh endpoint reason=\(reason, privacy: .public)")
+        self.state = .connecting
+        do {
+            try await self.establishGatewayConnection()
+            self.state = .connected
+            PresenceReporter.shared.sendImmediate(reason: "connect")
+        } catch {
+            let message = self.friendlyGatewayMessage(error)
+            self.state = .degraded(message)
+        }
+    }
+
    func disconnect() async {
        await GatewayConnection.shared.shutdown()
        self.state = .disconnected
@@ -275,18 +280,28 @@ final class ControlChannel {
                }
            }

-            do {
-                try await GatewayConnection.shared.refresh()
+            await self.refreshEndpoint(reason: "recovery:\(reasonText)")
+            if case .connected = self.state {
                self.logger.info("control channel recovery finished")
-            } catch {
-                self.logger.error(
-                    "control channel recovery failed \(error.localizedDescription, privacy: .public)")
+            } else if case let .degraded(message) = self.state {
+                self.logger.error("control channel recovery failed \(message, privacy: .public)")
            }

            self.recoveryTask = nil
        }
    }

+    private func establishGatewayConnection(timeoutMs: Int = 5000) async throws {
+        try await GatewayConnection.shared.refresh()
+        let ok = try await GatewayConnection.shared.healthOK(timeoutMs: timeoutMs)
+        if ok == false {
+            throw NSError(
+                domain: "Gateway",
+                code: 0,
+                userInfo: [NSLocalizedDescriptionKey: "gateway health not ok"])
+        }
+    }
+
    func sendSystemEvent(_ text: String, params: [String: AnyHashable] = [:]) async throws {
        var merged = params
        merged["text"] = AnyHashable(text)
--- a/apps/macos/Sources/Clawdbot/GatewayConnectivityCoordinator.swift
+++ b/apps/macos/Sources/Clawdbot/GatewayConnectivityCoordinator.swift
@@ -0,0 +1,63 @@
+import Foundation
+import Observation
+import OSLog
+
+@MainActor
+@Observable
+final class GatewayConnectivityCoordinator {
+    static let shared = GatewayConnectivityCoordinator()
+
+    private let logger = Logger(subsystem: "com.clawdbot", category: "gateway.connectivity")
+    private var endpointTask: Task<Void, Never>?
+    private var lastResolvedURL: URL?
+
+    private(set) var endpointState: GatewayEndpointState?
+    private(set) var resolvedURL: URL?
+    private(set) var resolvedMode: AppState.ConnectionMode?
+    private(set) var resolvedHostLabel: String?
+
+    private init() {
+        self.start()
+    }
+
+    func start() {
+        guard self.endpointTask == nil else { return }
+        self.endpointTask = Task { [weak self] in
+            guard let self else { return }
+            let stream = await GatewayEndpointStore.shared.subscribe()
+            for await state in stream {
+                await MainActor.run { self.handleEndpointState(state) }
+            }
+        }
+    }
+
+    var localEndpointHostLabel: String? {
+        guard self.resolvedMode == .local, let url = self.resolvedURL else { return nil }
+        return Self.hostLabel(for: url)
+    }
+
+    private func handleEndpointState(_ state: GatewayEndpointState) {
+        self.endpointState = state
+        switch state {
+        case let .ready(mode, url, _, _):
+            self.resolvedMode = mode
+            self.resolvedURL = url
+            self.resolvedHostLabel = Self.hostLabel(for: url)
+            let urlChanged = self.lastResolvedURL?.absoluteString != url.absoluteString
+            if urlChanged {
+                self.lastResolvedURL = url
+                Task { await ControlChannel.shared.refreshEndpoint(reason: "endpoint changed") }
+            }
+        case let .connecting(mode, _):
+            self.resolvedMode = mode
+        case let .unavailable(mode, _):
+            self.resolvedMode = mode
+        }
+    }
+
+    private static func hostLabel(for url: URL) -> String {
+        let host = url.host ?? url.absoluteString
+        if let port = url.port { return "\(host):\(port)" }
+        return host
+    }
+}
--- a/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
+++ b/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
@@ -68,6 +68,7 @@ actor GatewayEndpointStore {
                    env: ProcessInfo.processInfo.environment)
                let customBindHost = GatewayEndpointStore.resolveGatewayCustomBindHost(root: root)
                let tailscaleIP = await MainActor.run { TailscaleService.shared.tailscaleIP }
+                    ?? TailscaleService.fallbackTailnetIPv4()
                return GatewayEndpointStore.resolveLocalGatewayHost(
                    bindMode: bind,
                    customBindHost: customBindHost,
@@ -487,6 +488,7 @@ actor GatewayEndpointStore {
        guard currentHost == "127.0.0.1" || currentHost == "localhost" else { return nil }

        let tailscaleIP = await MainActor.run { TailscaleService.shared.tailscaleIP }
+            ?? TailscaleService.fallbackTailnetIPv4()
        guard let tailscaleIP, !tailscaleIP.isEmpty else { return nil }

        let scheme = GatewayEndpointStore.resolveGatewayScheme(
--- a/apps/macos/Sources/Clawdbot/HealthStore.swift
+++ b/apps/macos/Sources/Clawdbot/HealthStore.swift
@@ -235,8 +235,8 @@ final class HealthStore {
            let lower = error.lowercased()
            if lower.contains("connection refused") {
                let port = GatewayEnvironment.gatewayPort()
-                return "The gateway control port (127.0.0.1:\(port)) isn’t listening — " +
-                    "restart Clawdbot to bring it back."
+                let host = GatewayConnectivityCoordinator.shared.localEndpointHostLabel ?? "127.0.0.1:\(port)"
+                return "The gateway control port (\(host)) isn’t listening — restart Clawdbot to bring it back."
            }
            if lower.contains("timeout") {
                return "Timed out waiting for the control server; the gateway may be crashed or still starting."
--- a/apps/macos/Sources/Clawdbot/MenuBar.swift
+++ b/apps/macos/Sources/Clawdbot/MenuBar.swift
@@ -13,6 +13,7 @@ struct ClawdbotApp: App {
    private let gatewayManager = GatewayProcessManager.shared
    private let controlChannel = ControlChannel.shared
    private let activityStore = WorkActivityStore.shared
+    private let connectivityCoordinator = GatewayConnectivityCoordinator.shared
    @State private var statusItem: NSStatusItem?
    @State private var isMenuPresented = false
    @State private var isPanelVisible = false
--- a/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
+++ b/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
@@ -469,7 +469,7 @@ extension MenuSessionsInjector {
            }
        case .local:
            platform = "local"
-            host = "127.0.0.1:\(port)"
+            host = GatewayConnectivityCoordinator.shared.localEndpointHostLabel ?? "127.0.0.1:\(port)"
        case .unconfigured:
            platform = nil
            host = nil
--- a/apps/macos/Sources/Clawdbot/TailscaleService.swift
+++ b/apps/macos/Sources/Clawdbot/TailscaleService.swift
@@ -103,6 +103,7 @@ final class TailscaleService {
    }

    func checkTailscaleStatus() async {
+        let previousIP = self.tailscaleIP
        self.isInstalled = self.checkAppInstallation()
        if !self.isInstalled {
            self.isRunning = false
@@ -147,6 +148,10 @@ final class TailscaleService {
            self.statusError = nil
            self.logger.info("Tailscale interface IP detected (fallback) ip=\(fallback, privacy: .public)")
        }
+
+        if previousIP != self.tailscaleIP {
+            await GatewayEndpointStore.shared.refresh()
+        }
    }

    func openTailscaleApp() {
@@ -214,4 +219,8 @@ final class TailscaleService {

        return nil
    }
+
+    nonisolated static func fallbackTailnetIPv4() -> String? {
+        Self.detectTailnetIPv4()
+    }
 }
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayNodeSession.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayNodeSession.swift
@@ -11,6 +11,35 @@ private struct NodeInvokeRequestPayload: Codable, Sendable {
    var idempotencyKey: String?
 }

+// Ensures the timeout can win even if the invoke task never completes.
+private actor InvokeTimeoutRace {
+    private var finished = false
+    private let continuation: CheckedContinuation<BridgeInvokeResponse, Never>
+    private var invokeTask: Task<Void, Never>?
+    private var timeoutTask: Task<Void, Never>?
+
+    init(continuation: CheckedContinuation<BridgeInvokeResponse, Never>) {
+        self.continuation = continuation
+    }
+
+    func registerTasks(invoke: Task<Void, Never>, timeout: Task<Void, Never>) {
+        self.invokeTask = invoke
+        self.timeoutTask = timeout
+        if finished {
+            invoke.cancel()
+            timeout.cancel()
+        }
+    }
+
+    func finish(_ response: BridgeInvokeResponse) {
+        guard !finished else { return }
+        finished = true
+        continuation.resume(returning: response)
+        invokeTask?.cancel()
+        timeoutTask?.cancel()
+    }
+}
+
 public actor GatewayNodeSession {
    private let logger = Logger(subsystem: "com.clawdbot", category: "node.gateway")
    private let decoder = JSONDecoder()
@@ -23,6 +52,45 @@ public actor GatewayNodeSession {
    private var onConnected: (@Sendable () async -> Void)?
    private var onDisconnected: (@Sendable (String) async -> Void)?
    private var onInvoke: (@Sendable (BridgeInvokeRequest) async -> BridgeInvokeResponse)?
+
+    static func invokeWithTimeout(
+        request: BridgeInvokeRequest,
+        timeoutMs: Int?,
+        onInvoke: @escaping @Sendable (BridgeInvokeRequest) async -> BridgeInvokeResponse
+    ) async -> BridgeInvokeResponse {
+        let timeout = max(0, timeoutMs ?? 0)
+        guard timeout > 0 else {
+            return await onInvoke(request)
+        }
+
+        let cappedTimeout = min(timeout, Int(UInt64.max / 1_000_000))
+        let timeoutResponse = BridgeInvokeResponse(
+            id: request.id,
+            ok: false,
+            error: ClawdbotNodeError(
+                code: .unavailable,
+                message: "node invoke timed out")
+        )
+
+        return await withCheckedContinuation { continuation in
+            let race = InvokeTimeoutRace(continuation: continuation)
+            let invokeTask = Task {
+                let response = await onInvoke(request)
+                await race.finish(response)
+            }
+            let timeoutTask = Task {
+                do {
+                    try await Task.sleep(nanoseconds: UInt64(cappedTimeout) * 1_000_000)
+                } catch {
+                    return
+                }
+                await race.finish(timeoutResponse)
+            }
+            Task {
+                await race.registerTasks(invoke: invokeTask, timeout: timeoutTask)
+            }
+        }
+    }
    private var serverEventSubscribers: [UUID: AsyncStream<EventFrame>.Continuation] = [:]
    private var canvasHostUrl: String?

@@ -167,7 +235,11 @@ public actor GatewayNodeSession {
            let request = try self.decoder.decode(NodeInvokeRequestPayload.self, from: data)
            guard let onInvoke else { return }
            let req = BridgeInvokeRequest(id: request.id, command: request.command, paramsJSON: request.paramsJSON)
-            let response = await onInvoke(req)
+            let response = await Self.invokeWithTimeout(
+                request: req,
+                timeoutMs: request.timeoutMs,
+                onInvoke: onInvoke
+            )
            await self.sendInvokeResult(request: request, response: response)
        } catch {
            self.logger.error("node invoke decode failed: \(error.localizedDescription, privacy: .public)")
@@ -180,8 +252,10 @@ public actor GatewayNodeSession {
            "id": AnyCodable(request.id),
            "nodeId": AnyCodable(request.nodeId),
            "ok": AnyCodable(response.ok),
-            "payloadJSON": AnyCodable(response.payloadJSON ?? NSNull()),
        ]
+        if let payloadJSON = response.payloadJSON {
+            params["payloadJSON"] = AnyCodable(payloadJSON)
+        }
        if let error = response.error {
            params["error"] = AnyCodable([
                "code": AnyCodable(error.code.rawValue),
--- a/apps/shared/ClawdbotKit/Tests/ClawdbotKitTests/GatewayNodeSessionTests.swift
+++ b/apps/shared/ClawdbotKit/Tests/ClawdbotKitTests/GatewayNodeSessionTests.swift
@@ -0,0 +1,78 @@
+import Foundation
+import Testing
+@testable import ClawdbotKit
+import ClawdbotProtocol
+
+struct GatewayNodeSessionTests {
+    @Test
+    func invokeWithTimeoutReturnsUnderlyingResponseBeforeTimeout() async {
+        let request = BridgeInvokeRequest(id: "1", command: "x", paramsJSON: nil)
+        let response = await GatewayNodeSession.invokeWithTimeout(
+            request: request,
+            timeoutMs: 50,
+            onInvoke: { req in
+                #expect(req.id == "1")
+                return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: "{}", error: nil)
+            }
+        )
+
+        #expect(response.ok == true)
+        #expect(response.error == nil)
+        #expect(response.payloadJSON == "{}")
+    }
+
+    @Test
+    func invokeWithTimeoutReturnsTimeoutError() async {
+        let request = BridgeInvokeRequest(id: "abc", command: "x", paramsJSON: nil)
+        let response = await GatewayNodeSession.invokeWithTimeout(
+            request: request,
+            timeoutMs: 10,
+            onInvoke: { _ in
+                try? await Task.sleep(nanoseconds: 200_000_000) // 200ms
+                return BridgeInvokeResponse(id: "abc", ok: true, payloadJSON: "{}", error: nil)
+            }
+        )
+
+        #expect(response.ok == false)
+        #expect(response.error?.code == .unavailable)
+        #expect(response.error?.message.contains("timed out") == true)
+    }
+
+    @Test
+    func invokeWithTimeoutReturnsWhenHandlerNeverCompletes() async {
+        let request = BridgeInvokeRequest(id: "stall", command: "x", paramsJSON: nil)
+        let response = try? await AsyncTimeout.withTimeoutMs(
+            timeoutMs: 200,
+            onTimeout: { NSError(domain: "GatewayNodeSessionTests", code: 1) },
+            operation: {
+                await GatewayNodeSession.invokeWithTimeout(
+                    request: request,
+                    timeoutMs: 10,
+                    onInvoke: { _ in
+                        await withCheckedContinuation { _ in }
+                    }
+                )
+            }
+        )
+
+        #expect(response != nil)
+        #expect(response?.ok == false)
+        #expect(response?.error?.code == .unavailable)
+    }
+
+    @Test
+    func invokeWithTimeoutZeroDisablesTimeout() async {
+        let request = BridgeInvokeRequest(id: "1", command: "x", paramsJSON: nil)
+        let response = await GatewayNodeSession.invokeWithTimeout(
+            request: request,
+            timeoutMs: 0,
+            onInvoke: { req in
+                try? await Task.sleep(nanoseconds: 5_000_000)
+                return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: nil, error: nil)
+            }
+        )
+
+        #expect(response.ok == true)
+        #expect(response.error == nil)
+    }
+}
--- a/docs/cli/index.md
+++ b/docs/cli/index.md
@@ -825,9 +825,9 @@ Common options:
 - `--url`, `--token`, `--timeout`, `--json`

 Subcommands:
- `nodes status`
+- `nodes status [--connected] [--last-connected <duration>]`
 - `nodes describe --node <id|name|ip>`
- `nodes list`
+- `nodes list [--connected] [--last-connected <duration>]`
 - `nodes pending`
 - `nodes approve <requestId>`
 - `nodes reject <requestId>`
--- a/docs/cli/nodes.md
+++ b/docs/cli/nodes.md
@@ -18,12 +18,18 @@ Related:

 ```bash
 clawdbot nodes list
+clawdbot nodes list --connected
+clawdbot nodes list --last-connected 24h
 clawdbot nodes pending
 clawdbot nodes approve <requestId>
 clawdbot nodes status
+clawdbot nodes status --connected
+clawdbot nodes status --last-connected 24h
 ```

 `nodes list` prints pending/paired tables. Paired rows include the most recent connect age (Last Connect).
+Use `--connected` to only show currently-connected nodes. Use `--last-connected <duration>` to
+filter to nodes that connected within a duration (e.g. `24h`, `7d`).

 ## Invoke / run

--- a/docs/nodes/index.md
+++ b/docs/nodes/index.md
@@ -34,6 +34,81 @@ clawdbot nodes rename --node <idOrNameOrIp> --name "Kitchen iPad"
 Notes:
 - `nodes rename` stores a display name override in the gateway pairing store.

+## Remote node host (system.run)
+
+Use a **node host** when your Gateway runs on one machine and you want commands
+to execute on another. The model still talks to the **gateway**; the gateway
+forwards `exec` calls to the **node host** when `host=node` is selected.
+
+### What runs where
+- **Gateway host**: receives messages, runs the model, routes tool calls.
+- **Node host**: executes `system.run`/`system.which` on the node machine.
+- **Approvals**: enforced on the node host via `~/.clawdbot/exec-approvals.json`.
+
+### Start a node host (foreground)
+
+On the node machine:
+
+```bash
+clawdbot node start --host <gateway-host> --port 18789 --display-name "Build Node"
+```
+
+### Start a node host (service)
+
+```bash
+clawdbot node service install --host <gateway-host> --port 18789 --display-name "Build Node"
+clawdbot node service start
+```
+
+### Pair + name
+
+On the gateway host:
+
+```bash
+clawdbot nodes pending
+clawdbot nodes approve <requestId>
+clawdbot nodes list
+```
+
+Naming options:
+- `--display-name` on `clawdbot node start/service install` (persists in `~/.clawdbot/node.json` on the node).
+- `clawdbot nodes rename --node <id|name|ip> --name "Build Node"` (gateway override).
+
+### Allowlist the commands
+
+Exec approvals are **per node host**. Add allowlist entries from the gateway:
+
+```bash
+clawdbot approvals allowlist add --node <id|name|ip> "/usr/bin/uname"
+clawdbot approvals allowlist add --node <id|name|ip> "/usr/bin/sw_vers"
+```
+
+Approvals live on the node host at `~/.clawdbot/exec-approvals.json`.
+
+### Point exec at the node
+
+Configure defaults (gateway config):
+
+```bash
+clawdbot config set tools.exec.host node
+clawdbot config set tools.exec.security allowlist
+clawdbot config set tools.exec.node "<id-or-name>"
+```
+
+Or per session:
+
+```
+/exec host=node security=allowlist node=<id-or-name>
+```
+
+Once set, any `exec` call with `host=node` runs on the node host (subject to the
+node allowlist/approvals).
+
+Related:
+- [Node host CLI](/cli/node)
+- [Exec tool](/tools/exec)
+- [Exec approvals](/tools/exec-approvals)
+
 ## Invoking commands

 Low-level (raw RPC):
@@ -214,6 +289,9 @@ Notes:
 - The node host stores its node id + pairing token in `~/.clawdbot/node.json`.
 - Exec approvals are enforced locally via `~/.clawdbot/exec-approvals.json`
  (see [Exec approvals](/tools/exec-approvals)).
+- On macOS, the headless node host prefers the companion app exec host when reachable and falls
+  back to local execution if the app is unavailable. Set `CLAWDBOT_NODE_EXEC_HOST=app` to require
+  the app, or `CLAWDBOT_NODE_EXEC_FALLBACK=0` to disable fallback.
 - Add `--tls` / `--tls-fingerprint` when the bridge requires TLS.

 ## Mac node mode
--- a/package.json
+++ b/package.json
@@ -210,6 +210,7 @@
    "@types/proper-lockfile": "^4.1.4",
    "@types/qrcode-terminal": "^0.12.2",
    "@types/ws": "^8.18.1",
+    "@typescript/native-preview": "7.0.0-dev.20260120.1",
    "@vitest/coverage-v8": "^4.0.17",
    "docx-preview": "^0.3.7",
    "lit": "^3.3.2",
@@ -231,7 +232,7 @@
    "overrides": {
      "@sinclair/typebox": "0.34.47",
      "hono": "4.11.4",
-      "tar": "7.5.3"
+      "tar": "7.5.4"
    },
    "patchedDependencies": {
      "@mariozechner/pi-ai@0.49.2": "patches/@mariozechner__pi-ai@0.49.2.patch"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,7 +7,7 @@ settings:
 overrides:
  '@sinclair/typebox': 0.34.47
  hono: 4.11.4
-  tar: 7.5.3
+  tar: 7.5.4

 patchedDependencies:
  '@mariozechner/pi-ai@0.49.2':
@@ -151,8 +151,8 @@ importers:
        specifier: 0.1.7-alpha.2
        version: 0.1.7-alpha.2
      tar:
-        specifier: 7.5.3
-        version: 7.5.3
+        specifier: 7.5.4
+        version: 7.5.4
      tslog:
        specifier: ^4.10.2
        version: 4.10.2
@@ -202,6 +202,9 @@ importers:
      '@types/ws':
        specifier: ^8.18.1
        version: 8.18.1
+      '@typescript/native-preview':
+        specifier: 7.0.0-dev.20260120.1
+        version: 7.0.0-dev.20260120.1
      '@vitest/coverage-v8':
        specifier: ^4.0.17
        version: 4.0.17(@vitest/browser@4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(vitest@4.0.17)
@@ -2530,6 +2533,45 @@ packages:
  '@types/ws@8.18.1':
    resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}

+  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-r3pWFuR2H7mn6ScwpH5jJljKQqKto0npVuJSk6pRwFwexpTyxOGmJTZJ1V0AWiisaNxU2+CNAqWFJSJYIE/QTg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-cuC1+wLbUP+Ip2UT94G134fqRdp5w3b3dhcCO6/FQ4yXxvRNyv/WK+upHBUFDaeSOeHgDTyO9/QFYUWwC4If1A==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-zZGvEGY7wcHYefMZ87KNmvjN3NLIhsCMHEpHZiGCS3khKf+8z6ZsanrzCjOTodvL01VPyBzHxV1EtkSxAcLiQg==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@typescript/native-preview-linux-arm@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-vN6OYVySol/kQZjJGmAzd6L30SyVlCgmCXS8WjUYtE5clN0YrzQHop16RK29fYZHMxpkOniVBtRPxUYQANZBlQ==}
+    cpu: [arm]
+    os: [linux]
+
+  '@typescript/native-preview-linux-x64@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-JBfNhWd/asd5MDeS3VgRvE24pGKBkmvLub6tsux6ypr+Yhy+o0WaAEzVpmlRYZUqss2ai5tvOu4dzPBXzZAtFw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-tTndRtYCq2xwgE0VkTi9ACNiJaV43+PqvBqCxk8ceYi3X36Ve+CCnwlZfZJ4k9NxZthtrAwF/kUmpC9iIYbq1w==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@typescript/native-preview-win32-x64@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-oZia7hFL6k9pVepfonuPI86Jmyz6WlJKR57tWCDwRNmpA7odxuTq1PbvcYgy1z4+wHF1nnKKJY0PMAiq6ac18w==}
+    cpu: [x64]
+    os: [win32]
+
+  '@typescript/native-preview@7.0.0-dev.20260120.1':
+    resolution: {integrity: sha512-nnEf37C9ue7OBRnF2zmV/OCBmV5Y7T/K4mCHa+nxgiXcF/1w8sA0cgdFl+gHQ0mysqUJ+Bu5btAMeWgpLyjrgg==}
+    hasBin: true
+
  '@typespec/ts-http-runtime@0.3.2':
    resolution: {integrity: sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==}
    engines: {node: '>=20.0.0'}
@@ -4863,10 +4905,9 @@ packages:
  tailwindcss@4.1.17:
    resolution: {integrity: sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q==}

-  tar@7.5.3:
-    resolution: {integrity: sha512-ENg5JUHUm2rDD7IvKNFGzyElLXNjachNLp6RaGf4+JOgxXHkqA+gq81ZAMCUmtMtqBsoU62lcp6S27g1LCYGGQ==}
+  tar@7.5.4:
+    resolution: {integrity: sha512-AN04xbWGrSTDmVwlI4/GTlIIwMFk/XEv7uL8aa57zuvRy6s4hdBed+lVq2fAZ89XDa7Us3ANXcE3Tvqvja1kTA==}
    engines: {node: '>=18'}
-    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me

  thenify-all@1.6.0:
    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
@@ -7699,6 +7740,37 @@ snapshots:
    dependencies:
      '@types/node': 25.0.9

+  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260120.1':
+    optional: true
+
+  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260120.1':
+    optional: true
+
+  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260120.1':
+    optional: true
+
+  '@typescript/native-preview-linux-arm@7.0.0-dev.20260120.1':
+    optional: true
+
+  '@typescript/native-preview-linux-x64@7.0.0-dev.20260120.1':
+    optional: true
+
+  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260120.1':
+    optional: true
+
+  '@typescript/native-preview-win32-x64@7.0.0-dev.20260120.1':
+    optional: true
+
+  '@typescript/native-preview@7.0.0-dev.20260120.1':
+    optionalDependencies:
+      '@typescript/native-preview-darwin-arm64': 7.0.0-dev.20260120.1
+      '@typescript/native-preview-darwin-x64': 7.0.0-dev.20260120.1
+      '@typescript/native-preview-linux-arm': 7.0.0-dev.20260120.1
+      '@typescript/native-preview-linux-arm64': 7.0.0-dev.20260120.1
+      '@typescript/native-preview-linux-x64': 7.0.0-dev.20260120.1
+      '@typescript/native-preview-win32-arm64': 7.0.0-dev.20260120.1
+      '@typescript/native-preview-win32-x64': 7.0.0-dev.20260120.1
+
  '@typespec/ts-http-runtime@0.3.2':
    dependencies:
      http-proxy-agent: 7.0.2
@@ -8196,7 +8268,7 @@ snapshots:
      npmlog: 6.0.2
      rc: 1.2.8
      semver: 7.7.3
-      tar: 7.5.3
+      tar: 7.5.4
      url-join: 4.0.1
      which: 2.0.2
      yargs: 17.7.2
@@ -10438,7 +10510,7 @@ snapshots:

  tailwindcss@4.1.17: {}

-  tar@7.5.3:
+  tar@7.5.4:
    dependencies:
      '@isaacs/fs-minipass': 4.0.1
      chownr: 3.0.0
--- a/scripts/run-node.mjs
+++ b/scripts/run-node.mjs
@@ -7,6 +7,8 @@ import process from "node:process";
 const args = process.argv.slice(2);
 const env = { ...process.env };
 const cwd = process.cwd();
+const compiler = env.CLAWDBOT_TS_COMPILER === "tsc" ? "tsc" : "tsgo";
+const projectArgs = ["--project", "tsconfig.json"];

 const distRoot = path.join(cwd, "dist");
 const distEntry = path.join(distRoot, "entry.js");
@@ -113,7 +115,7 @@ if (!shouldBuild()) {
  runNode();
 } else {
  logRunner("Building TypeScript (dist is stale).");
-  const build = spawn("pnpm", ["exec", "tsc", "-p", "tsconfig.json"], {
+  const build = spawn("pnpm", ["exec", compiler, ...projectArgs], {
    cwd,
    env,
    stdio: "inherit",
--- a/scripts/watch-node.mjs
+++ b/scripts/watch-node.mjs
@@ -5,8 +5,10 @@ import process from "node:process";
 const args = process.argv.slice(2);
 const env = { ...process.env };
 const cwd = process.cwd();
+const compiler = env.CLAWDBOT_TS_COMPILER === "tsc" ? "tsc" : "tsgo";
+const projectArgs = ["--project", "tsconfig.json"];

-const initialBuild = spawnSync("pnpm", ["exec", "tsc", "-p", "tsconfig.json"], {
+const initialBuild = spawnSync("pnpm", ["exec", compiler, ...projectArgs], {
  cwd,
  env,
  stdio: "inherit",
@@ -16,7 +18,12 @@ if (initialBuild.status !== 0) {
  process.exit(initialBuild.status ?? 1);
 }

-const tsc = spawn("pnpm", ["exec", "tsc", "--watch", "--preserveWatchOutput"], {
+const watchArgs =
+  compiler === "tsc"
+    ? [...projectArgs, "--watch", "--preserveWatchOutput"]
+    : [...projectArgs, "--watch"];
+
+const compilerProcess = spawn("pnpm", ["exec", compiler, ...watchArgs], {
  cwd,
  env,
  stdio: "inherit",
@@ -34,14 +41,14 @@ function cleanup(code = 0) {
  if (exiting) return;
  exiting = true;
  nodeProcess.kill("SIGTERM");
-  tsc.kill("SIGTERM");
+  compilerProcess.kill("SIGTERM");
  process.exit(code);
 }

 process.on("SIGINT", () => cleanup(130));
 process.on("SIGTERM", () => cleanup(143));

-tsc.on("exit", (code) => {
+compilerProcess.on("exit", (code) => {
  if (exiting) return;
  cleanup(code ?? 1);
 });
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -494,12 +494,7 @@ export function createExecTool(
        if (nodeEnv) {
          applyPathPrepend(nodeEnv, defaultPathPrepend, { requireExisting: true });
        }
-        const resolution = resolveCommandResolution(params.command, workdir, env);
-        const allowlistMatch =
-          hostSecurity === "allowlist" ? matchAllowlist(approvals.allowlist, resolution) : null;
-        const requiresAsk =
-          hostAsk === "always" ||
-          (hostAsk === "on-miss" && hostSecurity === "allowlist" && !allowlistMatch);
+        const requiresAsk = hostAsk === "always" || hostAsk === "on-miss";

        let approvedByAsk = false;
        let approvalDecision: "allow-once" | "allow-always" | null = null;
@@ -514,7 +509,7 @@ export function createExecTool(
              security: hostSecurity,
              ask: hostAsk,
              agentId: defaults?.agentId,
-              resolvedPath: resolution?.resolvedPath ?? null,
+              resolvedPath: null,
              sessionKey: defaults?.sessionKey ?? null,
              timeoutMs: 120_000,
            },
@@ -532,11 +527,7 @@ export function createExecTool(
              approvedByAsk = true;
              approvalDecision = "allow-once";
            } else if (askFallback === "allowlist") {
-              if (!allowlistMatch) {
-                throw new Error("exec denied: approval required (approval UI not available)");
-              }
-              approvedByAsk = true;
-              approvalDecision = "allow-once";
+              // Defer allowlist enforcement to the node host.
            } else {
              throw new Error("exec denied: approval required (approval UI not available)");
            }
@@ -548,32 +539,8 @@ export function createExecTool(
          if (decision === "allow-always") {
            approvedByAsk = true;
            approvalDecision = "allow-always";
-            if (hostSecurity === "allowlist") {
-              const pattern =
-                resolution?.resolvedPath ??
-                resolution?.rawExecutable ??
-                params.command.split(/\s+/).shift() ??
-                "";
-              if (pattern) {
-                addAllowlistEntry(approvals.file, defaults?.agentId, pattern);
-              }
-            }
          }
        }
-
-        if (hostSecurity === "allowlist" && !allowlistMatch && !approvedByAsk) {
-          throw new Error("exec denied: allowlist miss");
-        }
-
-        if (allowlistMatch) {
-          recordAllowlistUse(
-            approvals.file,
-            defaults?.agentId,
-            allowlistMatch,
-            params.command,
-            resolution?.resolvedPath,
-          );
-        }
        const invokeParams: Record<string, unknown> = {
          nodeId,
          command: "system.run",
--- a/src/auto-reply/reply/agent-runner.authprofileid-fallback.test.ts
+++ b/src/auto-reply/reply/agent-runner.authprofileid-fallback.test.ts
@@ -0,0 +1,149 @@
+import { describe, expect, it, vi } from "vitest";
+import type { TemplateContext } from "../templating.js";
+import type { FollowupRun, QueueSettings } from "./queue.js";
+import { createMockTypingController } from "./test-helpers.js";
+
+const runEmbeddedPiAgentMock = vi.fn();
+
+vi.mock("../../agents/model-fallback.js", () => ({
+  runWithModelFallback: async ({
+    run,
+  }: {
+    run: (provider: string, model: string) => Promise<unknown>;
+  }) => ({
+    // Force a cross-provider fallback candidate
+    result: await run("openai-codex", "gpt-5.2"),
+    provider: "openai-codex",
+    model: "gpt-5.2",
+  }),
+}));
+
+vi.mock("../../agents/pi-embedded.js", () => ({
+  queueEmbeddedPiMessage: vi.fn().mockReturnValue(false),
+  runEmbeddedPiAgent: (params: unknown) => runEmbeddedPiAgentMock(params),
+}));
+
+vi.mock("./queue.js", async () => {
+  const actual = await vi.importActual<typeof import("./queue.js")>("./queue.js");
+  return {
+    ...actual,
+    enqueueFollowupRun: vi.fn(),
+    scheduleFollowupDrain: vi.fn(),
+  };
+});
+
+import { runReplyAgent } from "./agent-runner.js";
+
+function createBaseRun(params: { runOverrides?: Partial<FollowupRun["run"]> }) {
+  const typing = createMockTypingController();
+  const sessionCtx = {
+    Provider: "telegram",
+    OriginatingTo: "chat",
+    AccountId: "primary",
+    MessageSid: "msg",
+    Surface: "telegram",
+  } as unknown as TemplateContext;
+
+  const resolvedQueue = { mode: "interrupt" } as unknown as QueueSettings;
+
+  const followupRun = {
+    prompt: "hello",
+    summaryLine: "hello",
+    enqueuedAt: Date.now(),
+    run: {
+      agentId: "main",
+      agentDir: "/tmp/agent",
+      sessionId: "session",
+      sessionKey: "main",
+      messageProvider: "telegram",
+      sessionFile: "/tmp/session.jsonl",
+      workspaceDir: "/tmp",
+      config: {},
+      skillsSnapshot: {},
+      provider: "anthropic",
+      model: "claude-opus",
+      authProfileId: "anthropic:clawd",
+      authProfileIdSource: "manual",
+      thinkLevel: "low",
+      verboseLevel: "off",
+      elevatedLevel: "off",
+      bashElevated: {
+        enabled: false,
+        allowed: false,
+        defaultLevel: "off",
+      },
+      timeoutMs: 5_000,
+      blockReplyBreak: "message_end",
+    },
+  } as unknown as FollowupRun;
+
+  return {
+    typing,
+    sessionCtx,
+    resolvedQueue,
+    followupRun: {
+      ...followupRun,
+      run: { ...followupRun.run, ...params.runOverrides },
+    },
+  };
+}
+
+describe("authProfileId fallback scoping", () => {
+  it("drops authProfileId when provider changes during fallback", async () => {
+    runEmbeddedPiAgentMock.mockReset();
+    runEmbeddedPiAgentMock.mockResolvedValue({ payloads: [{ text: "ok" }], meta: {} });
+
+    const sessionKey = "main";
+    const sessionEntry = {
+      sessionId: "session",
+      updatedAt: Date.now(),
+      totalTokens: 1,
+      compactionCount: 0,
+    };
+
+    const { typing, sessionCtx, resolvedQueue, followupRun } = createBaseRun({
+      runOverrides: {
+        provider: "anthropic",
+        model: "claude-opus",
+        authProfileId: "anthropic:clawd",
+        authProfileIdSource: "manual",
+      },
+    });
+
+    await runReplyAgent({
+      commandBody: "hello",
+      followupRun,
+      queueKey: sessionKey,
+      resolvedQueue,
+      shouldSteer: false,
+      shouldFollowup: false,
+      isActive: false,
+      isStreaming: false,
+      typing,
+      sessionCtx,
+      sessionEntry,
+      sessionStore: { [sessionKey]: sessionEntry },
+      sessionKey,
+      storePath: undefined,
+      defaultModel: "anthropic/claude-opus-4-5",
+      agentCfgContextTokens: 100_000,
+      resolvedVerboseLevel: "off",
+      isNewSession: false,
+      blockStreamingEnabled: false,
+      resolvedBlockStreamingBreak: "message_end",
+      shouldInjectGroupIntro: false,
+      typingMode: "instant",
+    });
+
+    expect(runEmbeddedPiAgentMock).toHaveBeenCalledTimes(1);
+    const call = runEmbeddedPiAgentMock.mock.calls[0]?.[0] as {
+      authProfileId?: unknown;
+      authProfileIdSource?: unknown;
+      provider?: unknown;
+    };
+
+    expect(call.provider).toBe("openai-codex");
+    expect(call.authProfileId).toBeUndefined();
+    expect(call.authProfileIdSource).toBeUndefined();
+  });
+});
--- a/src/cli/browser-cli.ts
+++ b/src/cli/browser-cli.ts
@@ -5,6 +5,7 @@ import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
 import { theme } from "../terminal/theme.js";
 import { formatCliCommand } from "./command-format.js";
+import { formatHelpExamples } from "./help-format.js";
 import { registerBrowserActionInputCommands } from "./browser-cli-actions-input.js";
 import { registerBrowserActionObserveCommands } from "./browser-cli-actions-observe.js";
 import { registerBrowserDebugCommands } from "./browser-cli-debug.js";
@@ -26,7 +27,10 @@ export function registerBrowserCli(program: Command) {
    .addHelpText(
      "after",
      () =>
-        `\nExamples:\n  ${[...browserCoreExamples, ...browserActionExamples].join("\n  ")}\n\n${theme.muted("Docs:")} ${formatDocsLink(
+        `\n${theme.heading("Examples:")}\n${formatHelpExamples(
+          [...browserCoreExamples, ...browserActionExamples].map((cmd) => [cmd, ""]),
+          true,
+        )}\n\n${theme.muted("Docs:")} ${formatDocsLink(
          "/cli/browser",
          "docs.clawd.bot/cli/browser",
        )}\n`,
--- a/src/cli/devices-cli.ts
+++ b/src/cli/devices-cli.ts
@@ -3,6 +3,8 @@ import type { Command } from "commander";
 import { callGateway } from "../gateway/call.js";
 import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
 import { defaultRuntime } from "../runtime.js";
+import { renderTable } from "../terminal/table.js";
+import { theme } from "../terminal/theme.js";
 import { withProgress } from "./progress.js";

 type DevicesRpcOpts = {
@@ -96,11 +98,11 @@ function parseDevicePairingList(value: unknown): DevicePairingList {
 }

 function formatTokenSummary(tokens: DeviceTokenSummary[] | undefined) {
-  if (!tokens || tokens.length === 0) return "tokens: none";
+  if (!tokens || tokens.length === 0) return "none";
  const parts = tokens
    .map((t) => `${t.role}${t.revokedAtMs ? " (revoked)" : ""}`)
    .sort((a, b) => a.localeCompare(b));
-  return `tokens: ${parts.join(", ")}`;
+  return parts.join(", ");
 }

 export function registerDevicesCli(program: Command) {
@@ -118,32 +120,59 @@ export function registerDevicesCli(program: Command) {
          return;
        }
        if (list.pending?.length) {
-          defaultRuntime.log("Pending:");
-          for (const req of list.pending) {
-            const name = req.displayName || req.deviceId;
-            const repair = req.isRepair ? " (repair)" : "";
-            const ip = req.remoteIp ? ` · ${req.remoteIp}` : "";
-            const age =
-              typeof req.ts === "number" ? ` · ${formatAge(Date.now() - req.ts)} ago` : "";
-            const role = req.role ? ` · role: ${req.role}` : "";
-            defaultRuntime.log(`- ${req.requestId}: ${name}${repair}${role}${ip}${age}`);
-          }
+          const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+          defaultRuntime.log(
+            `${theme.heading("Pending")} ${theme.muted(`(${list.pending.length})`)}`,
+          );
+          defaultRuntime.log(
+            renderTable({
+              width: tableWidth,
+              columns: [
+                { key: "Request", header: "Request", minWidth: 10 },
+                { key: "Device", header: "Device", minWidth: 16, flex: true },
+                { key: "Role", header: "Role", minWidth: 8 },
+                { key: "IP", header: "IP", minWidth: 12 },
+                { key: "Age", header: "Age", minWidth: 8 },
+                { key: "Flags", header: "Flags", minWidth: 8 },
+              ],
+              rows: list.pending.map((req) => ({
+                Request: req.requestId,
+                Device: req.displayName || req.deviceId,
+                Role: req.role ?? "",
+                IP: req.remoteIp ?? "",
+                Age: typeof req.ts === "number" ? `${formatAge(Date.now() - req.ts)} ago` : "",
+                Flags: req.isRepair ? "repair" : "",
+              })),
+            }).trimEnd(),
+          );
        }
        if (list.paired?.length) {
-          defaultRuntime.log("Paired:");
-          for (const device of list.paired) {
-            const name = device.displayName || device.deviceId;
-            const roles = device.roles?.length ? `roles: ${device.roles.join(", ")}` : "roles: -";
-            const scopes = device.scopes?.length
-              ? `scopes: ${device.scopes.join(", ")}`
-              : "scopes: -";
-            const ip = device.remoteIp ? ` · ${device.remoteIp}` : "";
-            const tokens = formatTokenSummary(device.tokens);
-            defaultRuntime.log(`- ${name} · ${roles} · ${scopes} · ${tokens}${ip}`);
-          }
+          const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+          defaultRuntime.log(
+            `${theme.heading("Paired")} ${theme.muted(`(${list.paired.length})`)}`,
+          );
+          defaultRuntime.log(
+            renderTable({
+              width: tableWidth,
+              columns: [
+                { key: "Device", header: "Device", minWidth: 16, flex: true },
+                { key: "Roles", header: "Roles", minWidth: 12, flex: true },
+                { key: "Scopes", header: "Scopes", minWidth: 12, flex: true },
+                { key: "Tokens", header: "Tokens", minWidth: 12, flex: true },
+                { key: "IP", header: "IP", minWidth: 12 },
+              ],
+              rows: list.paired.map((device) => ({
+                Device: device.displayName || device.deviceId,
+                Roles: device.roles?.length ? device.roles.join(", ") : "",
+                Scopes: device.scopes?.length ? device.scopes.join(", ") : "",
+                Tokens: formatTokenSummary(device.tokens),
+                IP: device.remoteIp ?? "",
+              })),
+            }).trimEnd(),
+          );
        }
        if (!list.pending?.length && !list.paired?.length) {
-          defaultRuntime.log("No device pairing entries.");
+          defaultRuntime.log(theme.muted("No device pairing entries."));
        }
      }),
  );
@@ -160,7 +189,7 @@ export function registerDevicesCli(program: Command) {
          return;
        }
        const deviceId = (result as { device?: { deviceId?: string } })?.device?.deviceId;
-        defaultRuntime.log(`device approved: ${deviceId ?? "ok"}`);
+        defaultRuntime.log(`${theme.success("Approved")} ${theme.command(deviceId ?? "ok")}`);
      }),
  );

@@ -176,7 +205,7 @@ export function registerDevicesCli(program: Command) {
          return;
        }
        const deviceId = (result as { deviceId?: string })?.deviceId;
-        defaultRuntime.log(`device rejected: ${deviceId ?? "ok"}`);
+        defaultRuntime.log(`${theme.warn("Rejected")} ${theme.command(deviceId ?? "ok")}`);
      }),
  );

--- a/src/cli/directory-cli.ts
+++ b/src/cli/directory-cli.ts
@@ -8,6 +8,8 @@ import { resolveMessageChannelSelection } from "../infra/outbound/channel-select
 import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
 import { theme } from "../terminal/theme.js";
+import { renderTable } from "../terminal/table.js";
+import type { ChannelDirectoryEntry } from "../channels/plugins/types.core.js";

 function parseLimit(value: unknown): number | null {
  if (typeof value === "number" && Number.isFinite(value)) {
@@ -22,9 +24,20 @@ function parseLimit(value: unknown): number | null {
  return parsed;
 }

-function formatEntry(entry: { kind: string; id: string; name?: string | undefined }): string {
+function buildRows(entries: Array<{ id: string; name?: string | undefined }>) {
+  return entries.map((entry) => ({
+    ID: entry.id,
+    Name: entry.name?.trim() ?? "",
+  }));
+}
+
+function formatEntry(entry: ChannelDirectoryEntry): string {
  const name = entry.name?.trim();
-  return name ? `${entry.id}\t${name}` : entry.id;
+  const handle = entry.handle?.trim();
+  const handleLabel = handle ? (handle.startsWith("@") ? handle : `@${handle}`) : null;
+  const label = [name, handleLabel].filter(Boolean).join(" ");
+  if (!label) return entry.id;
+  return `${label} ${theme.muted(`(${entry.id})`)}`;
 }

 export function registerDirectoryCli(program: Command) {
@@ -77,10 +90,21 @@ export function registerDirectoryCli(program: Command) {
          return;
        }
        if (!result) {
-          defaultRuntime.log("not available");
+          defaultRuntime.log(theme.muted("Not available."));
          return;
        }
-        defaultRuntime.log(formatEntry(result));
+        const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+        defaultRuntime.log(`${theme.heading("Self")}`);
+        defaultRuntime.log(
+          renderTable({
+            width: tableWidth,
+            columns: [
+              { key: "ID", header: "ID", minWidth: 16, flex: true },
+              { key: "Name", header: "Name", minWidth: 18, flex: true },
+            ],
+            rows: buildRows([result]),
+          }).trimEnd(),
+        );
      } catch (err) {
        defaultRuntime.error(danger(String(err)));
        defaultRuntime.exit(1);
@@ -111,9 +135,22 @@ export function registerDirectoryCli(program: Command) {
          defaultRuntime.log(JSON.stringify(result, null, 2));
          return;
        }
-        for (const entry of result) {
-          defaultRuntime.log(formatEntry(entry));
+        if (result.length === 0) {
+          defaultRuntime.log(theme.muted("No peers found."));
+          return;
        }
+        const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+        defaultRuntime.log(`${theme.heading("Peers")} ${theme.muted(`(${result.length})`)}`);
+        defaultRuntime.log(
+          renderTable({
+            width: tableWidth,
+            columns: [
+              { key: "ID", header: "ID", minWidth: 16, flex: true },
+              { key: "Name", header: "Name", minWidth: 18, flex: true },
+            ],
+            rows: buildRows(result),
+          }).trimEnd(),
+        );
      } catch (err) {
        defaultRuntime.error(danger(String(err)));
        defaultRuntime.exit(1);
@@ -143,9 +180,22 @@ export function registerDirectoryCli(program: Command) {
          defaultRuntime.log(JSON.stringify(result, null, 2));
          return;
        }
-        for (const entry of result) {
-          defaultRuntime.log(formatEntry(entry));
+        if (result.length === 0) {
+          defaultRuntime.log(theme.muted("No groups found."));
+          return;
        }
+        const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+        defaultRuntime.log(`${theme.heading("Groups")} ${theme.muted(`(${result.length})`)}`);
+        defaultRuntime.log(
+          renderTable({
+            width: tableWidth,
+            columns: [
+              { key: "ID", header: "ID", minWidth: 16, flex: true },
+              { key: "Name", header: "Name", minWidth: 18, flex: true },
+            ],
+            rows: buildRows(result),
+          }).trimEnd(),
+        );
      } catch (err) {
        defaultRuntime.error(danger(String(err)));
        defaultRuntime.exit(1);
--- a/src/cli/dns-cli.test.ts
+++ b/src/cli/dns-cli.test.ts
@@ -7,6 +7,6 @@ describe("dns cli", () => {
    const log = vi.spyOn(console, "log").mockImplementation(() => {});
    const program = buildProgram();
    await program.parseAsync(["dns", "setup"], { from: "user" });
-    expect(log).toHaveBeenCalledWith(expect.stringContaining("Domain:"));
+    expect(log).toHaveBeenCalledWith(expect.stringContaining("clawdbot.internal"));
  });
 });
--- a/src/cli/dns-cli.ts
+++ b/src/cli/dns-cli.ts
@@ -7,7 +7,9 @@ import type { Command } from "commander";
 import { loadConfig } from "../config/config.js";
 import { pickPrimaryTailnetIPv4, pickPrimaryTailnetIPv6 } from "../infra/tailnet.js";
 import { getWideAreaZonePath, WIDE_AREA_DISCOVERY_DOMAIN } from "../infra/widearea-dns.js";
+import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
+import { renderTable } from "../terminal/table.js";
 import { theme } from "../terminal/theme.js";

 type RunOpts = { allowFailure?: boolean; inherit?: boolean };
@@ -112,14 +114,28 @@ export function registerDnsCli(program: Command) {
      const tailnetIPv6 = pickPrimaryTailnetIPv6();
      const zonePath = getWideAreaZonePath();

-      console.log(`Domain: ${WIDE_AREA_DISCOVERY_DOMAIN}`);
-      console.log(`Zone file (gateway-owned): ${zonePath}`);
-      console.log(
-        `Detected tailnet IP: ${tailnetIPv4 ?? "—"}${tailnetIPv6 ? ` (v6 ${tailnetIPv6})` : ""}`,
+      const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+      defaultRuntime.log(theme.heading("DNS setup"));
+      defaultRuntime.log(
+        renderTable({
+          width: tableWidth,
+          columns: [
+            { key: "Key", header: "Key", minWidth: 18 },
+            { key: "Value", header: "Value", minWidth: 24, flex: true },
+          ],
+          rows: [
+            { Key: "Domain", Value: WIDE_AREA_DISCOVERY_DOMAIN },
+            { Key: "Zone file", Value: zonePath },
+            {
+              Key: "Tailnet IP",
+              Value: `${tailnetIPv4 ?? "—"}${tailnetIPv6 ? ` (v6 ${tailnetIPv6})` : ""}`,
+            },
+          ],
+        }).trimEnd(),
      );
-      console.log("");
-      console.log("Recommended ~/.clawdbot/clawdbot.json:");
-      console.log(
+      defaultRuntime.log("");
+      defaultRuntime.log(theme.heading("Recommended ~/.clawdbot/clawdbot.json:"));
+      defaultRuntime.log(
        JSON.stringify(
          {
            gateway: { bind: "auto" },
@@ -129,14 +145,16 @@ export function registerDnsCli(program: Command) {
          2,
        ),
      );
-      console.log("");
-      console.log("Tailscale admin (DNS → Nameservers):");
-      console.log(`- Add nameserver: ${tailnetIPv4 ?? "<this machine's tailnet IPv4>"}`);
-      console.log(`- Restrict to domain (Split DNS): clawdbot.internal`);
+      defaultRuntime.log("");
+      defaultRuntime.log(theme.heading("Tailscale admin (DNS → Nameservers):"));
+      defaultRuntime.log(
+        theme.muted(`- Add nameserver: ${tailnetIPv4 ?? "<this machine's tailnet IPv4>"}`),
+      );
+      defaultRuntime.log(theme.muted("- Restrict to domain (Split DNS): clawdbot.internal"));

      if (!opts.apply) {
-        console.log("");
-        console.log("Run with --apply to install CoreDNS and configure it.");
+        defaultRuntime.log("");
+        defaultRuntime.log(theme.muted("Run with --apply to install CoreDNS and configure it."));
        return;
      }

@@ -205,16 +223,18 @@ export function registerDnsCli(program: Command) {
        fs.writeFileSync(zonePath, zoneLines.join("\n"), "utf-8");
      }

-      console.log("");
-      console.log("Starting CoreDNS (sudo)…");
+      defaultRuntime.log("");
+      defaultRuntime.log(theme.heading("Starting CoreDNS (sudo)…"));
      run("sudo", ["brew", "services", "restart", "coredns"], {
        inherit: true,
      });

      if (cfg.discovery?.wideArea?.enabled !== true) {
-        console.log("");
-        console.log(
-          "Note: enable discovery.wideArea.enabled in ~/.clawdbot/clawdbot.json on the gateway and restart the gateway so it writes the DNS-SD zone.",
+        defaultRuntime.log("");
+        defaultRuntime.log(
+          theme.muted(
+            "Note: enable discovery.wideArea.enabled in ~/.clawdbot/clawdbot.json on the gateway and restart the gateway so it writes the DNS-SD zone.",
+          ),
        );
      }
    });
--- a/src/cli/help-format.ts
+++ b/src/cli/help-format.ts
@@ -0,0 +1,25 @@
+import { theme } from "../terminal/theme.js";
+
+export type HelpExample = readonly [command: string, description: string];
+
+export function formatHelpExample(command: string, description: string): string {
+  return `  ${theme.command(command)}\n    ${theme.muted(description)}`;
+}
+
+export function formatHelpExampleLine(command: string, description: string): string {
+  if (!description) return `  ${theme.command(command)}`;
+  return `  ${theme.command(command)} ${theme.muted(`# ${description}`)}`;
+}
+
+export function formatHelpExamples(examples: readonly HelpExample[], inline = false): string {
+  const formatter = inline ? formatHelpExampleLine : formatHelpExample;
+  return examples.map(([command, description]) => formatter(command, description)).join("\n");
+}
+
+export function formatHelpExampleGroup(
+  label: string,
+  examples: readonly HelpExample[],
+  inline = false,
+) {
+  return `${theme.muted(label)}\n${formatHelpExamples(examples, inline)}`;
+}
--- a/src/cli/hooks-cli.ts
+++ b/src/cli/hooks-cli.ts
@@ -1,7 +1,6 @@
 import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
-import chalk from "chalk";
 import type { Command } from "commander";
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import type { ClawdbotConfig } from "../config/config.js";
@@ -23,6 +22,7 @@ import { recordHookInstall } from "../hooks/installs.js";
 import { buildPluginStatusReport } from "../plugins/status.js";
 import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
+import { renderTable } from "../terminal/table.js";
 import { theme } from "../terminal/theme.js";
 import { formatCliCommand } from "./command-format.js";
 import { resolveUserPath } from "../utils.js";
@@ -66,50 +66,40 @@ function buildHooksReport(config: ClawdbotConfig): HookStatusReport {
  return buildWorkspaceHookStatus(workspaceDir, { config, entries });
 }

-/**
- * Format a single hook for display in the list
- */
-function formatHookLine(hook: HookStatusEntry, verbose = false): string {
+function formatHookStatus(hook: HookStatusEntry): string {
+  if (hook.eligible) return theme.success("✓ ready");
+  if (hook.disabled) return theme.warn("⏸ disabled");
+  return theme.error("✗ missing");
+}
+
+function formatHookName(hook: HookStatusEntry): string {
  const emoji = hook.emoji ?? "🔗";
-  const status = hook.eligible
-    ? chalk.green("✓")
-    : hook.disabled
-      ? chalk.yellow("disabled")
-      : chalk.red("missing reqs");
+  return `${emoji} ${theme.command(hook.name)}`;
+}

-  const name = hook.eligible ? chalk.white(hook.name) : chalk.gray(hook.name);
+function formatHookSource(hook: HookStatusEntry): string {
+  if (!hook.managedByPlugin) return hook.source;
+  return `plugin:${hook.pluginId ?? "unknown"}`;
+}

-  const desc = chalk.gray(
-    hook.description.length > 50 ? `${hook.description.slice(0, 47)}...` : hook.description,
-  );
-  const sourceLabel = hook.managedByPlugin
-    ? chalk.magenta(`plugin:${hook.pluginId ?? "unknown"}`)
-    : "";
-
-  if (verbose) {
-    const missing: string[] = [];
-    if (hook.missing.bins.length > 0) {
-      missing.push(`bins: ${hook.missing.bins.join(", ")}`);
-    }
-    if (hook.missing.anyBins.length > 0) {
-      missing.push(`anyBins: ${hook.missing.anyBins.join(", ")}`);
-    }
-    if (hook.missing.env.length > 0) {
-      missing.push(`env: ${hook.missing.env.join(", ")}`);
-    }
-    if (hook.missing.config.length > 0) {
-      missing.push(`config: ${hook.missing.config.join(", ")}`);
-    }
-    if (hook.missing.os.length > 0) {
-      missing.push(`os: ${hook.missing.os.join(", ")}`);
-    }
-    const missingStr = missing.length > 0 ? chalk.red(` [${missing.join("; ")}]`) : "";
-    const sourceSuffix = sourceLabel ? ` ${sourceLabel}` : "";
-    return `${emoji} ${name} ${status}${missingStr}\n   ${desc}${sourceSuffix}`;
+function formatHookMissingSummary(hook: HookStatusEntry): string {
+  const missing: string[] = [];
+  if (hook.missing.bins.length > 0) {
+    missing.push(`bins: ${hook.missing.bins.join(", ")}`);
  }
-
-  const sourceSuffix = sourceLabel ? ` ${sourceLabel}` : "";
-  return `${emoji} ${name} ${status} - ${desc}${sourceSuffix}`;
+  if (hook.missing.anyBins.length > 0) {
+    missing.push(`anyBins: ${hook.missing.anyBins.join(", ")}`);
+  }
+  if (hook.missing.env.length > 0) {
+    missing.push(`env: ${hook.missing.env.join(", ")}`);
+  }
+  if (hook.missing.config.length > 0) {
+    missing.push(`config: ${hook.missing.config.join(", ")}`);
+  }
+  if (hook.missing.os.length > 0) {
+    missing.push(`os: ${hook.missing.os.join(", ")}`);
+  }
+  return missing.join("; ");
 }

 async function readInstalledPackageVersion(dir: string): Promise<string | undefined> {
@@ -157,27 +147,39 @@ export function formatHooksList(report: HookStatusReport, opts: HooksListOptions
  }

  const eligible = hooks.filter((h) => h.eligible);
-  const notEligible = hooks.filter((h) => !h.eligible);
+  const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+  const rows = hooks.map((hook) => {
+    const missing = formatHookMissingSummary(hook);
+    return {
+      Status: formatHookStatus(hook),
+      Hook: formatHookName(hook),
+      Description: theme.muted(hook.description),
+      Source: formatHookSource(hook),
+      Missing: missing ? theme.warn(missing) : "",
+    };
+  });
+
+  const columns = [
+    { key: "Status", header: "Status", minWidth: 10 },
+    { key: "Hook", header: "Hook", minWidth: 18, flex: true },
+    { key: "Description", header: "Description", minWidth: 24, flex: true },
+    { key: "Source", header: "Source", minWidth: 12, flex: true },
+  ];
+  if (opts.verbose) {
+    columns.push({ key: "Missing", header: "Missing", minWidth: 18, flex: true });
+  }

  const lines: string[] = [];
-  lines.push(chalk.bold.cyan("Hooks") + chalk.gray(` (${eligible.length}/${hooks.length} ready)`));
-  lines.push("");
-
-  if (eligible.length > 0) {
-    lines.push(chalk.bold.green("Ready:"));
-    for (const hook of eligible) {
-      lines.push(`  ${formatHookLine(hook, opts.verbose)}`);
-    }
-  }
-
-  if (notEligible.length > 0 && !opts.eligible) {
-    if (eligible.length > 0) lines.push("");
-    lines.push(chalk.bold.yellow("Not ready:"));
-    for (const hook of notEligible) {
-      lines.push(`  ${formatHookLine(hook, opts.verbose)}`);
-    }
-  }
-
+  lines.push(
+    `${theme.heading("Hooks")} ${theme.muted(`(${eligible.length}/${hooks.length} ready)`)}`,
+  );
+  lines.push(
+    renderTable({
+      width: tableWidth,
+      columns,
+      rows,
+    }).trimEnd(),
+  );
  return lines.join("\n");
 }

@@ -205,33 +207,33 @@ export function formatHookInfo(
  const lines: string[] = [];
  const emoji = hook.emoji ?? "🔗";
  const status = hook.eligible
-    ? chalk.green("✓ Ready")
+    ? theme.success("✓ Ready")
    : hook.disabled
-      ? chalk.yellow("⏸ Disabled")
-      : chalk.red("✗ Missing requirements");
+      ? theme.warn("⏸ Disabled")
+      : theme.error("✗ Missing requirements");

-  lines.push(`${emoji} ${chalk.bold.cyan(hook.name)} ${status}`);
+  lines.push(`${emoji} ${theme.heading(hook.name)} ${status}`);
  lines.push("");
-  lines.push(chalk.white(hook.description));
+  lines.push(hook.description);
  lines.push("");

  // Details
-  lines.push(chalk.bold("Details:"));
+  lines.push(theme.heading("Details:"));
  if (hook.managedByPlugin) {
-    lines.push(`  Source: ${hook.source} (${hook.pluginId ?? "unknown"})`);
+    lines.push(`${theme.muted("  Source:")} ${hook.source} (${hook.pluginId ?? "unknown"})`);
  } else {
-    lines.push(`  Source: ${hook.source}`);
+    lines.push(`${theme.muted("  Source:")} ${hook.source}`);
  }
-  lines.push(`  Path: ${chalk.gray(hook.filePath)}`);
-  lines.push(`  Handler: ${chalk.gray(hook.handlerPath)}`);
+  lines.push(`${theme.muted("  Path:")} ${hook.filePath}`);
+  lines.push(`${theme.muted("  Handler:")} ${hook.handlerPath}`);
  if (hook.homepage) {
-    lines.push(`  Homepage: ${chalk.blue(hook.homepage)}`);
+    lines.push(`${theme.muted("  Homepage:")} ${hook.homepage}`);
  }
  if (hook.events.length > 0) {
-    lines.push(`  Events: ${hook.events.join(", ")}`);
+    lines.push(`${theme.muted("  Events:")} ${hook.events.join(", ")}`);
  }
  if (hook.managedByPlugin) {
-    lines.push(`  Managed by plugin; enable/disable via hooks CLI not available.`);
+    lines.push(theme.muted("  Managed by plugin; enable/disable via hooks CLI not available."));
  }

  // Requirements
@@ -244,40 +246,40 @@ export function formatHookInfo(

  if (hasRequirements) {
    lines.push("");
-    lines.push(chalk.bold("Requirements:"));
+    lines.push(theme.heading("Requirements:"));
    if (hook.requirements.bins.length > 0) {
      const binsStatus = hook.requirements.bins.map((bin) => {
        const missing = hook.missing.bins.includes(bin);
-        return missing ? chalk.red(`✗ ${bin}`) : chalk.green(`✓ ${bin}`);
+        return missing ? theme.error(`✗ ${bin}`) : theme.success(`✓ ${bin}`);
      });
-      lines.push(`  Binaries: ${binsStatus.join(", ")}`);
+      lines.push(`${theme.muted("  Binaries:")} ${binsStatus.join(", ")}`);
    }
    if (hook.requirements.anyBins.length > 0) {
      const anyBinsStatus =
        hook.missing.anyBins.length > 0
-          ? chalk.red(`✗ (any of: ${hook.requirements.anyBins.join(", ")})`)
-          : chalk.green(`✓ (any of: ${hook.requirements.anyBins.join(", ")})`);
-      lines.push(`  Any binary: ${anyBinsStatus}`);
+          ? theme.error(`✗ (any of: ${hook.requirements.anyBins.join(", ")})`)
+          : theme.success(`✓ (any of: ${hook.requirements.anyBins.join(", ")})`);
+      lines.push(`${theme.muted("  Any binary:")} ${anyBinsStatus}`);
    }
    if (hook.requirements.env.length > 0) {
      const envStatus = hook.requirements.env.map((env) => {
        const missing = hook.missing.env.includes(env);
-        return missing ? chalk.red(`✗ ${env}`) : chalk.green(`✓ ${env}`);
+        return missing ? theme.error(`✗ ${env}`) : theme.success(`✓ ${env}`);
      });
-      lines.push(`  Environment: ${envStatus.join(", ")}`);
+      lines.push(`${theme.muted("  Environment:")} ${envStatus.join(", ")}`);
    }
    if (hook.requirements.config.length > 0) {
      const configStatus = hook.configChecks.map((check) => {
-        return check.satisfied ? chalk.green(`✓ ${check.path}`) : chalk.red(`✗ ${check.path}`);
+        return check.satisfied ? theme.success(`✓ ${check.path}`) : theme.error(`✗ ${check.path}`);
      });
-      lines.push(`  Config: ${configStatus.join(", ")}`);
+      lines.push(`${theme.muted("  Config:")} ${configStatus.join(", ")}`);
    }
    if (hook.requirements.os.length > 0) {
      const osStatus =
        hook.missing.os.length > 0
-          ? chalk.red(`✗ (${hook.requirements.os.join(", ")})`)
-          : chalk.green(`✓ (${hook.requirements.os.join(", ")})`);
-      lines.push(`  OS: ${osStatus}`);
+          ? theme.error(`✗ (${hook.requirements.os.join(", ")})`)
+          : theme.success(`✓ (${hook.requirements.os.join(", ")})`);
+      lines.push(`${theme.muted("  OS:")} ${osStatus}`);
    }
  }

@@ -313,15 +315,15 @@ export function formatHooksCheck(report: HookStatusReport, opts: HooksCheckOptio
  const notEligible = report.hooks.filter((h) => !h.eligible);

  const lines: string[] = [];
-  lines.push(chalk.bold.cyan("Hooks Status"));
+  lines.push(theme.heading("Hooks Status"));
  lines.push("");
-  lines.push(`Total hooks: ${report.hooks.length}`);
-  lines.push(chalk.green(`Ready: ${eligible.length}`));
-  lines.push(chalk.yellow(`Not ready: ${notEligible.length}`));
+  lines.push(`${theme.muted("Total hooks:")} ${report.hooks.length}`);
+  lines.push(`${theme.success("Ready:")} ${eligible.length}`);
+  lines.push(`${theme.warn("Not ready:")} ${notEligible.length}`);

  if (notEligible.length > 0) {
    lines.push("");
-    lines.push(chalk.bold.yellow("Hooks not ready:"));
+    lines.push(theme.heading("Hooks not ready:"));
    for (const hook of notEligible) {
      const reasons = [];
      if (hook.disabled) reasons.push("disabled");
@@ -374,7 +376,9 @@ export async function enableHook(hookName: string): Promise<void> {
  };

  await writeConfigFile(nextConfig);
-  console.log(`${chalk.green("✓")} Enabled hook: ${hook.emoji ?? "🔗"} ${hookName}`);
+  defaultRuntime.log(
+    `${theme.success("✓")} Enabled hook: ${hook.emoji ?? "🔗"} ${theme.command(hookName)}`,
+  );
 }

 export async function disableHook(hookName: string): Promise<void> {
@@ -408,7 +412,9 @@ export async function disableHook(hookName: string): Promise<void> {
  };

  await writeConfigFile(nextConfig);
-  console.log(`${chalk.yellow("⏸")} Disabled hook: ${hook.emoji ?? "🔗"} ${hookName}`);
+  defaultRuntime.log(
+    `${theme.warn("⏸")} Disabled hook: ${hook.emoji ?? "🔗"} ${theme.command(hookName)}`,
+  );
 }

 export function registerHooksCli(program: Command): void {
@@ -431,9 +437,11 @@ export function registerHooksCli(program: Command): void {
      try {
        const config = loadConfig();
        const report = buildHooksReport(config);
-        console.log(formatHooksList(report, opts));
+        defaultRuntime.log(formatHooksList(report, opts));
      } catch (err) {
-        console.error(chalk.red("Error:"), err instanceof Error ? err.message : String(err));
+        defaultRuntime.error(
+          `${theme.error("Error:")} ${err instanceof Error ? err.message : String(err)}`,
+        );
        process.exit(1);
      }
    });
@@ -446,9 +454,11 @@ export function registerHooksCli(program: Command): void {
      try {
        const config = loadConfig();
        const report = buildHooksReport(config);
-        console.log(formatHookInfo(report, name, opts));
+        defaultRuntime.log(formatHookInfo(report, name, opts));
      } catch (err) {
-        console.error(chalk.red("Error:"), err instanceof Error ? err.message : String(err));
+        defaultRuntime.error(
+          `${theme.error("Error:")} ${err instanceof Error ? err.message : String(err)}`,
+        );
        process.exit(1);
      }
    });
@@ -461,9 +471,11 @@ export function registerHooksCli(program: Command): void {
      try {
        const config = loadConfig();
        const report = buildHooksReport(config);
-        console.log(formatHooksCheck(report, opts));
+        defaultRuntime.log(formatHooksCheck(report, opts));
      } catch (err) {
-        console.error(chalk.red("Error:"), err instanceof Error ? err.message : String(err));
+        defaultRuntime.error(
+          `${theme.error("Error:")} ${err instanceof Error ? err.message : String(err)}`,
+        );
        process.exit(1);
      }
    });
@@ -475,7 +487,9 @@ export function registerHooksCli(program: Command): void {
      try {
        await enableHook(name);
      } catch (err) {
-        console.error(chalk.red("Error:"), err instanceof Error ? err.message : String(err));
+        defaultRuntime.error(
+          `${theme.error("Error:")} ${err instanceof Error ? err.message : String(err)}`,
+        );
        process.exit(1);
      }
    });
@@ -487,7 +501,9 @@ export function registerHooksCli(program: Command): void {
      try {
        await disableHook(name);
      } catch (err) {
-        console.error(chalk.red("Error:"), err instanceof Error ? err.message : String(err));
+        defaultRuntime.error(
+          `${theme.error("Error:")} ${err instanceof Error ? err.message : String(err)}`,
+        );
        process.exit(1);
      }
    });
@@ -570,7 +586,7 @@ export function registerHooksCli(program: Command): void {
          path: resolved,
          logger: {
            info: (msg) => defaultRuntime.log(msg),
-            warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
+            warn: (msg) => defaultRuntime.log(theme.warn(msg)),
          },
        });
        if (!result.ok) {
@@ -650,7 +666,7 @@ export function registerHooksCli(program: Command): void {
        spec: raw,
        logger: {
          info: (msg) => defaultRuntime.log(msg),
-          warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
+          warn: (msg) => defaultRuntime.log(theme.warn(msg)),
        },
      });
      if (!result.ok) {
@@ -726,15 +742,15 @@ export function registerHooksCli(program: Command): void {
      for (const hookId of targets) {
        const record = installs[hookId];
        if (!record) {
-          defaultRuntime.log(chalk.yellow(`No install record for "${hookId}".`));
+          defaultRuntime.log(theme.warn(`No install record for "${hookId}".`));
          continue;
        }
        if (record.source !== "npm") {
-          defaultRuntime.log(chalk.yellow(`Skipping "${hookId}" (source: ${record.source}).`));
+          defaultRuntime.log(theme.warn(`Skipping "${hookId}" (source: ${record.source}).`));
          continue;
        }
        if (!record.spec) {
-          defaultRuntime.log(chalk.yellow(`Skipping "${hookId}" (missing npm spec).`));
+          defaultRuntime.log(theme.warn(`Skipping "${hookId}" (missing npm spec).`));
          continue;
        }

@@ -749,11 +765,11 @@ export function registerHooksCli(program: Command): void {
            expectedHookPackId: hookId,
            logger: {
              info: (msg) => defaultRuntime.log(msg),
-              warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
+              warn: (msg) => defaultRuntime.log(theme.warn(msg)),
            },
          });
          if (!probe.ok) {
-            defaultRuntime.log(chalk.red(`Failed to check ${hookId}: ${probe.error}`));
+            defaultRuntime.log(theme.error(`Failed to check ${hookId}: ${probe.error}`));
            continue;
          }

@@ -773,11 +789,11 @@ export function registerHooksCli(program: Command): void {
          expectedHookPackId: hookId,
          logger: {
            info: (msg) => defaultRuntime.log(msg),
-            warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
+            warn: (msg) => defaultRuntime.log(theme.warn(msg)),
          },
        });
        if (!result.ok) {
-          defaultRuntime.log(chalk.red(`Failed to update ${hookId}: ${result.error}`));
+          defaultRuntime.log(theme.error(`Failed to update ${hookId}: ${result.error}`));
          continue;
        }

@@ -811,9 +827,11 @@ export function registerHooksCli(program: Command): void {
    try {
      const config = loadConfig();
      const report = buildHooksReport(config);
-      console.log(formatHooksList(report, {}));
+      defaultRuntime.log(formatHooksList(report, {}));
    } catch (err) {
-      console.error(chalk.red("Error:"), err instanceof Error ? err.message : String(err));
+      defaultRuntime.error(
+        `${theme.error("Error:")} ${err instanceof Error ? err.message : String(err)}`,
+      );
      process.exit(1);
    }
  });
--- a/src/cli/nodes-cli/register.status.ts
+++ b/src/cli/nodes-cli/register.status.ts
@@ -5,6 +5,7 @@ import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
 import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
 import type { NodesRpcOpts } from "./types.js";
 import { renderTable } from "../../terminal/table.js";
+import { parseDurationMs } from "../parse-duration.js";

 function formatVersionLabel(raw: string) {
  const trimmed = raw.trim();
@@ -43,30 +44,84 @@ function formatNodeVersions(node: {
  return parts.length > 0 ? parts.join(" · ") : null;
 }

+function parseSinceMs(raw: unknown, label: string): number | undefined {
+  if (raw === undefined || raw === null) return undefined;
+  if (typeof raw !== "string" && typeof raw !== "number" && typeof raw !== "bigint") {
+    defaultRuntime.error(`${label}: invalid duration`);
+    defaultRuntime.exit(1);
+    return undefined;
+  }
+  const value = String(raw).trim();
+  if (!value) return undefined;
+  try {
+    return parseDurationMs(value);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    defaultRuntime.error(`${label}: ${message}`);
+    defaultRuntime.exit(1);
+    return undefined;
+  }
+}
+
 export function registerNodesStatusCommands(nodes: Command) {
  nodesCallOpts(
    nodes
      .command("status")
      .description("List known nodes with connection status and capabilities")
+      .option("--connected", "Only show connected nodes")
+      .option("--last-connected <duration>", "Only show nodes connected within duration (e.g. 24h)")
      .action(async (opts: NodesRpcOpts) => {
        await runNodesCommand("status", async () => {
+          const connectedOnly = Boolean(opts.connected);
+          const sinceMs = parseSinceMs(opts.lastConnected, "Invalid --last-connected");
          const result = (await callGatewayCli("node.list", opts, {})) as unknown;
-          if (opts.json) {
-            defaultRuntime.log(JSON.stringify(result, null, 2));
-            return;
-          }
+          const obj =
+            typeof result === "object" && result !== null
+              ? (result as Record<string, unknown>)
+              : {};
          const { ok, warn, muted } = getNodesTheme();
          const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
          const now = Date.now();
          const nodes = parseNodeList(result);
-          const pairedCount = nodes.filter((n) => Boolean(n.paired)).length;
-          const connectedCount = nodes.filter((n) => Boolean(n.connected)).length;
-          defaultRuntime.log(
-            `Known: ${nodes.length} · Paired: ${pairedCount} · Connected: ${connectedCount}`,
-          );
-          if (nodes.length === 0) return;
+          const lastConnectedById =
+            sinceMs !== undefined
+              ? new Map(
+                  parsePairingList(await callGatewayCli("node.pair.list", opts, {})).paired.map(
+                    (entry) => [entry.nodeId, entry],
+                  ),
+                )
+              : null;
+          const filtered = nodes.filter((n) => {
+            if (connectedOnly && !n.connected) return false;
+            if (sinceMs !== undefined) {
+              const paired = lastConnectedById?.get(n.nodeId);
+              const lastConnectedAtMs =
+                typeof paired?.lastConnectedAtMs === "number"
+                  ? paired.lastConnectedAtMs
+                  : typeof n.connectedAtMs === "number"
+                    ? n.connectedAtMs
+                    : undefined;
+              if (typeof lastConnectedAtMs !== "number") return false;
+              if (now - lastConnectedAtMs > sinceMs) return false;
+            }
+            return true;
+          });

-          const rows = nodes.map((n) => {
+          if (opts.json) {
+            const ts = typeof obj.ts === "number" ? obj.ts : Date.now();
+            defaultRuntime.log(JSON.stringify({ ...obj, ts, nodes: filtered }, null, 2));
+            return;
+          }
+
+          const pairedCount = filtered.filter((n) => Boolean(n.paired)).length;
+          const connectedCount = filtered.filter((n) => Boolean(n.connected)).length;
+          const filteredLabel = filtered.length !== nodes.length ? ` (of ${nodes.length})` : "";
+          defaultRuntime.log(
+            `Known: ${filtered.length}${filteredLabel} · Paired: ${pairedCount} · Connected: ${connectedCount}`,
+          );
+          if (filtered.length === 0) return;
+
+          const rows = filtered.map((n) => {
            const name = n.displayName?.trim() ? n.displayName.trim() : n.nodeId;
            const perms = formatPermissions(n.permissions);
            const versions = formatNodeVersions(n);
@@ -197,21 +252,60 @@ export function registerNodesStatusCommands(nodes: Command) {
    nodes
      .command("list")
      .description("List pending and paired nodes")
+      .option("--connected", "Only show connected nodes")
+      .option("--last-connected <duration>", "Only show nodes connected within duration (e.g. 24h)")
      .action(async (opts: NodesRpcOpts) => {
        await runNodesCommand("list", async () => {
+          const connectedOnly = Boolean(opts.connected);
+          const sinceMs = parseSinceMs(opts.lastConnected, "Invalid --last-connected");
          const result = (await callGatewayCli("node.pair.list", opts, {})) as unknown;
-          if (opts.json) {
-            defaultRuntime.log(JSON.stringify(result, null, 2));
-            return;
-          }
          const { pending, paired } = parsePairingList(result);
-          defaultRuntime.log(`Pending: ${pending.length} · Paired: ${paired.length}`);
          const { heading, muted, warn } = getNodesTheme();
          const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
          const now = Date.now();
+          const hasFilters = connectedOnly || sinceMs !== undefined;
+          const pendingRows = hasFilters ? [] : pending;
+          const connectedById = hasFilters
+            ? new Map(
+                parseNodeList(await callGatewayCli("node.list", opts, {})).map((node) => [
+                  node.nodeId,
+                  node,
+                ]),
+              )
+            : null;
+          const filteredPaired = paired.filter((node) => {
+            if (connectedOnly) {
+              const live = connectedById?.get(node.nodeId);
+              if (!live?.connected) return false;
+            }
+            if (sinceMs !== undefined) {
+              const live = connectedById?.get(node.nodeId);
+              const lastConnectedAtMs =
+                typeof node.lastConnectedAtMs === "number"
+                  ? node.lastConnectedAtMs
+                  : typeof live?.connectedAtMs === "number"
+                    ? live.connectedAtMs
+                    : undefined;
+              if (typeof lastConnectedAtMs !== "number") return false;
+              if (now - lastConnectedAtMs > sinceMs) return false;
+            }
+            return true;
+          });
+          const filteredLabel =
+            hasFilters && filteredPaired.length !== paired.length ? ` (of ${paired.length})` : "";
+          defaultRuntime.log(
+            `Pending: ${pendingRows.length} · Paired: ${filteredPaired.length}${filteredLabel}`,
+          );

-          if (pending.length > 0) {
-            const pendingRows = pending.map((r) => ({
+          if (opts.json) {
+            defaultRuntime.log(
+              JSON.stringify({ pending: pendingRows, paired: filteredPaired }, null, 2),
+            );
+            return;
+          }
+
+          if (pendingRows.length > 0) {
+            const pendingRowsRendered = pendingRows.map((r) => ({
              Request: r.requestId,
              Node: r.displayName?.trim() ? r.displayName.trim() : r.nodeId,
              IP: r.remoteIp ?? "",
@@ -233,21 +327,30 @@ export function registerNodesStatusCommands(nodes: Command) {
                  { key: "Requested", header: "Requested", minWidth: 12 },
                  { key: "Repair", header: "Repair", minWidth: 6 },
                ],
-                rows: pendingRows,
+                rows: pendingRowsRendered,
              }).trimEnd(),
            );
          }

-          if (paired.length > 0) {
-            const pairedRows = paired.map((n) => ({
-              Node: n.displayName?.trim() ? n.displayName.trim() : n.nodeId,
-              Id: n.nodeId,
-              IP: n.remoteIp ?? "",
-              LastConnect:
+          if (filteredPaired.length > 0) {
+            const pairedRows = filteredPaired.map((n) => {
+              const live = connectedById?.get(n.nodeId);
+              const lastConnectedAtMs =
                typeof n.lastConnectedAtMs === "number"
-                  ? `${formatAge(Math.max(0, now - n.lastConnectedAtMs))} ago`
-                  : muted("unknown"),
-            }));
+                  ? n.lastConnectedAtMs
+                  : typeof live?.connectedAtMs === "number"
+                    ? live.connectedAtMs
+                    : undefined;
+              return {
+                Node: n.displayName?.trim() ? n.displayName.trim() : n.nodeId,
+                Id: n.nodeId,
+                IP: n.remoteIp ?? "",
+                LastConnect:
+                  typeof lastConnectedAtMs === "number"
+                    ? `${formatAge(Math.max(0, now - lastConnectedAtMs))} ago`
+                    : muted("unknown"),
+              };
+            });
            defaultRuntime.log("");
            defaultRuntime.log(heading("Paired"));
            defaultRuntime.log(
--- a/src/cli/nodes-cli/types.ts
+++ b/src/cli/nodes-cli/types.ts
@@ -8,6 +8,8 @@ export type NodesRpcOpts = {
  params?: string;
  invokeTimeout?: string;
  idempotencyKey?: string;
+  connected?: boolean;
+  lastConnected?: string;
  target?: string;
  x?: string;
  y?: string;
--- a/src/cli/pairing-cli.test.ts
+++ b/src/cli/pairing-cli.test.ts
@@ -71,7 +71,9 @@ describe("pairing cli", () => {
    await program.parseAsync(["pairing", "list", "--channel", "telegram"], {
      from: "user",
    });
-    expect(log).toHaveBeenCalledWith(expect.stringContaining("telegramUserId=123"));
+    const output = log.mock.calls.map(([value]) => String(value)).join("\n");
+    expect(output).toContain("telegramUserId");
+    expect(output).toContain("123");
  });

  it("accepts channel as positional for list", async () => {
@@ -131,7 +133,9 @@ describe("pairing cli", () => {
    await program.parseAsync(["pairing", "list", "--channel", "discord"], {
      from: "user",
    });
-    expect(log).toHaveBeenCalledWith(expect.stringContaining("discordUserId=999"));
+    const output = log.mock.calls.map(([value]) => String(value)).join("\n");
+    expect(output).toContain("discordUserId");
+    expect(output).toContain("999");
  });

  it("accepts channel as positional for approve (npm-run compatible)", async () => {
--- a/src/cli/pairing-cli.ts
+++ b/src/cli/pairing-cli.ts
@@ -8,7 +8,9 @@ import {
  listChannelPairingRequests,
  type PairingChannel,
 } from "../pairing/pairing-store.js";
+import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
+import { renderTable } from "../terminal/table.js";
 import { theme } from "../terminal/theme.js";
 import { formatCliCommand } from "./command-format.js";

@@ -70,18 +72,35 @@ export function registerPairingCli(program: Command) {
      const channel = parseChannel(channelRaw, channels);
      const requests = await listChannelPairingRequests(channel);
      if (opts.json) {
-        console.log(JSON.stringify({ channel, requests }, null, 2));
+        defaultRuntime.log(JSON.stringify({ channel, requests }, null, 2));
        return;
      }
      if (requests.length === 0) {
-        console.log(`No pending ${channel} pairing requests.`);
+        defaultRuntime.log(theme.muted(`No pending ${channel} pairing requests.`));
        return;
      }
-      for (const r of requests) {
-        const meta = r.meta ? JSON.stringify(r.meta) : "";
-        const idLabel = resolvePairingIdLabel(channel);
-        console.log(`${r.code}  ${idLabel}=${r.id}${meta ? `  meta=${meta}` : ""}  ${r.createdAt}`);
-      }
+      const idLabel = resolvePairingIdLabel(channel);
+      const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+      defaultRuntime.log(
+        `${theme.heading("Pairing requests")} ${theme.muted(`(${requests.length})`)}`,
+      );
+      defaultRuntime.log(
+        renderTable({
+          width: tableWidth,
+          columns: [
+            { key: "Code", header: "Code", minWidth: 10 },
+            { key: "ID", header: idLabel, minWidth: 12, flex: true },
+            { key: "Meta", header: "Meta", minWidth: 8, flex: true },
+            { key: "Requested", header: "Requested", minWidth: 12 },
+          ],
+          rows: requests.map((r) => ({
+            Code: r.code,
+            ID: r.id,
+            Meta: r.meta ? JSON.stringify(r.meta) : "",
+            Requested: r.createdAt,
+          })),
+        }).trimEnd(),
+      );
    });

  pairing
@@ -113,11 +132,13 @@ export function registerPairingCli(program: Command) {
        throw new Error(`No pending pairing request found for code: ${String(resolvedCode)}`);
      }

-      console.log(`Approved ${channel} sender ${approved.id}.`);
+      defaultRuntime.log(
+        `${theme.success("Approved")} ${theme.muted(channel)} sender ${theme.command(approved.id)}.`,
+      );

      if (!opts.notify) return;
      await notifyApproved(channel, approved.id).catch((err) => {
-        console.log(`Failed to notify requester: ${String(err)}`);
+        defaultRuntime.log(theme.warn(`Failed to notify requester: ${String(err)}`));
      });
    });
 }
--- a/src/cli/plugins-cli.ts
+++ b/src/cli/plugins-cli.ts
@@ -1,6 +1,5 @@
 import fs from "node:fs";
 import path from "node:path";
-import chalk from "chalk";
 import type { Command } from "commander";

 import { loadConfig, writeConfigFile } from "../config/config.js";
@@ -14,6 +13,7 @@ import { buildPluginStatusReport } from "../plugins/status.js";
 import { updateNpmInstalledPlugins } from "../plugins/update.js";
 import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
+import { renderTable } from "../terminal/table.js";
 import { theme } from "../terminal/theme.js";
 import { resolveUserPath } from "../utils.js";

@@ -35,19 +35,19 @@ export type PluginUpdateOptions = {
 function formatPluginLine(plugin: PluginRecord, verbose = false): string {
  const status =
    plugin.status === "loaded"
-      ? chalk.green("✓")
+      ? theme.success("loaded")
      : plugin.status === "disabled"
-        ? chalk.yellow("disabled")
-        : chalk.red("error");
-  const name = plugin.name ? chalk.white(plugin.name) : chalk.white(plugin.id);
-  const idSuffix = plugin.name !== plugin.id ? chalk.gray(` (${plugin.id})`) : "";
+        ? theme.warn("disabled")
+        : theme.error("error");
+  const name = theme.command(plugin.name || plugin.id);
+  const idSuffix = plugin.name && plugin.name !== plugin.id ? theme.muted(` (${plugin.id})`) : "";
  const desc = plugin.description
-    ? chalk.gray(
+    ? theme.muted(
        plugin.description.length > 60
          ? `${plugin.description.slice(0, 57)}...`
          : plugin.description,
      )
-    : chalk.gray("(no description)");
+    : theme.muted("(no description)");

  if (!verbose) {
    return `${name}${idSuffix} ${status} - ${desc}`;
@@ -55,14 +55,14 @@ function formatPluginLine(plugin: PluginRecord, verbose = false): string {

  const parts = [
    `${name}${idSuffix} ${status}`,
-    `  source: ${chalk.gray(plugin.source)}`,
+    `  source: ${theme.muted(plugin.source)}`,
    `  origin: ${plugin.origin}`,
  ];
  if (plugin.version) parts.push(`  version: ${plugin.version}`);
  if (plugin.providerIds.length > 0) {
    parts.push(`  providers: ${plugin.providerIds.join(", ")}`);
  }
-  if (plugin.error) parts.push(chalk.red(`  error: ${plugin.error}`));
+  if (plugin.error) parts.push(theme.error(`  error: ${plugin.error}`));
  return parts.join("\n");
 }

@@ -87,7 +87,7 @@ function applySlotSelectionForPlugin(
 function logSlotWarnings(warnings: string[]) {
  if (warnings.length === 0) return;
  for (const warning of warnings) {
-    defaultRuntime.log(chalk.yellow(warning));
+    defaultRuntime.log(theme.warn(warning));
  }
 }

@@ -124,19 +124,51 @@ export function registerPluginsCli(program: Command) {
      }

      if (list.length === 0) {
-        defaultRuntime.log("No plugins found.");
+        defaultRuntime.log(theme.muted("No plugins found."));
+        return;
+      }
+
+      const loaded = list.filter((p) => p.status === "loaded").length;
+      defaultRuntime.log(
+        `${theme.heading("Plugins")} ${theme.muted(`(${loaded}/${list.length} loaded)`)}`,
+      );
+
+      if (!opts.verbose) {
+        const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+        const rows = list.map((plugin) => ({
+          Name: plugin.name || plugin.id,
+          ID: plugin.name && plugin.name !== plugin.id ? plugin.id : "",
+          Status:
+            plugin.status === "loaded"
+              ? theme.success("loaded")
+              : plugin.status === "disabled"
+                ? theme.warn("disabled")
+                : theme.error("error"),
+          Source: plugin.source,
+          Version: plugin.version ?? "",
+          Description: plugin.description ?? "",
+        }));
+        defaultRuntime.log(
+          renderTable({
+            width: tableWidth,
+            columns: [
+              { key: "Name", header: "Name", minWidth: 14, flex: true },
+              { key: "ID", header: "ID", minWidth: 10, flex: true },
+              { key: "Status", header: "Status", minWidth: 10 },
+              { key: "Source", header: "Source", minWidth: 10 },
+              { key: "Version", header: "Version", minWidth: 8 },
+              { key: "Description", header: "Description", minWidth: 18, flex: true },
+            ],
+            rows,
+          }).trimEnd(),
+        );
        return;
      }

      const lines: string[] = [];
-      const loaded = list.filter((p) => p.status === "loaded").length;
-      lines.push(
-        `${chalk.bold.cyan("Plugins")} ${chalk.gray(`(${loaded}/${list.length} loaded)`)}`,
-      );
-      lines.push("");
      for (const plugin of list) {
-        lines.push(formatPluginLine(plugin, opts.verbose));
-        if (opts.verbose) lines.push("");
+        lines.push(formatPluginLine(plugin, true));
+        lines.push("");
      }
      defaultRuntime.log(lines.join("\n").trim());
    });
@@ -162,43 +194,45 @@ export function registerPluginsCli(program: Command) {
      }

      const lines: string[] = [];
-      lines.push(chalk.bold.cyan(plugin.name || plugin.id));
+      lines.push(theme.heading(plugin.name || plugin.id));
      if (plugin.name && plugin.name !== plugin.id) {
-        lines.push(chalk.gray(`id: ${plugin.id}`));
+        lines.push(theme.muted(`id: ${plugin.id}`));
      }
      if (plugin.description) lines.push(plugin.description);
      lines.push("");
-      lines.push(`Status: ${plugin.status}`);
-      lines.push(`Source: ${plugin.source}`);
-      lines.push(`Origin: ${plugin.origin}`);
-      if (plugin.version) lines.push(`Version: ${plugin.version}`);
+      lines.push(`${theme.muted("Status:")} ${plugin.status}`);
+      lines.push(`${theme.muted("Source:")} ${plugin.source}`);
+      lines.push(`${theme.muted("Origin:")} ${plugin.origin}`);
+      if (plugin.version) lines.push(`${theme.muted("Version:")} ${plugin.version}`);
      if (plugin.toolNames.length > 0) {
-        lines.push(`Tools: ${plugin.toolNames.join(", ")}`);
+        lines.push(`${theme.muted("Tools:")} ${plugin.toolNames.join(", ")}`);
      }
      if (plugin.hookNames.length > 0) {
-        lines.push(`Hooks: ${plugin.hookNames.join(", ")}`);
+        lines.push(`${theme.muted("Hooks:")} ${plugin.hookNames.join(", ")}`);
      }
      if (plugin.gatewayMethods.length > 0) {
-        lines.push(`Gateway methods: ${plugin.gatewayMethods.join(", ")}`);
+        lines.push(`${theme.muted("Gateway methods:")} ${plugin.gatewayMethods.join(", ")}`);
      }
      if (plugin.providerIds.length > 0) {
-        lines.push(`Providers: ${plugin.providerIds.join(", ")}`);
+        lines.push(`${theme.muted("Providers:")} ${plugin.providerIds.join(", ")}`);
      }
      if (plugin.cliCommands.length > 0) {
-        lines.push(`CLI commands: ${plugin.cliCommands.join(", ")}`);
+        lines.push(`${theme.muted("CLI commands:")} ${plugin.cliCommands.join(", ")}`);
      }
      if (plugin.services.length > 0) {
-        lines.push(`Services: ${plugin.services.join(", ")}`);
+        lines.push(`${theme.muted("Services:")} ${plugin.services.join(", ")}`);
      }
-      if (plugin.error) lines.push(chalk.red(`Error: ${plugin.error}`));
+      if (plugin.error) lines.push(`${theme.error("Error:")} ${plugin.error}`);
      if (install) {
        lines.push("");
-        lines.push(`Install: ${install.source}`);
-        if (install.spec) lines.push(`Spec: ${install.spec}`);
-        if (install.sourcePath) lines.push(`Source path: ${install.sourcePath}`);
-        if (install.installPath) lines.push(`Install path: ${install.installPath}`);
-        if (install.version) lines.push(`Recorded version: ${install.version}`);
-        if (install.installedAt) lines.push(`Installed at: ${install.installedAt}`);
+        lines.push(`${theme.muted("Install:")} ${install.source}`);
+        if (install.spec) lines.push(`${theme.muted("Spec:")} ${install.spec}`);
+        if (install.sourcePath) lines.push(`${theme.muted("Source path:")} ${install.sourcePath}`);
+        if (install.installPath)
+          lines.push(`${theme.muted("Install path:")} ${install.installPath}`);
+        if (install.version) lines.push(`${theme.muted("Recorded version:")} ${install.version}`);
+        if (install.installedAt)
+          lines.push(`${theme.muted("Installed at:")} ${install.installedAt}`);
      }
      defaultRuntime.log(lines.join("\n"));
    });
@@ -308,7 +342,7 @@ export function registerPluginsCli(program: Command) {
          path: resolved,
          logger: {
            info: (msg) => defaultRuntime.log(msg),
-            warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
+            warn: (msg) => defaultRuntime.log(theme.warn(msg)),
          },
        });
        if (!result.ok) {
@@ -372,7 +406,7 @@ export function registerPluginsCli(program: Command) {
        spec: raw,
        logger: {
          info: (msg) => defaultRuntime.log(msg),
-          warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
+          warn: (msg) => defaultRuntime.log(theme.warn(msg)),
        },
      });
      if (!result.ok) {
@@ -430,17 +464,17 @@ export function registerPluginsCli(program: Command) {
        dryRun: opts.dryRun,
        logger: {
          info: (msg) => defaultRuntime.log(msg),
-          warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
+          warn: (msg) => defaultRuntime.log(theme.warn(msg)),
        },
      });

      for (const outcome of result.outcomes) {
        if (outcome.status === "error") {
-          defaultRuntime.log(chalk.red(outcome.message));
+          defaultRuntime.log(theme.error(outcome.message));
          continue;
        }
        if (outcome.status === "skipped") {
-          defaultRuntime.log(chalk.yellow(outcome.message));
+          defaultRuntime.log(theme.warn(outcome.message));
          continue;
        }
        defaultRuntime.log(outcome.message);
@@ -467,14 +501,14 @@ export function registerPluginsCli(program: Command) {

      const lines: string[] = [];
      if (errors.length > 0) {
-        lines.push(chalk.bold.red("Plugin errors:"));
+        lines.push(theme.error("Plugin errors:"));
        for (const entry of errors) {
          lines.push(`- ${entry.id}: ${entry.error ?? "failed to load"} (${entry.source})`);
        }
      }
      if (diags.length > 0) {
        if (lines.length > 0) lines.push("");
-        lines.push(chalk.bold.yellow("Diagnostics:"));
+        lines.push(theme.warn("Diagnostics:"));
        for (const diag of diags) {
          const target = diag.pluginId ? `${diag.pluginId}: ` : "";
          lines.push(`- ${target}${diag.message}`);
--- a/src/cli/program.nodes-basic.test.ts
+++ b/src/cli/program.nodes-basic.test.ts
@@ -68,6 +68,83 @@ describe("cli program (nodes basics)", () => {
    expect(runtime.log).toHaveBeenCalledWith("Pending: 0 · Paired: 0");
  });

+  it("runs nodes list --connected and filters to connected nodes", async () => {
+    const now = Date.now();
+    callGateway.mockImplementation(async (opts: { method?: string }) => {
+      if (opts.method === "node.pair.list") {
+        return {
+          pending: [],
+          paired: [
+            {
+              nodeId: "n1",
+              displayName: "One",
+              remoteIp: "10.0.0.1",
+              lastConnectedAtMs: now - 1_000,
+            },
+            {
+              nodeId: "n2",
+              displayName: "Two",
+              remoteIp: "10.0.0.2",
+              lastConnectedAtMs: now - 1_000,
+            },
+          ],
+        };
+      }
+      if (opts.method === "node.list") {
+        return {
+          nodes: [
+            { nodeId: "n1", connected: true },
+            { nodeId: "n2", connected: false },
+          ],
+        };
+      }
+      return { ok: true };
+    });
+    const program = buildProgram();
+    runtime.log.mockClear();
+    await program.parseAsync(["nodes", "list", "--connected"], { from: "user" });
+
+    expect(callGateway).toHaveBeenCalledWith(expect.objectContaining({ method: "node.list" }));
+    const output = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
+    expect(output).toContain("One");
+    expect(output).not.toContain("Two");
+  });
+
+  it("runs nodes status --last-connected and filters by age", async () => {
+    const now = Date.now();
+    callGateway.mockImplementation(async (opts: { method?: string }) => {
+      if (opts.method === "node.list") {
+        return {
+          ts: now,
+          nodes: [
+            { nodeId: "n1", displayName: "One", connected: false },
+            { nodeId: "n2", displayName: "Two", connected: false },
+          ],
+        };
+      }
+      if (opts.method === "node.pair.list") {
+        return {
+          pending: [],
+          paired: [
+            { nodeId: "n1", lastConnectedAtMs: now - 1_000 },
+            { nodeId: "n2", lastConnectedAtMs: now - 2 * 24 * 60 * 60 * 1000 },
+          ],
+        };
+      }
+      return { ok: true };
+    });
+    const program = buildProgram();
+    runtime.log.mockClear();
+    await program.parseAsync(["nodes", "status", "--last-connected", "24h"], {
+      from: "user",
+    });
+
+    expect(callGateway).toHaveBeenCalledWith(expect.objectContaining({ method: "node.pair.list" }));
+    const output = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
+    expect(output).toContain("One");
+    expect(output).not.toContain("Two");
+  });
+
  it("runs nodes status and calls node.list", async () => {
    callGateway.mockResolvedValue({
      ts: Date.now(),
--- a/src/cli/program/command-registry.ts
+++ b/src/cli/program/command-registry.ts
@@ -4,7 +4,6 @@ import { agentsListCommand } from "../../commands/agents.js";
 import { healthCommand } from "../../commands/health.js";
 import { sessionsCommand } from "../../commands/sessions.js";
 import { statusCommand } from "../../commands/status.js";
-import { setVerbose } from "../../globals.js";
 import { defaultRuntime } from "../../runtime.js";
 import { getFlagValue, getPositiveIntFlagValue, getVerboseFlag, hasFlag } from "../argv.js";
 import { registerBrowserCli } from "../browser-cli.js";
@@ -46,7 +45,6 @@ const routeHealth: RouteSpec = {
    const verbose = getVerboseFlag(argv, { includeDebug: true });
    const timeoutMs = getPositiveIntFlagValue(argv, "--timeout");
    if (timeoutMs === null) return false;
-    setVerbose(verbose);
    await healthCommand({ json, timeoutMs, verbose }, defaultRuntime);
    return true;
  },
@@ -63,7 +61,6 @@ const routeStatus: RouteSpec = {
    const verbose = getVerboseFlag(argv, { includeDebug: true });
    const timeoutMs = getPositiveIntFlagValue(argv, "--timeout");
    if (timeoutMs === null) return false;
-    setVerbose(verbose);
    await statusCommand({ json, deep, all, usage, timeoutMs, verbose }, defaultRuntime);
    return true;
  },
@@ -73,12 +70,10 @@ const routeSessions: RouteSpec = {
  match: (path) => path[0] === "sessions",
  run: async (argv) => {
    const json = hasFlag(argv, "--json");
-    const verbose = getVerboseFlag(argv);
    const store = getFlagValue(argv, "--store");
    if (store === null) return false;
    const active = getFlagValue(argv, "--active");
    if (active === null) return false;
-    setVerbose(verbose);
    await sessionsCommand({ json, store, active }, defaultRuntime);
    return true;
  },
--- a/src/cli/program/preaction.ts
+++ b/src/cli/program/preaction.ts
@@ -1,9 +1,10 @@
 import type { Command } from "commander";
 import { defaultRuntime } from "../../runtime.js";
 import { emitCliBanner } from "../banner.js";
-import { getCommandPath, hasHelpOrVersion } from "../argv.js";
+import { getCommandPath, getVerboseFlag, hasHelpOrVersion } from "../argv.js";
 import { ensureConfigReady } from "./config-guard.js";
 import { ensurePluginRegistryLoaded } from "../plugin-registry.js";
+import { setVerbose } from "../../globals.js";

 function setProcessTitleForCommand(actionCommand: Command) {
  let current: Command = actionCommand;
@@ -24,6 +25,11 @@ export function registerPreActionHooks(program: Command, programVersion: string)
    emitCliBanner(programVersion);
    const argv = process.argv;
    if (hasHelpOrVersion(argv)) return;
+    const verbose = getVerboseFlag(argv, { includeDebug: true });
+    setVerbose(verbose);
+    if (!verbose) {
+      process.env.NODE_NO_WARNINGS ??= "1";
+    }
    const commandPath = getCommandPath(argv, 2);
    if (commandPath[0] === "doctor") return;
    await ensureConfigReady({ runtime: defaultRuntime, commandPath });
--- a/src/cli/program/register.agent.ts
+++ b/src/cli/program/register.agent.ts
@@ -12,6 +12,7 @@ import { defaultRuntime } from "../../runtime.js";
 import { formatDocsLink } from "../../terminal/links.js";
 import { theme } from "../../terminal/theme.js";
 import { hasExplicitOptions } from "../command-options.js";
+import { formatHelpExamples } from "../help-format.js";
 import { createDefaultDeps } from "../deps.js";
 import { runCommandWithRuntime } from "../cli-utils.js";
 import { collectOption } from "./helpers.js";
@@ -48,13 +49,24 @@ export function registerAgentCommands(program: Command, args: { agentChannelOpti
      "after",
      () =>
        `
-Examples:
-  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"
+${theme.heading("Examples:")}
+${formatHelpExamples([
+  ['clawdbot agent --to +15555550123 --message "status update"', "Start a new session."],
+  ['clawdbot agent --agent ops --message "Summarize logs"', "Use a specific agent."],
+  [
+    'clawdbot agent --session-id 1234 --message "Summarize inbox" --thinking medium',
+    "Target a session with explicit thinking level.",
+  ],
+  [
+    'clawdbot agent --to +15555550123 --message "Trace logs" --verbose on --json',
+    "Enable verbose logging and JSON output.",
+  ],
+  ['clawdbot agent --to +15555550123 --message "Summon reply" --deliver', "Deliver reply."],
+  [
+    'clawdbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"',
+    "Send reply to a different channel/target.",
+  ],
+])}

 ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent")}`,
    )
@@ -140,10 +152,15 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
      "after",
      () =>
        `
-Examples:
-  clawdbot agents set-identity --agent main --name "Clawd" --emoji "🦞"
-  clawdbot agents set-identity --workspace ~/clawd --from-identity
-  clawdbot agents set-identity --identity-file ~/clawd/IDENTITY.md --agent main
+${theme.heading("Examples:")}
+${formatHelpExamples([
+  ['clawdbot agents set-identity --agent main --name "Clawd" --emoji "🦞"', "Set name + emoji."],
+  ["clawdbot agents set-identity --workspace ~/clawd --from-identity", "Load from IDENTITY.md."],
+  [
+    "clawdbot agents set-identity --identity-file ~/clawd/IDENTITY.md --agent main",
+    "Use a specific IDENTITY.md.",
+  ],
+])}
 `,
    )
    .action(async (opts) => {
--- a/src/cli/program/register.message.ts
+++ b/src/cli/program/register.message.ts
@@ -1,6 +1,7 @@
 import type { Command } from "commander";
 import { formatDocsLink } from "../../terminal/links.js";
 import { theme } from "../../terminal/theme.js";
+import { formatHelpExamples } from "../help-format.js";
 import type { ProgramContext } from "./context.js";
 import { createMessageCliHelpers } from "./message/helpers.js";
 import { registerMessageDiscordAdminCommands } from "./message/register.discord-admin.js";
@@ -28,11 +29,22 @@ export function registerMessageCommands(program: Command, ctx: ProgramContext) {
      "after",
      () =>
        `
-Examples:
-  clawdbot message send --target +15555550123 --message "Hi"
-  clawdbot message send --target +15555550123 --message "Hi" --media photo.jpg
-  clawdbot message poll --channel discord --target channel:123 --poll-question "Snack?" --poll-option Pizza --poll-option Sushi
-  clawdbot message react --channel discord --target 123 --message-id 456 --emoji "✅"
+${theme.heading("Examples:")}
+${formatHelpExamples([
+  ['clawdbot message send --target +15555550123 --message "Hi"', "Send a text message."],
+  [
+    'clawdbot message send --target +15555550123 --message "Hi" --media photo.jpg',
+    "Send a message with media.",
+  ],
+  [
+    'clawdbot message poll --channel discord --target channel:123 --poll-question "Snack?" --poll-option Pizza --poll-option Sushi',
+    "Create a Discord poll.",
+  ],
+  [
+    'clawdbot message react --channel discord --target 123 --message-id 456 --emoji "✅"',
+    "React to a message.",
+  ],
+])}

 ${theme.muted("Docs:")} ${formatDocsLink("/cli/message", "docs.clawd.bot/cli/message")}`,
    )
--- a/src/cli/program/register.status-health-sessions.ts
+++ b/src/cli/program/register.status-health-sessions.ts
@@ -7,6 +7,7 @@ import { defaultRuntime } from "../../runtime.js";
 import { formatDocsLink } from "../../terminal/links.js";
 import { theme } from "../../terminal/theme.js";
 import { runCommandWithRuntime } from "../cli-utils.js";
+import { formatHelpExamples } from "../help-format.js";
 import { parsePositiveIntOrUndefined } from "./helpers.js";

 function resolveVerbose(opts: { verbose?: boolean; debug?: boolean }): boolean {
@@ -36,15 +37,18 @@ export function registerStatusHealthSessionsCommands(program: Command) {
    .option("--debug", "Alias for --verbose", false)
    .addHelpText(
      "after",
-      `
-Examples:
-  clawdbot status                   # show linked account + session store summary
-  clawdbot status --all             # full diagnosis (read-only)
-  clawdbot status --json            # machine-readable output
-  clawdbot status --usage           # show model provider usage/quota snapshots
-  clawdbot status --deep            # run channel probes (WA + Telegram + Discord + Slack + Signal)
-  clawdbot status --deep --timeout 5000 # tighten probe timeout
-  clawdbot channels status          # gateway channel runtime + probes`,
+      () =>
+        `\n${theme.heading("Examples:")}\n${formatHelpExamples([
+          ["clawdbot status", "Show channel health + session summary."],
+          ["clawdbot status --all", "Full diagnosis (read-only)."],
+          ["clawdbot status --json", "Machine-readable output."],
+          ["clawdbot status --usage", "Show model provider usage/quota snapshots."],
+          [
+            "clawdbot status --deep",
+            "Run channel probes (WA + Telegram + Discord + Slack + Signal).",
+          ],
+          ["clawdbot status --deep --timeout 5000", "Tighten probe timeout."],
+        ])}`,
    )
    .addHelpText(
      "after",
@@ -113,14 +117,15 @@ Examples:
    .option("--active <minutes>", "Only show sessions updated within the past N minutes")
    .addHelpText(
      "after",
-      `
-Examples:
-  clawdbot sessions                 # list all sessions
-  clawdbot sessions --active 120    # only last 2 hours
-  clawdbot sessions --json          # machine-readable output
-  clawdbot sessions --store ./tmp/sessions.json
-
-Shows token usage per session when the agent reports it; set agents.defaults.contextTokens to see % of your model window.`,
+      () =>
+        `\n${theme.heading("Examples:")}\n${formatHelpExamples([
+          ["clawdbot sessions", "List all sessions."],
+          ["clawdbot sessions --active 120", "Only last 2 hours."],
+          ["clawdbot sessions --json", "Machine-readable output."],
+          ["clawdbot sessions --store ./tmp/sessions.json", "Use a specific session store."],
+        ])}\n\n${theme.muted(
+          "Shows token usage per session when the agent reports it; set agents.defaults.contextTokens to see % of your model window.",
+        )}`,
    )
    .addHelpText(
      "after",
--- a/src/cli/program/register.subclis.test.ts
+++ b/src/cli/program/register.subclis.test.ts
@@ -21,7 +21,7 @@ const { nodesAction, registerNodesCli } = vi.hoisted(() => {
 vi.mock("../acp-cli.js", () => ({ registerAcpCli }));
 vi.mock("../nodes-cli.js", () => ({ registerNodesCli }));

-const { registerSubCliCommands } = await import("./register.subclis.js");
+const { registerSubCliByName, registerSubCliCommands } = await import("./register.subclis.js");

 describe("registerSubCliCommands", () => {
  const originalArgv = process.argv;
@@ -78,4 +78,20 @@ describe("registerSubCliCommands", () => {
    expect(registerNodesCli).toHaveBeenCalledTimes(1);
    expect(nodesAction).toHaveBeenCalledTimes(1);
  });
+
+  it("replaces placeholder when registering a subcommand by name", async () => {
+    process.argv = ["node", "clawdbot", "acp", "--help"];
+    const program = new Command();
+    program.name("clawdbot");
+    registerSubCliCommands(program, process.argv);
+
+    await registerSubCliByName(program, "acp");
+
+    const names = program.commands.map((cmd) => cmd.name());
+    expect(names.filter((name) => name === "acp")).toHaveLength(1);
+
+    await program.parseAsync(["node", "clawdbot", "acp"], { from: "user" });
+    expect(registerAcpCli).toHaveBeenCalledTimes(1);
+    expect(acpAction).toHaveBeenCalledTimes(1);
+  });
 });
--- a/src/cli/program/register.subclis.ts
+++ b/src/cli/program/register.subclis.ts
@@ -18,10 +18,8 @@ const shouldRegisterPrimaryOnly = (argv: string[]) => {
  return true;
 };

-const shouldEagerRegisterSubcommands = (argv: string[]) => {
-  if (isTruthyEnvValue(process.env.CLAWDBOT_DISABLE_LAZY_SUBCOMMANDS)) return true;
-  if (hasHelpOrVersion(argv)) return true;
-  return false;
+const shouldEagerRegisterSubcommands = (_argv: string[]) => {
+  return isTruthyEnvValue(process.env.CLAWDBOT_DISABLE_LAZY_SUBCOMMANDS);
 };

 const loadConfig = async (): Promise<ClawdbotConfig> => {
@@ -234,6 +232,15 @@ function removeCommand(program: Command, command: Command) {
  }
 }

+export async function registerSubCliByName(program: Command, name: string): Promise<boolean> {
+  const entry = entries.find((candidate) => candidate.name === name);
+  if (!entry) return false;
+  const existing = program.commands.find((cmd) => cmd.name() === entry.name);
+  if (existing) removeCommand(program, existing);
+  await entry.register(program);
+  return true;
+}
+
 function registerLazyCommand(program: Command, entry: SubCliEntry) {
  const placeholder = program.command(entry.name).description(entry.description);
  placeholder.allowUnknownOption(true);
--- a/src/cli/run-main.ts
+++ b/src/cli/run-main.ts
@@ -10,6 +10,7 @@ import { assertSupportedRuntime } from "../infra/runtime-guard.js";
 import { formatUncaughtError } from "../infra/errors.js";
 import { installUnhandledRejectionHandler } from "../infra/unhandled-rejections.js";
 import { enableConsoleCapture } from "../logging.js";
+import { getPrimaryCommand, hasHelpOrVersion } from "./argv.js";
 import { tryRouteCli } from "./route.js";

 export function rewriteUpdateFlagArgv(argv: string[]): string[] {
@@ -47,7 +48,15 @@ export async function runCli(argv: string[] = process.argv) {
    process.exit(1);
  });

-  await program.parseAsync(rewriteUpdateFlagArgv(normalizedArgv));
+  const parseArgv = rewriteUpdateFlagArgv(normalizedArgv);
+  if (hasHelpOrVersion(parseArgv)) {
+    const primary = getPrimaryCommand(parseArgv);
+    if (primary) {
+      const { registerSubCliByName } = await import("./program/register.subclis.js");
+      await registerSubCliByName(program, primary);
+    }
+  }
+  await program.parseAsync(parseArgv);
 }

 function stripWindowsNodeExec(argv: string[]): string[] {
--- a/src/cli/sandbox-cli.ts
+++ b/src/cli/sandbox-cli.ts
@@ -5,6 +5,7 @@ import { sandboxExplainCommand } from "../commands/sandbox-explain.js";
 import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
 import { theme } from "../terminal/theme.js";
+import { formatHelpExamples } from "./help-format.js";

 // --- Types ---

@@ -12,58 +13,34 @@ type CommandOptions = Record<string, unknown>;

 // --- Helpers ---

-const EXAMPLES = {
-  main: `
-Examples:
-  clawdbot sandbox list                     # List all sandbox containers
-  clawdbot sandbox list --browser           # List only browser containers
-  clawdbot sandbox recreate --all           # Recreate all containers
-  clawdbot sandbox recreate --session main  # Recreate specific session
-  clawdbot sandbox recreate --agent mybot   # Recreate agent containers
-  clawdbot sandbox explain                  # Explain effective sandbox config`,
-
-  list: `
-Examples:
-  clawdbot sandbox list              # List all sandbox containers
-  clawdbot sandbox list --browser    # List only browser containers
-  clawdbot sandbox list --json       # JSON output
-
-Output includes:
-  • Container name and status (running/stopped)
-  • Docker image and whether it matches current config
-  • Age (time since creation)
-  • Idle time (time since last use)
-  • Associated session/agent ID`,
-
-  recreate: `
-Examples:
-  clawdbot sandbox recreate --all              # Recreate all containers
-  clawdbot sandbox recreate --session main     # Specific session
-  clawdbot sandbox recreate --agent mybot      # Specific agent (includes sub-agents)
-  clawdbot sandbox recreate --browser --all    # All browser containers only
-  clawdbot sandbox recreate --all --force      # Skip confirmation
-
-Why use this?
-  After updating Docker images or sandbox configuration, existing containers
-  continue running with old settings. This command removes them so they'll be
-  recreated automatically with current config when next needed.
-
-Filter options:
-  --all          Remove all sandbox containers
-  --session      Remove container for specific session key
-  --agent        Remove containers for agent (includes agent:id:* variants)
-  
-Modifiers:
-  --browser      Only affect browser containers (not regular sandbox)
-  --force        Skip confirmation prompt`,
-
-  explain: `
-Examples:
-  clawdbot sandbox explain
-  clawdbot sandbox explain --session agent:main:main
-  clawdbot sandbox explain --agent work
-  clawdbot sandbox explain --json`,
-};
+const SANDBOX_EXAMPLES = {
+  main: [
+    ["clawdbot sandbox list", "List all sandbox containers."],
+    ["clawdbot sandbox list --browser", "List only browser containers."],
+    ["clawdbot sandbox recreate --all", "Recreate all containers."],
+    ["clawdbot sandbox recreate --session main", "Recreate a specific session."],
+    ["clawdbot sandbox recreate --agent mybot", "Recreate agent containers."],
+    ["clawdbot sandbox explain", "Explain effective sandbox config."],
+  ],
+  list: [
+    ["clawdbot sandbox list", "List all sandbox containers."],
+    ["clawdbot sandbox list --browser", "List only browser containers."],
+    ["clawdbot sandbox list --json", "JSON output."],
+  ],
+  recreate: [
+    ["clawdbot sandbox recreate --all", "Recreate all containers."],
+    ["clawdbot sandbox recreate --session main", "Recreate a specific session."],
+    ["clawdbot sandbox recreate --agent mybot", "Recreate a specific agent (includes sub-agents)."],
+    ["clawdbot sandbox recreate --browser --all", "Recreate only browser containers."],
+    ["clawdbot sandbox recreate --all --force", "Skip confirmation."],
+  ],
+  explain: [
+    ["clawdbot sandbox explain", "Show effective sandbox config."],
+    ["clawdbot sandbox explain --session agent:main:main", "Explain a specific session."],
+    ["clawdbot sandbox explain --agent work", "Explain an agent sandbox."],
+    ["clawdbot sandbox explain --json", "JSON output."],
+  ],
+} as const;

 function createRunner(
  commandFn: (opts: CommandOptions, runtime: typeof defaultRuntime) => Promise<void>,
@@ -84,7 +61,10 @@ export function registerSandboxCli(program: Command) {
  const sandbox = program
    .command("sandbox")
    .description("Manage sandbox containers (Docker-based agent isolation)")
-    .addHelpText("after", EXAMPLES.main)
+    .addHelpText(
+      "after",
+      () => `\n${theme.heading("Examples:")}\n${formatHelpExamples(SANDBOX_EXAMPLES.main)}\n`,
+    )
    .addHelpText(
      "after",
      () =>
@@ -101,7 +81,17 @@ export function registerSandboxCli(program: Command) {
    .description("List sandbox containers and their status")
    .option("--json", "Output result as JSON", false)
    .option("--browser", "List browser containers only", false)
-    .addHelpText("after", EXAMPLES.list)
+    .addHelpText(
+      "after",
+      () =>
+        `\n${theme.heading("Examples:")}\n${formatHelpExamples(SANDBOX_EXAMPLES.list)}\n\n${theme.heading(
+          "Output includes:",
+        )}\n${theme.muted("- Container name and status (running/stopped)")}\n${theme.muted(
+          "- Docker image and whether it matches current config",
+        )}\n${theme.muted("- Age (time since creation)")}\n${theme.muted(
+          "- Idle time (time since last use)",
+        )}\n${theme.muted("- Associated session/agent ID")}`,
+    )
    .action(
      createRunner((opts) =>
        sandboxListCommand(
@@ -124,7 +114,25 @@ export function registerSandboxCli(program: Command) {
    .option("--agent <id>", "Recreate containers for specific agent")
    .option("--browser", "Only recreate browser containers", false)
    .option("--force", "Skip confirmation prompt", false)
-    .addHelpText("after", EXAMPLES.recreate)
+    .addHelpText(
+      "after",
+      () =>
+        `\n${theme.heading("Examples:")}\n${formatHelpExamples(SANDBOX_EXAMPLES.recreate)}\n\n${theme.heading(
+          "Why use this?",
+        )}\n${theme.muted(
+          "After updating Docker images or sandbox configuration, existing containers continue running with old settings.",
+        )}\n${theme.muted(
+          "This command removes them so they'll be recreated automatically with current config when next needed.",
+        )}\n\n${theme.heading("Filter options:")}\n${theme.muted(
+          "  --all          Remove all sandbox containers",
+        )}\n${theme.muted(
+          "  --session      Remove container for specific session key",
+        )}\n${theme.muted(
+          "  --agent        Remove containers for agent (includes agent:id:* variants)",
+        )}\n\n${theme.heading("Modifiers:")}\n${theme.muted(
+          "  --browser      Only affect browser containers (not regular sandbox)",
+        )}\n${theme.muted("  --force        Skip confirmation prompt")}`,
+    )
    .action(
      createRunner((opts) =>
        sandboxRecreateCommand(
@@ -148,7 +156,10 @@ export function registerSandboxCli(program: Command) {
    .option("--session <key>", "Session key to inspect (defaults to agent main)")
    .option("--agent <id>", "Agent id to inspect (defaults to derived agent)")
    .option("--json", "Output result as JSON", false)
-    .addHelpText("after", EXAMPLES.explain)
+    .addHelpText(
+      "after",
+      () => `\n${theme.heading("Examples:")}\n${formatHelpExamples(SANDBOX_EXAMPLES.explain)}\n`,
+    )
    .action(
      createRunner((opts) =>
        sandboxExplainCommand(
--- a/src/cli/security-cli.ts
+++ b/src/cli/security-cli.ts
@@ -1,4 +1,3 @@
-import chalk from "chalk";
 import type { Command } from "commander";

 import { loadConfig } from "../config/config.js";
@@ -121,7 +120,7 @@ export function registerSecurityCli(program: Command) {
        lines.push("");
        lines.push(heading(label));
        for (const f of list) {
-          lines.push(`${chalk.gray(f.checkId)} ${f.title}`);
+          lines.push(`${theme.muted(f.checkId)} ${f.title}`);
          lines.push(`  ${f.detail}`);
          if (f.remediation?.trim()) lines.push(`  ${muted(`Fix: ${f.remediation.trim()}`)}`);
        }
--- a/src/cli/service-cli.ts
+++ b/src/cli/service-cli.ts
@@ -1,6 +1,7 @@
 import type { Command } from "commander";
 import { formatDocsLink } from "../terminal/links.js";
 import { theme } from "../terminal/theme.js";
+import { formatHelpExampleGroup } from "./help-format.js";
 import { createDefaultDeps } from "./deps.js";
 import {
  runDaemonInstall,
@@ -20,12 +21,6 @@ import {
 } from "./node-cli/daemon.js";

 export function registerServiceCli(program: Command) {
-  const formatExample = (cmd: string, desc: string) =>
-    `  ${theme.command(cmd)}\n    ${theme.muted(desc)}`;
-
-  const formatGroup = (label: string, examples: Array<[string, string]>) =>
-    `${theme.muted(label)}\n${examples.map(([cmd, desc]) => formatExample(cmd, desc)).join("\n")}`;
-
  const gatewayExamples: Array<[string, string]> = [
    ["clawdbot service gateway status", "Show gateway service status + probe."],
    [
@@ -50,10 +45,12 @@ export function registerServiceCli(program: Command) {
    .addHelpText(
      "after",
      () =>
-        `\n${theme.heading("Examples:")}\n${formatGroup("Gateway:", gatewayExamples)}\n\n${formatGroup(
-          "Node:",
-          nodeExamples,
-        )}\n\n${theme.muted("Docs:")} ${formatDocsLink("/cli/service", "docs.clawd.bot/cli/service")}\n`,
+        `\n${theme.heading("Examples:")}\n${formatHelpExampleGroup(
+          "Gateway:",
+          gatewayExamples,
+        )}\n\n${formatHelpExampleGroup("Node:", nodeExamples)}\n\n${theme.muted(
+          "Docs:",
+        )} ${formatDocsLink("/cli/service", "docs.clawd.bot/cli/service")}\n`,
    );

  const gateway = service.command("gateway").description("Manage the Gateway service");
--- a/src/cli/skills-cli.ts
+++ b/src/cli/skills-cli.ts
@@ -1,4 +1,3 @@
-import chalk from "chalk";
 import type { Command } from "commander";
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import {
@@ -9,6 +8,7 @@ import {
 import { loadConfig } from "../config/config.js";
 import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
+import { renderTable } from "../terminal/table.js";
 import { theme } from "../terminal/theme.js";
 import { formatCliCommand } from "./command-format.js";

@@ -31,47 +31,36 @@ function appendClawdHubHint(output: string, json?: boolean): string {
  return `${output}\n\nTip: use \`npx clawdhub\` to search, install, and sync skills.`;
 }

-/**
- * Format a single skill for display in the list
- */
-function formatSkillLine(skill: SkillStatusEntry, verbose = false): string {
+function formatSkillStatus(skill: SkillStatusEntry): string {
+  if (skill.eligible) return theme.success("✓ ready");
+  if (skill.disabled) return theme.warn("⏸ disabled");
+  if (skill.blockedByAllowlist) return theme.warn("🚫 blocked");
+  return theme.error("✗ missing");
+}
+
+function formatSkillName(skill: SkillStatusEntry): string {
  const emoji = skill.emoji ?? "📦";
-  const status = skill.eligible
-    ? chalk.green("✓")
-    : skill.disabled
-      ? chalk.yellow("disabled")
-      : skill.blockedByAllowlist
-        ? chalk.yellow("blocked")
-        : chalk.red("missing reqs");
+  return `${emoji} ${theme.command(skill.name)}`;
+}

-  const name = skill.eligible ? chalk.white(skill.name) : chalk.gray(skill.name);
-
-  const desc = chalk.gray(
-    skill.description.length > 50 ? `${skill.description.slice(0, 47)}...` : skill.description,
-  );
-
-  if (verbose) {
-    const missing: string[] = [];
-    if (skill.missing.bins.length > 0) {
-      missing.push(`bins: ${skill.missing.bins.join(", ")}`);
-    }
-    if (skill.missing.anyBins.length > 0) {
-      missing.push(`anyBins: ${skill.missing.anyBins.join(", ")}`);
-    }
-    if (skill.missing.env.length > 0) {
-      missing.push(`env: ${skill.missing.env.join(", ")}`);
-    }
-    if (skill.missing.config.length > 0) {
-      missing.push(`config: ${skill.missing.config.join(", ")}`);
-    }
-    if (skill.missing.os.length > 0) {
-      missing.push(`os: ${skill.missing.os.join(", ")}`);
-    }
-    const missingStr = missing.length > 0 ? chalk.red(` [${missing.join("; ")}]`) : "";
-    return `${emoji} ${name} ${status}${missingStr}\n   ${desc}`;
+function formatSkillMissingSummary(skill: SkillStatusEntry): string {
+  const missing: string[] = [];
+  if (skill.missing.bins.length > 0) {
+    missing.push(`bins: ${skill.missing.bins.join(", ")}`);
  }
-
-  return `${emoji} ${name} ${status} - ${desc}`;
+  if (skill.missing.anyBins.length > 0) {
+    missing.push(`anyBins: ${skill.missing.anyBins.join(", ")}`);
+  }
+  if (skill.missing.env.length > 0) {
+    missing.push(`env: ${skill.missing.env.join(", ")}`);
+  }
+  if (skill.missing.config.length > 0) {
+    missing.push(`config: ${skill.missing.config.join(", ")}`);
+  }
+  if (skill.missing.os.length > 0) {
+    missing.push(`os: ${skill.missing.os.join(", ")}`);
+  }
+  return missing.join("; ");
 }

 /**
@@ -108,28 +97,39 @@ export function formatSkillsList(report: SkillStatusReport, opts: SkillsListOpti
  }

  const eligible = skills.filter((s) => s.eligible);
-  const notEligible = skills.filter((s) => !s.eligible);
+  const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
+  const rows = skills.map((skill) => {
+    const missing = formatSkillMissingSummary(skill);
+    return {
+      Status: formatSkillStatus(skill),
+      Skill: formatSkillName(skill),
+      Description: theme.muted(skill.description),
+      Source: skill.source ?? "",
+      Missing: missing ? theme.warn(missing) : "",
+    };
+  });
+
+  const columns = [
+    { key: "Status", header: "Status", minWidth: 10 },
+    { key: "Skill", header: "Skill", minWidth: 18, flex: true },
+    { key: "Description", header: "Description", minWidth: 24, flex: true },
+    { key: "Source", header: "Source", minWidth: 10 },
+  ];
+  if (opts.verbose) {
+    columns.push({ key: "Missing", header: "Missing", minWidth: 18, flex: true });
+  }

  const lines: string[] = [];
  lines.push(
-    chalk.bold.cyan("Skills") + chalk.gray(` (${eligible.length}/${skills.length} ready)`),
+    `${theme.heading("Skills")} ${theme.muted(`(${eligible.length}/${skills.length} ready)`)}`,
+  );
+  lines.push(
+    renderTable({
+      width: tableWidth,
+      columns,
+      rows,
+    }).trimEnd(),
  );
-  lines.push("");
-
-  if (eligible.length > 0) {
-    lines.push(chalk.bold.green("Ready:"));
-    for (const skill of eligible) {
-      lines.push(`  ${formatSkillLine(skill, opts.verbose)}`);
-    }
-  }
-
-  if (notEligible.length > 0 && !opts.eligible) {
-    if (eligible.length > 0) lines.push("");
-    lines.push(chalk.bold.yellow("Not ready:"));
-    for (const skill of notEligible) {
-      lines.push(`  ${formatSkillLine(skill, opts.verbose)}`);
-    }
-  }

  return appendClawdHubHint(lines.join("\n"), opts.json);
 }
@@ -161,27 +161,27 @@ export function formatSkillInfo(
  const lines: string[] = [];
  const emoji = skill.emoji ?? "📦";
  const status = skill.eligible
-    ? chalk.green("✓ Ready")
+    ? theme.success("✓ Ready")
    : skill.disabled
-      ? chalk.yellow("⏸ Disabled")
+      ? theme.warn("⏸ Disabled")
      : skill.blockedByAllowlist
-        ? chalk.yellow("🚫 Blocked by allowlist")
-        : chalk.red("✗ Missing requirements");
+        ? theme.warn("🚫 Blocked by allowlist")
+        : theme.error("✗ Missing requirements");

-  lines.push(`${emoji} ${chalk.bold.cyan(skill.name)} ${status}`);
+  lines.push(`${emoji} ${theme.heading(skill.name)} ${status}`);
  lines.push("");
-  lines.push(chalk.white(skill.description));
+  lines.push(skill.description);
  lines.push("");

  // Details
-  lines.push(chalk.bold("Details:"));
-  lines.push(`  Source: ${skill.source}`);
-  lines.push(`  Path: ${chalk.gray(skill.filePath)}`);
+  lines.push(theme.heading("Details:"));
+  lines.push(`${theme.muted("  Source:")} ${skill.source}`);
+  lines.push(`${theme.muted("  Path:")} ${skill.filePath}`);
  if (skill.homepage) {
-    lines.push(`  Homepage: ${chalk.blue(skill.homepage)}`);
+    lines.push(`${theme.muted("  Homepage:")} ${skill.homepage}`);
  }
  if (skill.primaryEnv) {
-    lines.push(`  Primary env: ${skill.primaryEnv}`);
+    lines.push(`${theme.muted("  Primary env:")} ${skill.primaryEnv}`);
  }

  // Requirements
@@ -194,51 +194,51 @@ export function formatSkillInfo(

  if (hasRequirements) {
    lines.push("");
-    lines.push(chalk.bold("Requirements:"));
+    lines.push(theme.heading("Requirements:"));
    if (skill.requirements.bins.length > 0) {
      const binsStatus = skill.requirements.bins.map((bin) => {
        const missing = skill.missing.bins.includes(bin);
-        return missing ? chalk.red(`✗ ${bin}`) : chalk.green(`✓ ${bin}`);
+        return missing ? theme.error(`✗ ${bin}`) : theme.success(`✓ ${bin}`);
      });
-      lines.push(`  Binaries: ${binsStatus.join(", ")}`);
+      lines.push(`${theme.muted("  Binaries:")} ${binsStatus.join(", ")}`);
    }
    if (skill.requirements.anyBins.length > 0) {
      const anyBinsMissing = skill.missing.anyBins.length > 0;
      const anyBinsStatus = skill.requirements.anyBins.map((bin) => {
        const missing = anyBinsMissing;
-        return missing ? chalk.red(`✗ ${bin}`) : chalk.green(`✓ ${bin}`);
+        return missing ? theme.error(`✗ ${bin}`) : theme.success(`✓ ${bin}`);
      });
-      lines.push(`  Any binaries: ${anyBinsStatus.join(", ")}`);
+      lines.push(`${theme.muted("  Any binaries:")} ${anyBinsStatus.join(", ")}`);
    }
    if (skill.requirements.env.length > 0) {
      const envStatus = skill.requirements.env.map((env) => {
        const missing = skill.missing.env.includes(env);
-        return missing ? chalk.red(`✗ ${env}`) : chalk.green(`✓ ${env}`);
+        return missing ? theme.error(`✗ ${env}`) : theme.success(`✓ ${env}`);
      });
-      lines.push(`  Environment: ${envStatus.join(", ")}`);
+      lines.push(`${theme.muted("  Environment:")} ${envStatus.join(", ")}`);
    }
    if (skill.requirements.config.length > 0) {
      const configStatus = skill.requirements.config.map((cfg) => {
        const missing = skill.missing.config.includes(cfg);
-        return missing ? chalk.red(`✗ ${cfg}`) : chalk.green(`✓ ${cfg}`);
+        return missing ? theme.error(`✗ ${cfg}`) : theme.success(`✓ ${cfg}`);
      });
-      lines.push(`  Config: ${configStatus.join(", ")}`);
+      lines.push(`${theme.muted("  Config:")} ${configStatus.join(", ")}`);
    }
    if (skill.requirements.os.length > 0) {
      const osStatus = skill.requirements.os.map((osName) => {
        const missing = skill.missing.os.includes(osName);
-        return missing ? chalk.red(`✗ ${osName}`) : chalk.green(`✓ ${osName}`);
+        return missing ? theme.error(`✗ ${osName}`) : theme.success(`✓ ${osName}`);
      });
-      lines.push(`  OS: ${osStatus.join(", ")}`);
+      lines.push(`${theme.muted("  OS:")} ${osStatus.join(", ")}`);
    }
  }

  // Install options
  if (skill.install.length > 0 && !skill.eligible) {
    lines.push("");
-    lines.push(chalk.bold("Install options:"));
+    lines.push(theme.heading("Install options:"));
    for (const inst of skill.install) {
-      lines.push(`  ${chalk.yellow("→")} ${inst.label}`);
+      lines.push(`  ${theme.warn("→")} ${inst.label}`);
    }
  }

@@ -281,17 +281,17 @@ export function formatSkillsCheck(report: SkillStatusReport, opts: SkillsCheckOp
  }

  const lines: string[] = [];
-  lines.push(chalk.bold.cyan("Skills Status Check"));
+  lines.push(theme.heading("Skills Status Check"));
  lines.push("");
-  lines.push(`Total: ${report.skills.length}`);
-  lines.push(`${chalk.green("✓")} Eligible: ${eligible.length}`);
-  lines.push(`${chalk.yellow("⏸")} Disabled: ${disabled.length}`);
-  lines.push(`${chalk.yellow("🚫")} Blocked by allowlist: ${blocked.length}`);
-  lines.push(`${chalk.red("✗")} Missing requirements: ${missingReqs.length}`);
+  lines.push(`${theme.muted("Total:")} ${report.skills.length}`);
+  lines.push(`${theme.success("✓")} ${theme.muted("Eligible:")} ${eligible.length}`);
+  lines.push(`${theme.warn("⏸")} ${theme.muted("Disabled:")} ${disabled.length}`);
+  lines.push(`${theme.warn("🚫")} ${theme.muted("Blocked by allowlist:")} ${blocked.length}`);
+  lines.push(`${theme.error("✗")} ${theme.muted("Missing requirements:")} ${missingReqs.length}`);

  if (eligible.length > 0) {
    lines.push("");
-    lines.push(chalk.bold.green("Ready to use:"));
+    lines.push(theme.heading("Ready to use:"));
    for (const skill of eligible) {
      const emoji = skill.emoji ?? "📦";
      lines.push(`  ${emoji} ${skill.name}`);
@@ -300,7 +300,7 @@ export function formatSkillsCheck(report: SkillStatusReport, opts: SkillsCheckOp

  if (missingReqs.length > 0) {
    lines.push("");
-    lines.push(chalk.bold.red("Missing requirements:"));
+    lines.push(theme.heading("Missing requirements:"));
    for (const skill of missingReqs) {
      const emoji = skill.emoji ?? "📦";
      const missing: string[] = [];
@@ -319,7 +319,7 @@ export function formatSkillsCheck(report: SkillStatusReport, opts: SkillsCheckOp
      if (skill.missing.os.length > 0) {
        missing.push(`os: ${skill.missing.os.join(", ")}`);
      }
-      lines.push(`  ${emoji} ${skill.name} ${chalk.gray(`(${missing.join("; ")})`)}`);
+      lines.push(`  ${emoji} ${skill.name} ${theme.muted(`(${missing.join("; ")})`)}`);
    }
  }

@@ -350,7 +350,7 @@ export function registerSkillsCli(program: Command) {
        const config = loadConfig();
        const workspaceDir = resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config));
        const report = buildWorkspaceSkillStatus(workspaceDir, { config });
-        console.log(formatSkillsList(report, opts));
+        defaultRuntime.log(formatSkillsList(report, opts));
      } catch (err) {
        defaultRuntime.error(String(err));
        defaultRuntime.exit(1);
@@ -367,7 +367,7 @@ export function registerSkillsCli(program: Command) {
        const config = loadConfig();
        const workspaceDir = resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config));
        const report = buildWorkspaceSkillStatus(workspaceDir, { config });
-        console.log(formatSkillInfo(report, name, opts));
+        defaultRuntime.log(formatSkillInfo(report, name, opts));
      } catch (err) {
        defaultRuntime.error(String(err));
        defaultRuntime.exit(1);
@@ -383,7 +383,7 @@ export function registerSkillsCli(program: Command) {
        const config = loadConfig();
        const workspaceDir = resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config));
        const report = buildWorkspaceSkillStatus(workspaceDir, { config });
-        console.log(formatSkillsCheck(report, opts));
+        defaultRuntime.log(formatSkillsCheck(report, opts));
      } catch (err) {
        defaultRuntime.error(String(err));
        defaultRuntime.exit(1);
@@ -396,7 +396,7 @@ export function registerSkillsCli(program: Command) {
      const config = loadConfig();
      const workspaceDir = resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config));
      const report = buildWorkspaceSkillStatus(workspaceDir, { config });
-      console.log(formatSkillsList(report, {}));
+      defaultRuntime.log(formatSkillsList(report, {}));
    } catch (err) {
      defaultRuntime.error(String(err));
      defaultRuntime.exit(1);
--- a/src/cli/update-cli.test.ts
+++ b/src/cli/update-cli.test.ts
@@ -447,6 +447,7 @@ describe("update-cli", () => {
  it("requires confirmation on downgrade when non-interactive", async () => {
    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-update-"));
    try {
+      setTty(false);
      await fs.writeFile(
        path.join(tempDir, "package.json"),
        JSON.stringify({ name: "clawdbot", version: "2.0.0" }),
@@ -483,4 +484,45 @@ describe("update-cli", () => {
      await fs.rm(tempDir, { recursive: true, force: true });
    }
  });
+
+  it("allows downgrade with --yes in non-interactive mode", async () => {
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-update-"));
+    try {
+      setTty(false);
+      await fs.writeFile(
+        path.join(tempDir, "package.json"),
+        JSON.stringify({ name: "clawdbot", version: "2.0.0" }),
+        "utf-8",
+      );
+
+      const { resolveClawdbotPackageRoot } = await import("../infra/clawdbot-root.js");
+      const { resolveNpmChannelTag } = await import("../infra/update-check.js");
+      const { runGatewayUpdate } = await import("../infra/update-runner.js");
+      const { defaultRuntime } = await import("../runtime.js");
+      const { updateCommand } = await import("./update-cli.js");
+
+      vi.mocked(resolveClawdbotPackageRoot).mockResolvedValue(tempDir);
+      vi.mocked(resolveNpmChannelTag).mockResolvedValue({
+        tag: "latest",
+        version: "0.0.1",
+      });
+      vi.mocked(runGatewayUpdate).mockResolvedValue({
+        status: "ok",
+        mode: "npm",
+        steps: [],
+        durationMs: 100,
+      });
+      vi.mocked(defaultRuntime.error).mockClear();
+      vi.mocked(defaultRuntime.exit).mockClear();
+
+      await updateCommand({ yes: true });
+
+      expect(defaultRuntime.error).not.toHaveBeenCalledWith(
+        expect.stringContaining("Downgrade confirmation required."),
+      );
+      expect(runGatewayUpdate).toHaveBeenCalled();
+    } finally {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
 });
--- a/src/cli/update-cli.ts
+++ b/src/cli/update-cli.ts
@@ -32,6 +32,7 @@ import { formatCliCommand } from "./command-format.js";
 import { stylePromptMessage } from "../terminal/prompt-style.js";
 import { theme } from "../terminal/theme.js";
 import { renderTable } from "../terminal/table.js";
+import { formatHelpExamples } from "./help-format.js";
 import {
  formatUpdateAvailableHint,
  formatUpdateOneLiner,
@@ -45,6 +46,7 @@ export type UpdateCommandOptions = {
  channel?: string;
  tag?: string;
  timeout?: string;
+  yes?: boolean;
 };
 export type UpdateStatusOptions = {
  json?: boolean;
@@ -375,6 +377,8 @@ function printResult(result: UpdateRunResult, opts: PrintResultOptions) {
 }

 export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
+  process.noDeprecation = true;
+  process.env.NODE_NO_WARNINGS = "1";
  const timeoutMs = opts.timeout ? Number.parseInt(opts.timeout, 10) * 1000 : undefined;

  if (timeoutMs !== undefined && (Number.isNaN(timeoutMs) || timeoutMs <= 0)) {
@@ -427,7 +431,7 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
    const needsConfirm =
      currentVersion != null && (targetVersion == null || (cmp != null && cmp > 0));

-    if (needsConfirm) {
+    if (needsConfirm && !opts.yes) {
      if (!process.stdin.isTTY || opts.json) {
        defaultRuntime.error(
          [
@@ -667,27 +671,46 @@ export function registerUpdateCli(program: Command) {
    .option("--channel <stable|beta|dev>", "Persist update channel (git + npm)")
    .option("--tag <dist-tag|version>", "Override npm dist-tag or version for this update")
    .option("--timeout <seconds>", "Timeout for each update step in seconds (default: 1200)")
-    .addHelpText(
-      "after",
-      () =>
-        `
-Examples:
-  clawdbot update                   # Update a source checkout (git)
-  clawdbot update --channel beta    # Switch to beta channel (git + npm)
-  clawdbot update --channel dev     # Switch to dev channel (git + npm)
-  clawdbot update --tag beta        # One-off update to a dist-tag or version
-  clawdbot update --restart         # Update and restart the daemon
-  clawdbot update --json            # Output result as JSON
-  clawdbot --update                 # Shorthand for clawdbot update
+    .option("--yes", "Skip confirmation prompts (non-interactive)", false)
+    .addHelpText("after", () => {
+      const examples = [
+        ["clawdbot update", "Update a source checkout (git)"],
+        ["clawdbot update --channel beta", "Switch to beta channel (git + npm)"],
+        ["clawdbot update --channel dev", "Switch to dev channel (git + npm)"],
+        ["clawdbot update --tag beta", "One-off update to a dist-tag or version"],
+        ["clawdbot update --restart", "Update and restart the daemon"],
+        ["clawdbot update --json", "Output result as JSON"],
+        ["clawdbot update --yes", "Non-interactive (accept downgrade prompts)"],
+        ["clawdbot --update", "Shorthand for clawdbot update"],
+      ] as const;
+      const fmtExamples = examples
+        .map(([cmd, desc]) => `  ${theme.command(cmd)} ${theme.muted(`# ${desc}`)}`)
+        .join("\n");
+      return `
+${theme.heading("What this does:")}
+  - Git checkouts: fetches, rebases, installs deps, builds, and runs doctor
+  - npm installs: updates via detected package manager

-Notes:
-  - For git installs: fetches, rebases, installs deps, builds, and runs doctor
+${theme.heading("Switch channels:")}
+  - Use --channel stable|beta|dev to persist the update channel in config
+  - Run clawdbot update status to see the active channel and source
+  - Use --tag <dist-tag|version> for a one-off npm update without persisting
+
+${theme.heading("Non-interactive:")}
+  - Use --yes to accept downgrade prompts
+  - Combine with --channel/--tag/--restart/--json/--timeout as needed
+
+${theme.heading("Examples:")}
+${fmtExamples}
+
+${theme.heading("Notes:")}
+  - Switch channels with --channel stable|beta|dev
  - For global installs: auto-updates via detected package manager when possible (see docs/install/updating.md)
  - Downgrades require confirmation (can break configuration)
  - Skips update if the working directory has uncommitted changes

-${theme.muted("Docs:")} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/update")}`,
-    )
+${theme.muted("Docs:")} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/update")}`;
+    })
    .action(async (opts) => {
      try {
        await updateCommand({
@@ -696,6 +719,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/upda
          channel: opts.channel as string | undefined,
          tag: opts.tag as string | undefined,
          timeout: opts.timeout as string | undefined,
+          yes: Boolean(opts.yes),
        });
      } catch (err) {
        defaultRuntime.error(String(err));
@@ -711,17 +735,15 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/upda
    .addHelpText(
      "after",
      () =>
-        `
-Examples:
-  clawdbot update status
-  clawdbot update status --json
-  clawdbot update status --timeout 10
-
-Notes:
-  - Shows current update channel (stable/beta/dev) and source
-  - Includes git tag/branch/SHA for source checkouts
-
-${theme.muted("Docs:")} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/update")}`,
+        `\n${theme.heading("Examples:")}\n${formatHelpExamples([
+          ["clawdbot update status", "Show channel + version status."],
+          ["clawdbot update status --json", "JSON output."],
+          ["clawdbot update status --timeout 10", "Custom timeout."],
+        ])}\n\n${theme.heading("Notes:")}\n${theme.muted(
+          "- Shows current update channel (stable/beta/dev) and source",
+        )}\n${theme.muted("- Includes git tag/branch/SHA for source checkouts")}\n\n${theme.muted(
+          "Docs:",
+        )} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/update")}`,
    )
    .action(async (opts) => {
      try {
--- a/src/gateway/server-methods/nodes.ts
+++ b/src/gateway/server-methods/nodes.ts
@@ -38,6 +38,24 @@ function isNodeEntry(entry: { role?: string; roles?: string[] }) {
  return false;
 }

+function normalizeNodeInvokeResultParams(params: unknown): unknown {
+  if (!params || typeof params !== "object") return params;
+  const raw = params as Record<string, unknown>;
+  const normalized: Record<string, unknown> = { ...raw };
+  if (normalized.payloadJSON === null) {
+    delete normalized.payloadJSON;
+  } else if (normalized.payloadJSON !== undefined && typeof normalized.payloadJSON !== "string") {
+    if (normalized.payload === undefined) {
+      normalized.payload = normalized.payloadJSON;
+    }
+    delete normalized.payloadJSON;
+  }
+  if (normalized.error === null) {
+    delete normalized.error;
+  }
+  return normalized;
+}
+
 export const nodeHandlers: GatewayRequestHandlers = {
  "node.pair.request": async ({ params, respond, context }) => {
    if (!validateNodePairRequestParams(params)) {
@@ -417,7 +435,8 @@ export const nodeHandlers: GatewayRequestHandlers = {
    });
  },
  "node.invoke.result": async ({ params, respond, context, client }) => {
-    if (!validateNodeInvokeResultParams(params)) {
+    const normalizedParams = normalizeNodeInvokeResultParams(params);
+    if (!validateNodeInvokeResultParams(normalizedParams)) {
      respondInvalidParams({
        respond,
        method: "node.invoke.result",
@@ -425,7 +444,7 @@ export const nodeHandlers: GatewayRequestHandlers = {
      });
      return;
    }
-    const p = params as {
+    const p = normalizedParams as {
      id: string;
      nodeId: string;
      ok: boolean;
--- a/src/gateway/server.nodes.allowlist.test.ts
+++ b/src/gateway/server.nodes.allowlist.test.ts
@@ -172,4 +172,55 @@ describe("gateway node command allowlist", () => {
    ws.close();
    await server.close();
  });
+
+  test("accepts node invoke result with null payloadJSON", async () => {
+    const { server, ws, port } = await startServerWithClient();
+    await connectOk(ws);
+
+    let resolveInvoke: ((payload: { id?: string; nodeId?: string }) => void) | null = null;
+    const invokeReqP = new Promise<{ id?: string; nodeId?: string }>((resolve) => {
+      resolveInvoke = resolve;
+    });
+    const nodeClient = await connectNodeClient({
+      port,
+      commands: ["canvas.snapshot"],
+      instanceId: "node-null-payloadjson",
+      displayName: "node-null-payloadjson",
+      onEvent: (evt) => {
+        if (evt.event === "node.invoke.request") {
+          const payload = evt.payload as { id?: string; nodeId?: string };
+          resolveInvoke?.(payload);
+        }
+      },
+    });
+
+    const listRes = await rpcReq<{ nodes?: Array<{ nodeId: string }> }>(ws, "node.list", {});
+    const nodeId = listRes.payload?.nodes?.[0]?.nodeId ?? "";
+    expect(nodeId).toBeTruthy();
+
+    const invokeResP = rpcReq(ws, "node.invoke", {
+      nodeId,
+      command: "canvas.snapshot",
+      params: { format: "png" },
+      idempotencyKey: "allowlist-null-payloadjson",
+    });
+
+    const payload = await invokeReqP;
+    const requestId = payload?.id ?? "";
+    const nodeIdFromReq = payload?.nodeId ?? "node-null-payloadjson";
+
+    await nodeClient.request("node.invoke.result", {
+      id: requestId,
+      nodeId: nodeIdFromReq,
+      ok: true,
+      payloadJSON: null,
+    });
+
+    const invokeRes = await invokeResP;
+    expect(invokeRes.ok).toBe(true);
+
+    nodeClient.stop();
+    ws.close();
+    await server.close();
+  });
 });
--- a/src/gateway/server/ws-connection/message-handler.ts
+++ b/src/gateway/server/ws-connection/message-handler.ts
@@ -719,13 +719,17 @@ export function attachGatewayWsMessageHandler(params: {
        if (role === "node") {
          const context = buildRequestContext();
          const nodeSession = context.nodeRegistry.register(nextClient, { remoteIp: remoteAddr });
-          void updatePairedNodeMetadata(nodeSession.nodeId, {
-            lastConnectedAtMs: nodeSession.connectedAtMs,
-          }).catch((err) =>
-            logGateway.warn(
-              `failed to record last connect for ${nodeSession.nodeId}: ${formatForLog(err)}`,
-            ),
-          );
+          const instanceIdRaw = connectParams.client.instanceId;
+          const instanceId = typeof instanceIdRaw === "string" ? instanceIdRaw.trim() : "";
+          const nodeIdsForPairing = new Set<string>([nodeSession.nodeId]);
+          if (instanceId) nodeIdsForPairing.add(instanceId);
+          for (const nodeId of nodeIdsForPairing) {
+            void updatePairedNodeMetadata(nodeId, {
+              lastConnectedAtMs: nodeSession.connectedAtMs,
+            }).catch((err) =>
+              logGateway.warn(`failed to record last connect for ${nodeId}: ${formatForLog(err)}`),
+            );
+          }
          recordRemoteNodeInfo({
            nodeId: nodeSession.nodeId,
            displayName: nodeSession.displayName,
--- a/src/node-host/runner.test.ts
+++ b/src/node-host/runner.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, test } from "vitest";
+
+import { buildNodeInvokeResultParams } from "./runner.js";
+
+describe("buildNodeInvokeResultParams", () => {
+  test("omits optional fields when null/undefined", () => {
+    const params = buildNodeInvokeResultParams(
+      { id: "invoke-1", nodeId: "node-1", command: "system.run" },
+      { ok: true, payloadJSON: null, error: null },
+    );
+
+    expect(params).toEqual({ id: "invoke-1", nodeId: "node-1", ok: true });
+    expect("payloadJSON" in params).toBe(false);
+    expect("error" in params).toBe(false);
+  });
+
+  test("includes payloadJSON when provided", () => {
+    const params = buildNodeInvokeResultParams(
+      { id: "invoke-2", nodeId: "node-2", command: "system.run" },
+      { ok: true, payloadJSON: '{"ok":true}' },
+    );
+
+    expect(params.payloadJSON).toBe('{"ok":true}');
+  });
+
+  test("includes payload when provided", () => {
+    const params = buildNodeInvokeResultParams(
+      { id: "invoke-3", nodeId: "node-3", command: "system.run" },
+      { ok: false, payload: { reason: "bad" } },
+    );
+
+    expect(params.payload).toEqual({ reason: "bad" });
+  });
+});
--- a/src/node-host/runner.ts
+++ b/src/node-host/runner.ts
@@ -104,7 +104,8 @@ const OUTPUT_CAP = 200_000;
 const OUTPUT_EVENT_TAIL = 20_000;

 const execHostEnforced = process.env.CLAWDBOT_NODE_EXEC_HOST?.trim().toLowerCase() === "app";
-const execHostFallbackAllowed = process.env.CLAWDBOT_NODE_EXEC_FALLBACK?.trim() === "1";
+const execHostFallbackAllowed =
+  process.env.CLAWDBOT_NODE_EXEC_FALLBACK?.trim().toLowerCase() !== "0";

 const blockedEnvKeys = new Set([
  "PATH",
@@ -559,8 +560,7 @@ async function handleInvoke(
  const skillAllow =
    autoAllowSkills && resolution?.executableName ? bins.has(resolution.executableName) : false;

-  const useMacAppExec =
-    process.platform === "darwin" && (execHostEnforced || !execHostFallbackAllowed);
+  const useMacAppExec = process.platform === "darwin";
  if (useMacAppExec) {
    const approvalDecision =
      params.approvalDecision === "allow-once" || params.approvalDecision === "allow-always"
@@ -579,28 +579,28 @@ async function handleInvoke(
    };
    const response = await runViaMacAppExecHost({ approvals, request: execRequest });
    if (!response) {
-      await sendNodeEvent(
-        client,
-        "exec.denied",
-        buildExecEventPayload({
-          sessionKey,
-          runId,
-          host: "node",
-          command: cmdText,
-          reason: "companion-unavailable",
-        }),
-      );
-      await sendInvokeResult(client, frame, {
-        ok: false,
-        error: {
-          code: "UNAVAILABLE",
-          message: "COMPANION_APP_UNAVAILABLE: macOS app exec host unreachable",
-        },
-      });
-      return;
-    }
-
-    if (!response.ok) {
+      if (execHostEnforced || !execHostFallbackAllowed) {
+        await sendNodeEvent(
+          client,
+          "exec.denied",
+          buildExecEventPayload({
+            sessionKey,
+            runId,
+            host: "node",
+            command: cmdText,
+            reason: "companion-unavailable",
+          }),
+        );
+        await sendInvokeResult(client, frame, {
+          ok: false,
+          error: {
+            code: "UNAVAILABLE",
+            message: "COMPANION_APP_UNAVAILABLE: macOS app exec host unreachable",
+          },
+        });
+        return;
+      }
+    } else if (!response.ok) {
      const reason = response.error.reason ?? "approval-required";
      await sendNodeEvent(
        client,
@@ -618,29 +618,29 @@ async function handleInvoke(
        error: { code: "UNAVAILABLE", message: response.error.message },
      });
      return;
+    } else {
+      const result: ExecHostRunResult = response.payload;
+      const combined = [result.stdout, result.stderr, result.error].filter(Boolean).join("\n");
+      await sendNodeEvent(
+        client,
+        "exec.finished",
+        buildExecEventPayload({
+          sessionKey,
+          runId,
+          host: "node",
+          command: cmdText,
+          exitCode: result.exitCode,
+          timedOut: result.timedOut,
+          success: result.success,
+          output: combined,
+        }),
+      );
+      await sendInvokeResult(client, frame, {
+        ok: true,
+        payloadJSON: JSON.stringify(result),
+      });
+      return;
    }
-
-    const result: ExecHostRunResult = response.payload;
-    const combined = [result.stdout, result.stderr, result.error].filter(Boolean).join("\n");
-    await sendNodeEvent(
-      client,
-      "exec.finished",
-      buildExecEventPayload({
-        sessionKey,
-        runId,
-        host: "node",
-        command: cmdText,
-        exitCode: result.exitCode,
-        timedOut: result.timedOut,
-        success: result.success,
-        output: combined,
-      }),
-    );
-    await sendInvokeResult(client, frame, {
-      ok: true,
-      payloadJSON: JSON.stringify(result),
-    });
-    return;
  }

  if (security === "deny") {
@@ -833,19 +833,52 @@ async function sendInvokeResult(
  },
 ) {
  try {
-    await client.request("node.invoke.result", {
-      id: frame.id,
-      nodeId: frame.nodeId,
-      ok: result.ok,
-      payload: result.payload,
-      payloadJSON: result.payloadJSON ?? null,
-      error: result.error ?? null,
-    });
+    await client.request("node.invoke.result", buildNodeInvokeResultParams(frame, result));
  } catch {
    // ignore: node invoke responses are best-effort
  }
 }

+export function buildNodeInvokeResultParams(
+  frame: NodeInvokeRequestPayload,
+  result: {
+    ok: boolean;
+    payload?: unknown;
+    payloadJSON?: string | null;
+    error?: { code?: string; message?: string } | null;
+  },
+): {
+  id: string;
+  nodeId: string;
+  ok: boolean;
+  payload?: unknown;
+  payloadJSON?: string;
+  error?: { code?: string; message?: string };
+} {
+  const params: {
+    id: string;
+    nodeId: string;
+    ok: boolean;
+    payload?: unknown;
+    payloadJSON?: string;
+    error?: { code?: string; message?: string };
+  } = {
+    id: frame.id,
+    nodeId: frame.nodeId,
+    ok: result.ok,
+  };
+  if (result.payload !== undefined) {
+    params.payload = result.payload;
+  }
+  if (typeof result.payloadJSON === "string") {
+    params.payloadJSON = result.payloadJSON;
+  }
+  if (result.error) {
+    params.error = result.error;
+  }
+  return params;
+}
+
 async function sendNodeEvent(client: GatewayClient, event: string, payload: unknown) {
  try {
    await client.request("node.event", {
--- a/src/process/exec.ts
+++ b/src/process/exec.ts
@@ -1,4 +1,5 @@
 import { execFile, spawn } from "node:child_process";
+import path from "node:path";
 import { promisify } from "node:util";

 import { danger, shouldLogVerbose } from "../globals.js";
@@ -61,12 +62,28 @@ export async function runCommandWithTimeout(
  const { windowsVerbatimArguments } = options;
  const hasInput = input !== undefined;

+  const shouldSuppressNpmFund = (() => {
+    const cmd = path.basename(argv[0] ?? "");
+    if (cmd === "npm" || cmd === "npm.cmd" || cmd === "npm.exe") return true;
+    if (cmd === "node" || cmd === "node.exe") {
+      const script = argv[1] ?? "";
+      return script.includes("npm-cli.js");
+    }
+    return false;
+  })();
+
+  const resolvedEnv = env ? { ...process.env, ...env } : { ...process.env };
+  if (shouldSuppressNpmFund) {
+    if (resolvedEnv.NPM_CONFIG_FUND == null) resolvedEnv.NPM_CONFIG_FUND = "false";
+    if (resolvedEnv.npm_config_fund == null) resolvedEnv.npm_config_fund = "false";
+  }
+
  // Spawn with inherited stdin (TTY) so tools like `pi` stay interactive when needed.
  return await new Promise((resolve, reject) => {
    const child = spawn(argv[0], argv.slice(1), {
      stdio: [hasInput ? "pipe" : "inherit", "pipe", "pipe"],
      cwd,
-      env: env ? { ...process.env, ...env } : process.env,
+      env: resolvedEnv,
      windowsVerbatimArguments,
    });
    let stdout = "";
--- a/src/telegram/bot-handlers.ts
+++ b/src/telegram/bot-handlers.ts
@@ -179,6 +179,8 @@ export const registerTelegramHandlers = ({
    const callback = ctx.callbackQuery;
    if (!callback) return;
    if (shouldSkipUpdate(ctx)) return;
+    // Answer immediately to prevent Telegram from retrying while we process
+    await bot.api.answerCallbackQuery(callback.id).catch(() => {});
    try {
      const data = (callback.data ?? "").trim();
      const callbackMessage = callback.message;
@@ -323,8 +325,6 @@ export const registerTelegramHandlers = ({
      });
    } catch (err) {
      runtime.error?.(danger(`callback handler failed: ${String(err)}`));
-    } finally {
-      await bot.api.answerCallbackQuery(callback.id).catch(() => {});
    }
  });

--- a/src/tui/tui-input-history.test.ts
+++ b/src/tui/tui-input-history.test.ts
@@ -0,0 +1,99 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { createEditorSubmitHandler } from "./tui.js";
+
+describe("createEditorSubmitHandler", () => {
+  it("adds submitted messages to editor history", () => {
+    const editor = {
+      setText: vi.fn(),
+      addToHistory: vi.fn(),
+    };
+
+    const handler = createEditorSubmitHandler({
+      editor,
+      handleCommand: vi.fn(),
+      sendMessage: vi.fn(),
+    });
+
+    handler("hello world");
+
+    expect(editor.setText).toHaveBeenCalledWith("");
+    expect(editor.addToHistory).toHaveBeenCalledWith("hello world");
+  });
+
+  it("trims input before adding to history", () => {
+    const editor = {
+      setText: vi.fn(),
+      addToHistory: vi.fn(),
+    };
+
+    const handler = createEditorSubmitHandler({
+      editor,
+      handleCommand: vi.fn(),
+      sendMessage: vi.fn(),
+    });
+
+    handler("   hi   ");
+
+    expect(editor.addToHistory).toHaveBeenCalledWith("hi");
+  });
+
+  it("does not add empty submissions to history", () => {
+    const editor = {
+      setText: vi.fn(),
+      addToHistory: vi.fn(),
+    };
+
+    const handler = createEditorSubmitHandler({
+      editor,
+      handleCommand: vi.fn(),
+      sendMessage: vi.fn(),
+    });
+
+    handler("   ");
+
+    expect(editor.addToHistory).not.toHaveBeenCalled();
+  });
+
+  it("routes slash commands to handleCommand", () => {
+    const editor = {
+      setText: vi.fn(),
+      addToHistory: vi.fn(),
+    };
+    const handleCommand = vi.fn();
+    const sendMessage = vi.fn();
+
+    const handler = createEditorSubmitHandler({
+      editor,
+      handleCommand,
+      sendMessage,
+    });
+
+    handler("/models");
+
+    expect(editor.addToHistory).toHaveBeenCalledWith("/models");
+    expect(handleCommand).toHaveBeenCalledWith("/models");
+    expect(sendMessage).not.toHaveBeenCalled();
+  });
+
+  it("routes normal messages to sendMessage", () => {
+    const editor = {
+      setText: vi.fn(),
+      addToHistory: vi.fn(),
+    };
+    const handleCommand = vi.fn();
+    const sendMessage = vi.fn();
+
+    const handler = createEditorSubmitHandler({
+      editor,
+      handleCommand,
+      sendMessage,
+    });
+
+    handler("hello");
+
+    expect(editor.addToHistory).toHaveBeenCalledWith("hello");
+    expect(sendMessage).toHaveBeenCalledWith("hello");
+    expect(handleCommand).not.toHaveBeenCalled();
+  });
+});
--- a/src/tui/tui.ts
+++ b/src/tui/tui.ts
@@ -36,6 +36,30 @@ import type {
 export { resolveFinalAssistantText } from "./tui-formatters.js";
 export type { TuiOptions } from "./tui-types.js";

+export function createEditorSubmitHandler(params: {
+  editor: {
+    setText: (value: string) => void;
+    addToHistory: (value: string) => void;
+  };
+  handleCommand: (value: string) => Promise<void> | void;
+  sendMessage: (value: string) => Promise<void> | void;
+}) {
+  return (text: string) => {
+    const value = text.trim();
+    params.editor.setText("");
+    if (!value) return;
+
+    // Enable built-in editor prompt history navigation (up/down).
+    params.editor.addToHistory(value);
+
+    if (value.startsWith("/")) {
+      void params.handleCommand(value);
+      return;
+    }
+    void params.sendMessage(value);
+  };
+}
+
 export async function runTui(opts: TuiOptions) {
  const config = loadConfig();
  const initialSessionInput = (opts.session ?? "").trim();
@@ -473,16 +497,11 @@ export async function runTui(opts: TuiOptions) {
    });

  updateAutocompleteProvider();
-  editor.onSubmit = (text) => {
-    const value = text.trim();
-    editor.setText("");
-    if (!value) return;
-    if (value.startsWith("/")) {
-      void handleCommand(value);
-      return;
-    }
-    void sendMessage(value);
-  };
+  editor.onSubmit = createEditorSubmitHandler({
+    editor,
+    handleCommand,
+    sendMessage,
+  });

  editor.onEscape = () => {
    void abortActive();
Author	SHA1	Message	Date
Peter Steinberger	51a7d41c6b	fix: enforce node invoke timeouts (#1357 ) (thanks @vignesh07)	2026-01-21 05:48:54 +00:00
Vignesh Natarajan	a959e490b3	fix(node): enforce node.invoke timeout in node client Use the timeout provided on node invoke requests to ensure node clients always respond with a result. This prevents gateway-side node.invoke calls from hanging until the gateway timeout when a node command stalls. Tests: - swift test --filter GatewayNodeSessionTests	2026-01-21 05:07:30 +00:00
Peter Steinberger	de0a488985	refactor: unify gateway connectivity state	2026-01-21 05:01:32 +00:00
Peter Steinberger	15f16de651	docs: update nodes list/status flags	2026-01-21 04:52:54 +00:00
Peter Steinberger	fa7df1976d	feat: theme hooks/skills/plugins output	2026-01-21 04:48:34 +00:00
Peter Steinberger	2cd62f94a5	feat: tableize device/directory outputs	2026-01-21 04:48:33 +00:00
Peter Steinberger	a74c19feed	docs: unify cli help examples	2026-01-21 04:48:33 +00:00
Peter Steinberger	1ad4a7194e	fix: allow node exec fallback and defer node approvals	2026-01-21 04:46:50 +00:00
Peter Steinberger	beec504ebd	feat: filter nodes list/status	2026-01-21 04:39:15 +00:00
Peter Steinberger	fe1133e2c5	Merge pull request #1348 from vignesh07/feat/tui-input-history feat(tui): add input history (↑/↓) for submitted messages	2026-01-21 04:37:49 +00:00
Peter Steinberger	6f37f1d8ff	fix: record tui input history (#1348 ) (thanks @vignesh07)	2026-01-21 04:37:22 +00:00
Peter Steinberger	57700f33a9	fix: record node last-connect by instance id	2026-01-21 04:32:53 +00:00
Vignesh Natarajan	2700794228	feat(tui): add input history for submitted messages (WIP) Record submitted inputs in the editor history so up/down arrow can recall previous messages. Adds a small helper to wire submit handling and unit tests for routing/recording behavior. No PR yet (per request).	2026-01-21 04:31:33 +00:00
dependabot[bot]	416894c642	chore(deps): bump tar in the npm_and_yarn group across 1 directory Bumps the npm_and_yarn group with 1 update in the / directory: [tar](https://github.com/isaacs/node-tar). Updates `tar` from 7.5.3 to 7.5.4 - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v7.5.3...v7.5.4) --- updated-dependencies: - dependency-name: tar dependency-version: 7.5.4 dependency-type: direct:production dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>	2026-01-21 04:22:46 +00:00
Peter Steinberger	db88378ae3	fix: normalize node invoke result payloadJSON	2026-01-21 04:17:35 +00:00
Peter Steinberger	e97b4973bb	docs: clarify node host exec flow	2026-01-21 04:14:34 +00:00
Peter Steinberger	832dfb02fe	fix: omit null payloadJSON in node invoke results	2026-01-21 04:13:47 +00:00
Peter Steinberger	15e3a2a395	fix: sanitize node invoke result params	2026-01-21 04:13:47 +00:00
Peter Steinberger	8c472c210f	docs: colorize update help	2026-01-21 04:08:50 +00:00
Peter Steinberger	833bbcd166	fix: show subcommand help on --help	2026-01-21 04:08:50 +00:00
Peter Steinberger	d7440baef6	docs: clarify update help	2026-01-21 04:08:50 +00:00
Peter Steinberger	58b131919f	feat: use tsgo for dev/watch builds	2026-01-21 04:06:09 +00:00
Peter Steinberger	186e86660a	Merge pull request #1350 from Jackten/fix/fallback-authprofile-provider-scope test(auto-reply): regression for authProfileId across provider fallback	2026-01-21 03:53:07 +00:00
Peter Steinberger	18d47b47d2	Merge pull request #1349 from siddhantjain/fix/immediate-callback-answer fix(telegram): answer callback queries immediately to prevent retries	2026-01-21 03:51:50 +00:00
Peter Steinberger	eb1e2c7a3b	fix: suppress node warnings unless verbose	2026-01-21 03:47:50 +00:00
Peter Steinberger	6ea4cb0012	fix: suppress npm fund prompts	2026-01-21 03:47:50 +00:00
Peter Steinberger	184f5a5fc3	fix: suppress update deprecation warnings	2026-01-21 03:47:50 +00:00
Peter Steinberger	4ad359ffcd	feat: add non-interactive update option	2026-01-21 03:47:50 +00:00
Vultr-Clawd Admin	c05a7b5390	test(auto-reply): drop auth profile on provider fallback	2026-01-20 23:07:33 -04:00
Siddhant Jain	020fecef5c	fix(telegram): answer callback queries immediately to prevent retries Telegram retries callback queries if they aren't acknowledged quickly. Previously, answerCallbackQuery was called in a finally block AFTER processing, which could take several seconds for agent responses. This change moves answerCallbackQuery to immediately after basic validation, before any processing begins. This prevents Telegram from sending duplicate callbacks while the agent is thinking. Fixes duplicate callback handling when agent processing is slow.	2026-01-21 03:04:28 +00:00