Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
860dc74639 | ||
|
|
97acca47ac |
No files matched your search
@@ -116,14 +116,6 @@
|
|||||||
- launchd PATH is minimal; ensure the app’s launch agent PATH includes standard system paths plus your pnpm bin (typically `$HOME/Library/pnpm`) so `pnpm`/`clawdbot` binaries resolve when invoked via `clawdbot-mac`.
|
- launchd PATH is minimal; ensure the app’s launch agent PATH includes standard system paths plus your pnpm bin (typically `$HOME/Library/pnpm`) so `pnpm`/`clawdbot` binaries resolve when invoked via `clawdbot-mac`.
|
||||||
- For manual `clawdbot message send` messages that include `!`, use the heredoc pattern noted below to avoid the Bash tool’s escaping.
|
- For manual `clawdbot message send` messages that include `!`, use the heredoc pattern noted below to avoid the Bash tool’s escaping.
|
||||||
|
|
||||||
## NPM + 1Password (publish/verify)
|
|
||||||
- Use the 1password skill; all `op` commands must run inside a fresh tmux session.
|
|
||||||
- Sign in: `eval "$(op signin --account my.1password.com)"` (app unlocked + integration on).
|
|
||||||
- OTP: `op read 'op://Private/Npmjs/one-time password?attribute=otp'`.
|
|
||||||
- Publish: `npm publish --access public --otp="<otp>"` (run from the package dir).
|
|
||||||
- Verify without local npmrc side effects: `npm view <pkg> version --userconfig "$(mktemp)"`.
|
|
||||||
- Kill the tmux session after publish.
|
|
||||||
|
|
||||||
## Exclamation Mark Escaping Workaround
|
## Exclamation Mark Escaping Workaround
|
||||||
The Claude Code Bash tool escapes `!` to `\\!` in command arguments. When using `clawdbot message send` with messages containing exclamation marks, use heredoc syntax:
|
The Claude Code Bash tool escapes `!` to `\\!` in command arguments. When using `clawdbot message send` with messages containing exclamation marks, use heredoc syntax:
|
||||||
|
|
||||||
|
|||||||
+1
-8
@@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
- **BREAKING:** Microsoft Teams is now a plugin; install `@clawdbot/msteams` via `clawdbot plugins install @clawdbot/msteams`.
|
- **BREAKING:** Microsoft Teams is now a plugin; install `@clawdbot/msteams` via `clawdbot plugins install @clawdbot/msteams`.
|
||||||
- CLI: set process titles to `clawdbot-<command>` for clearer process listings.
|
- CLI: set process titles to `clawdbot-<command>` for clearer process listings.
|
||||||
- CLI/macOS: sync remote SSH target/identity to config and let `gateway status` auto-infer SSH targets (ssh-config aware).
|
|
||||||
- Heartbeat: tighten prompt guidance + suppress duplicate alerts for 24h. (#980) — thanks @voidserf.
|
- Heartbeat: tighten prompt guidance + suppress duplicate alerts for 24h. (#980) — thanks @voidserf.
|
||||||
- Sessions/Security: add `session.dmScope` for multi-user DM isolation and audit warnings. (#948) — thanks @Alphonse-arianee.
|
- Sessions/Security: add `session.dmScope` for multi-user DM isolation and audit warnings. (#948) — thanks @Alphonse-arianee.
|
||||||
- Plugins: add provider auth registry + `clawdbot models auth login` for plugin-driven OAuth/API key flows.
|
- Plugins: add provider auth registry + `clawdbot models auth login` for plugin-driven OAuth/API key flows.
|
||||||
@@ -18,10 +17,8 @@
|
|||||||
- Docs: clarify multi-gateway rescue bot guidance. (#969) — thanks @bjesuiter.
|
- Docs: clarify multi-gateway rescue bot guidance. (#969) — thanks @bjesuiter.
|
||||||
- Agents: add Current Date & Time system prompt section with configurable time format (auto/12/24).
|
- Agents: add Current Date & Time system prompt section with configurable time format (auto/12/24).
|
||||||
- Agents: avoid false positives when logging unsupported Google tool schema keywords.
|
- Agents: avoid false positives when logging unsupported Google tool schema keywords.
|
||||||
- Agents: skip Gemini history downgrades for google-antigravity to preserve tool calls. (#894) — thanks @mukhtharcm.
|
|
||||||
- Status: restore usage summary line for current provider when no OAuth profiles exist.
|
- Status: restore usage summary line for current provider when no OAuth profiles exist.
|
||||||
- Tools: normalize Slack/Discord message timestamps with `timestampMs`/`timestampUtc` while keeping raw provider fields.
|
- Tools: normalize Slack/Discord message timestamps with `timestampMs`/`timestampUtc` while keeping raw provider fields.
|
||||||
- macOS: add `system.which` for prompt-free remote skill discovery (with gateway fallback to `system.run`).
|
|
||||||
- Docs: add Date & Time guide and update prompt/timezone configuration docs.
|
- Docs: add Date & Time guide and update prompt/timezone configuration docs.
|
||||||
- Messages: debounce rapid inbound messages across channels with per-connector overrides. (#971) — thanks @juanpablodlc.
|
- Messages: debounce rapid inbound messages across channels with per-connector overrides. (#971) — thanks @juanpablodlc.
|
||||||
- Messages: allow media-only sends (CLI/tool) and show Telegram voice recording status for voice notes. (#957) — thanks @rdev.
|
- Messages: allow media-only sends (CLI/tool) and show Telegram voice recording status for voice notes. (#957) — thanks @rdev.
|
||||||
@@ -29,7 +26,7 @@
|
|||||||
- Fix: guard model fallback against undefined provider/model values. (#954) — thanks @roshanasingh4.
|
- Fix: guard model fallback against undefined provider/model values. (#954) — thanks @roshanasingh4.
|
||||||
- Fix: refactor session store updates, add chat.inject, and harden subagent cleanup flow. (#944) — thanks @tyler6204.
|
- Fix: refactor session store updates, add chat.inject, and harden subagent cleanup flow. (#944) — thanks @tyler6204.
|
||||||
- Fix: clean up suspended CLI processes across backends. (#978) — thanks @Nachx639.
|
- Fix: clean up suspended CLI processes across backends. (#978) — thanks @Nachx639.
|
||||||
- Fix: support MiniMax coding plan usage responses with `model_remains`/`current_interval_*` payloads.
|
- Fix: parse systemd ExecStart arguments when whitespace is present. (#995) — thanks @roshanasingh4.
|
||||||
- CLI: add `--json` output for `clawdbot daemon` lifecycle/install commands.
|
- CLI: add `--json` output for `clawdbot daemon` lifecycle/install commands.
|
||||||
- Memory: make `node-llama-cpp` an optional dependency (avoid Node 25 install failures) and improve local-embeddings fallback/errors.
|
- Memory: make `node-llama-cpp` an optional dependency (avoid Node 25 install failures) and improve local-embeddings fallback/errors.
|
||||||
- Browser: add `snapshot refs=aria` (Playwright aria-ref ids) for self-resolving refs across `snapshot` → `act`.
|
- Browser: add `snapshot refs=aria` (Playwright aria-ref ids) for self-resolving refs across `snapshot` → `act`.
|
||||||
@@ -38,13 +35,10 @@
|
|||||||
- Browser: prefer stable Chrome for auto-detect, with Brave/Edge fallbacks and updated docs. (#983) — thanks @cpojer.
|
- Browser: prefer stable Chrome for auto-detect, with Brave/Edge fallbacks and updated docs. (#983) — thanks @cpojer.
|
||||||
- Browser: fix `tab not found` for extension relay snapshots/actions when Playwright blocks `newCDPSession` (use the single available Page).
|
- Browser: fix `tab not found` for extension relay snapshots/actions when Playwright blocks `newCDPSession` (use the single available Page).
|
||||||
- Telegram: add bidirectional reaction support with configurable notifications and agent guidance. (#964) — thanks @bohdanpodvirnyi.
|
- Telegram: add bidirectional reaction support with configurable notifications and agent guidance. (#964) — thanks @bohdanpodvirnyi.
|
||||||
- Telegram: allow custom commands in the bot menu (merged with native; conflicts ignored). (#860) — thanks @nachoiacovino.
|
|
||||||
- Telegram: skip `message_thread_id=1` for General topic sends while keeping typing indicators. (#848) — thanks @azade-c.
|
- Telegram: skip `message_thread_id=1` for General topic sends while keeping typing indicators. (#848) — thanks @azade-c.
|
||||||
- Discord: allow allowlisted guilds without channel lists to receive messages when `groupPolicy="allowlist"`. — thanks @thewilloftheshadow.
|
- Discord: allow allowlisted guilds without channel lists to receive messages when `groupPolicy="allowlist"`. — thanks @thewilloftheshadow.
|
||||||
- Discord: allow emoji/sticker uploads + channel actions in config defaults. (#870) — thanks @JDIVE.
|
|
||||||
- Fix: sanitize user-facing error text + strip `<final>` tags across reply pipelines. (#975) — thanks @ThomsenDrake.
|
- Fix: sanitize user-facing error text + strip `<final>` tags across reply pipelines. (#975) — thanks @ThomsenDrake.
|
||||||
- Fix: normalize pairing CLI aliases, allow extension channels, and harden Zalo webhook payload parsing. (#991) — thanks @longmaba.
|
- Fix: normalize pairing CLI aliases, allow extension channels, and harden Zalo webhook payload parsing. (#991) — thanks @longmaba.
|
||||||
- Fix: allow local Tailscale Serve hostnames without treating tailnet clients as direct. (#885) — thanks @oswalpalash.
|
|
||||||
|
|
||||||
## 2026.1.14-1
|
## 2026.1.14-1
|
||||||
|
|
||||||
@@ -146,7 +140,6 @@
|
|||||||
### Fixes
|
### Fixes
|
||||||
- Packaging: include `dist/memory/**` in the npm tarball (fixes `ERR_MODULE_NOT_FOUND` for `dist/memory/index.js`).
|
- Packaging: include `dist/memory/**` in the npm tarball (fixes `ERR_MODULE_NOT_FOUND` for `dist/memory/index.js`).
|
||||||
- Agents: persist sub-agent registry across gateway restarts and resume announce flow safely. (#831) — thanks @roshanasingh4.
|
- Agents: persist sub-agent registry across gateway restarts and resume announce flow safely. (#831) — thanks @roshanasingh4.
|
||||||
- Agents: strip invalid Gemini thought signatures from OpenRouter history to avoid 400s. (#841, #845) — thanks @MatthieuBizien.
|
|
||||||
|
|
||||||
## 2026.1.12-1
|
## 2026.1.12-1
|
||||||
|
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ dependencies {
|
|||||||
testImplementation("io.kotest:kotest-runner-junit5-jvm:6.0.7")
|
testImplementation("io.kotest:kotest-runner-junit5-jvm:6.0.7")
|
||||||
testImplementation("io.kotest:kotest-assertions-core-jvm:6.0.7")
|
testImplementation("io.kotest:kotest-assertions-core-jvm:6.0.7")
|
||||||
testImplementation("org.robolectric:robolectric:4.16")
|
testImplementation("org.robolectric:robolectric:4.16")
|
||||||
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:6.0.2")
|
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:6.0.1")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<Test>().configureEach {
|
tasks.withType<Test>().configureEach {
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ class BridgeSession(
|
|||||||
connectWithSocket(endpoint, hello, null)
|
connectWithSocket(endpoint, hello, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun connectWithSocket(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) {
|
private fun connectWithSocket(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) {
|
||||||
val socket =
|
val socket =
|
||||||
createBridgeSocket(tls) { fingerprint ->
|
createBridgeSocket(tls) { fingerprint ->
|
||||||
onTlsFingerprint?.invoke(tls?.stableId ?: endpoint.stableId, fingerprint)
|
onTlsFingerprint?.invoke(tls?.stableId ?: endpoint.stableId, fingerprint)
|
||||||
@@ -260,15 +260,15 @@ class BridgeSession(
|
|||||||
else -> throw IllegalStateException("unexpected bridge response")
|
else -> throw IllegalStateException("unexpected bridge response")
|
||||||
}
|
}
|
||||||
|
|
||||||
while (scope.isActive) {
|
while (scope.isActive) {
|
||||||
val line = reader.readLine() ?: break
|
val line = reader.readLine() ?: break
|
||||||
val frame = json.parseToJsonElement(line).asObjectOrNull() ?: continue
|
val frame = json.parseToJsonElement(line).asObjectOrNull() ?: continue
|
||||||
when (frame["type"].asStringOrNull()) {
|
when (frame["type"].asStringOrNull()) {
|
||||||
"event" -> {
|
"event" -> {
|
||||||
val event = frame["event"].asStringOrNull() ?: continue
|
val event = frame["event"].asStringOrNull() ?: return@withContext
|
||||||
val payload = frame["payloadJSON"].asStringOrNull()
|
val payload = frame["payloadJSON"].asStringOrNull()
|
||||||
onEvent(event, payload)
|
onEvent(event, payload)
|
||||||
}
|
}
|
||||||
"ping" -> {
|
"ping" -> {
|
||||||
val id = frame["id"].asStringOrNull() ?: ""
|
val id = frame["id"].asStringOrNull() ?: ""
|
||||||
conn.sendJson(buildJsonObject { put("type", JsonPrimitive("pong")); put("id", JsonPrimitive(id)) })
|
conn.sendJson(buildJsonObject { put("type", JsonPrimitive("pong")); put("id", JsonPrimitive(id)) })
|
||||||
@@ -314,20 +314,20 @@ class BridgeSession(
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
"invoke-res" -> {
|
"invoke-res" -> {
|
||||||
// gateway->node only (ignore)
|
// gateway->node only (ignore)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
currentConnection = null
|
||||||
|
for ((_, waiter) in pending) {
|
||||||
|
waiter.cancel()
|
||||||
|
}
|
||||||
|
pending.clear()
|
||||||
|
conn.closeQuietly()
|
||||||
}
|
}
|
||||||
} finally {
|
|
||||||
currentConnection = null
|
|
||||||
for ((_, waiter) in pending) {
|
|
||||||
waiter.cancel()
|
|
||||||
}
|
|
||||||
pending.clear()
|
|
||||||
conn.closeQuietly()
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private fun buildHelloJson(hello: Hello): JsonObject =
|
private fun buildHelloJson(hello: Hello): JsonObject =
|
||||||
buildJsonObject {
|
buildJsonObject {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.clawdbot.android.bridge
|
package com.clawdbot.android.bridge
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import java.net.Socket
|
import java.net.Socket
|
||||||
import java.security.MessageDigest
|
import java.security.MessageDigest
|
||||||
import java.security.SecureRandom
|
import java.security.SecureRandom
|
||||||
@@ -22,7 +21,6 @@ fun createBridgeSocket(params: BridgeTlsParams?, onStore: ((String) -> Unit)? =
|
|||||||
if (params == null) return Socket()
|
if (params == null) return Socket()
|
||||||
val expected = params.expectedFingerprint?.let(::normalizeFingerprint)
|
val expected = params.expectedFingerprint?.let(::normalizeFingerprint)
|
||||||
val defaultTrust = defaultTrustManager()
|
val defaultTrust = defaultTrustManager()
|
||||||
@SuppressLint("CustomX509TrustManager")
|
|
||||||
val trustManager =
|
val trustManager =
|
||||||
object : X509TrustManager {
|
object : X509TrustManager {
|
||||||
override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
|
override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
|
||||||
|
|||||||
@@ -32,10 +32,11 @@ func makeBridgeTLSOptions(_ params: BridgeTLSParams?) -> NWProtocolTLS.Options?
|
|||||||
sec_protocol_options_set_verify_block(
|
sec_protocol_options_set_verify_block(
|
||||||
options.securityProtocolOptions,
|
options.securityProtocolOptions,
|
||||||
{ _, trust, complete in
|
{ _, trust, complete in
|
||||||
let trustRef = sec_trust_copy_ref(trust).takeRetainedValue()
|
guard let trust else {
|
||||||
if let chain = SecTrustCopyCertificateChain(trustRef) as? [SecCertificate],
|
complete(false)
|
||||||
let cert = chain.first
|
return
|
||||||
{
|
}
|
||||||
|
if let cert = SecTrustGetCertificateAtIndex(trust, 0) {
|
||||||
let data = SecCertificateCopyData(cert) as Data
|
let data = SecCertificateCopyData(cert) as Data
|
||||||
let fingerprint = sha256Hex(data)
|
let fingerprint = sha256Hex(data)
|
||||||
if let expected {
|
if let expected {
|
||||||
@@ -48,7 +49,7 @@ func makeBridgeTLSOptions(_ params: BridgeTLSParams?) -> NWProtocolTLS.Options?
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let ok = SecTrustEvaluateWithError(trustRef, nil)
|
let ok = SecTrustEvaluateWithError(trust, nil)
|
||||||
complete(ok)
|
complete(ok)
|
||||||
},
|
},
|
||||||
DispatchQueue(label: "com.clawdbot.bridge.tls.verify"))
|
DispatchQueue(label: "com.clawdbot.bridge.tls.verify"))
|
||||||
|
|||||||
@@ -190,7 +190,14 @@ actor CameraController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func listDevices() -> [CameraDeviceInfo] {
|
func listDevices() -> [CameraDeviceInfo] {
|
||||||
return Self.discoverVideoDevices().map { device in
|
let types: [AVCaptureDevice.DeviceType] = [
|
||||||
|
.builtInWideAngleCamera,
|
||||||
|
]
|
||||||
|
let session = AVCaptureDevice.DiscoverySession(
|
||||||
|
deviceTypes: types,
|
||||||
|
mediaType: .video,
|
||||||
|
position: .unspecified)
|
||||||
|
return session.devices.map { device in
|
||||||
CameraDeviceInfo(
|
CameraDeviceInfo(
|
||||||
id: device.uniqueID,
|
id: device.uniqueID,
|
||||||
name: device.localizedName,
|
name: device.localizedName,
|
||||||
@@ -225,7 +232,7 @@ actor CameraController {
|
|||||||
deviceId: String?) -> AVCaptureDevice?
|
deviceId: String?) -> AVCaptureDevice?
|
||||||
{
|
{
|
||||||
if let deviceId, !deviceId.isEmpty {
|
if let deviceId, !deviceId.isEmpty {
|
||||||
if let match = Self.discoverVideoDevices().first(where: { $0.uniqueID == deviceId }) {
|
if let match = AVCaptureDevice.devices(for: .video).first(where: { $0.uniqueID == deviceId }) {
|
||||||
return match
|
return match
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -245,24 +252,6 @@ actor CameraController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated static func discoverVideoDevices() -> [AVCaptureDevice] {
|
|
||||||
let types: [AVCaptureDevice.DeviceType] = [
|
|
||||||
.builtInWideAngleCamera,
|
|
||||||
.builtInUltraWideCamera,
|
|
||||||
.builtInTelephotoCamera,
|
|
||||||
.builtInDualCamera,
|
|
||||||
.builtInDualWideCamera,
|
|
||||||
.builtInTripleCamera,
|
|
||||||
.builtInTrueDepthCamera,
|
|
||||||
.builtInLiDARDepthCamera,
|
|
||||||
]
|
|
||||||
let session = AVCaptureDevice.DiscoverySession(
|
|
||||||
deviceTypes: types,
|
|
||||||
mediaType: .video,
|
|
||||||
position: .unspecified)
|
|
||||||
return session.devices
|
|
||||||
}
|
|
||||||
|
|
||||||
nonisolated static func clampQuality(_ quality: Double?) -> Double {
|
nonisolated static func clampQuality(_ quality: Double?) -> Double {
|
||||||
let q = quality ?? 0.9
|
let q = quality ?? 0.9
|
||||||
return min(1.0, max(0.05, q))
|
return min(1.0, max(0.05, q))
|
||||||
|
|||||||
@@ -137,11 +137,9 @@ final class ScreenRecordService: @unchecked Sendable {
|
|||||||
recordQueue: DispatchQueue) -> @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void
|
recordQueue: DispatchQueue) -> @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void
|
||||||
{
|
{
|
||||||
{ sample, type, error in
|
{ sample, type, error in
|
||||||
let sampleBox = UncheckedSendableBox(value: sample)
|
|
||||||
// ReplayKit can call the capture handler on a background queue.
|
// ReplayKit can call the capture handler on a background queue.
|
||||||
// Serialize writes to avoid queue asserts.
|
// Serialize writes to avoid queue asserts.
|
||||||
recordQueue.async {
|
recordQueue.async {
|
||||||
let sample = sampleBox.value
|
|
||||||
if let error {
|
if let error {
|
||||||
state.withLock { state in
|
state.withLock { state in
|
||||||
if state.handlerError == nil { state.handlerError = error }
|
if state.handlerError == nil { state.handlerError = error }
|
||||||
|
|||||||
@@ -341,15 +341,6 @@ final class AppState {
|
|||||||
return host
|
return host
|
||||||
}
|
}
|
||||||
|
|
||||||
private static func sanitizeSSHTarget(_ value: String) -> String {
|
|
||||||
let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
||||||
if trimmed.hasPrefix("ssh ") {
|
|
||||||
return trimmed.replacingOccurrences(of: "ssh ", with: "")
|
|
||||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
||||||
}
|
|
||||||
return trimmed
|
|
||||||
}
|
|
||||||
|
|
||||||
private func startConfigWatcher() {
|
private func startConfigWatcher() {
|
||||||
let configUrl = ClawdbotConfigFile.url()
|
let configUrl = ClawdbotConfigFile.url()
|
||||||
self.configWatcher = ConfigFileWatcher(url: configUrl) { [weak self] in
|
self.configWatcher = ConfigFileWatcher(url: configUrl) { [weak self] in
|
||||||
@@ -415,7 +406,6 @@ final class AppState {
|
|||||||
|
|
||||||
let connectionMode = self.connectionMode
|
let connectionMode = self.connectionMode
|
||||||
let remoteTarget = self.remoteTarget
|
let remoteTarget = self.remoteTarget
|
||||||
let remoteIdentity = self.remoteIdentity
|
|
||||||
let desiredMode: String? = switch connectionMode {
|
let desiredMode: String? = switch connectionMode {
|
||||||
case .local:
|
case .local:
|
||||||
"local"
|
"local"
|
||||||
@@ -445,46 +435,15 @@ final class AppState {
|
|||||||
changed = true
|
changed = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if connectionMode == .remote {
|
if connectionMode == .remote, let host = remoteHost {
|
||||||
var remote = gateway["remote"] as? [String: Any] ?? [:]
|
var remote = gateway["remote"] as? [String: Any] ?? [:]
|
||||||
var remoteChanged = false
|
let existingUrl = (remote["url"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||||
|
let parsedExisting = existingUrl.isEmpty ? nil : URL(string: existingUrl)
|
||||||
if let host = remoteHost {
|
let scheme = parsedExisting?.scheme?.isEmpty == false ? parsedExisting?.scheme : "ws"
|
||||||
let existingUrl = (remote["url"] as? String)?
|
let port = parsedExisting?.port ?? 18789
|
||||||
.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
let desiredUrl = "\(scheme ?? "ws")://\(host):\(port)"
|
||||||
let parsedExisting = existingUrl.isEmpty ? nil : URL(string: existingUrl)
|
if existingUrl != desiredUrl {
|
||||||
let scheme = parsedExisting?.scheme?.isEmpty == false ? parsedExisting?.scheme : "ws"
|
remote["url"] = desiredUrl
|
||||||
let port = parsedExisting?.port ?? 18789
|
|
||||||
let desiredUrl = "\(scheme ?? "ws")://\(host):\(port)"
|
|
||||||
if existingUrl != desiredUrl {
|
|
||||||
remote["url"] = desiredUrl
|
|
||||||
remoteChanged = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let sanitizedTarget = Self.sanitizeSSHTarget(remoteTarget)
|
|
||||||
if !sanitizedTarget.isEmpty {
|
|
||||||
if (remote["sshTarget"] as? String) != sanitizedTarget {
|
|
||||||
remote["sshTarget"] = sanitizedTarget
|
|
||||||
remoteChanged = true
|
|
||||||
}
|
|
||||||
} else if remote["sshTarget"] != nil {
|
|
||||||
remote.removeValue(forKey: "sshTarget")
|
|
||||||
remoteChanged = true
|
|
||||||
}
|
|
||||||
|
|
||||||
let trimmedIdentity = remoteIdentity.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
||||||
if !trimmedIdentity.isEmpty {
|
|
||||||
if (remote["sshIdentity"] as? String) != trimmedIdentity {
|
|
||||||
remote["sshIdentity"] = trimmedIdentity
|
|
||||||
remoteChanged = true
|
|
||||||
}
|
|
||||||
} else if remote["sshIdentity"] != nil {
|
|
||||||
remote.removeValue(forKey: "sshIdentity")
|
|
||||||
remoteChanged = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if remoteChanged {
|
|
||||||
gateway["remote"] = remote
|
gateway["remote"] = remote
|
||||||
changed = true
|
changed = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -188,15 +188,9 @@ extension CronJobEditor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func applyDeleteAfterRun(
|
func applyDeleteAfterRun(to root: inout [String: Any]) {
|
||||||
to root: inout [String: Any],
|
if self.scheduleKind == .at {
|
||||||
scheduleKind: ScheduleKind? = nil,
|
root["deleteAfterRun"] = self.deleteAfterRun
|
||||||
deleteAfterRun: Bool? = nil
|
|
||||||
) {
|
|
||||||
let resolvedSchedule = scheduleKind ?? self.scheduleKind
|
|
||||||
let resolvedDelete = deleteAfterRun ?? self.deleteAfterRun
|
|
||||||
if resolvedSchedule == .at {
|
|
||||||
root["deleteAfterRun"] = resolvedDelete
|
|
||||||
} else if self.job?.deleteAfterRun != nil {
|
} else if self.job?.deleteAfterRun != nil {
|
||||||
root["deleteAfterRun"] = false
|
root["deleteAfterRun"] = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,10 +69,7 @@ extension GatewayLaunchAgentManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static func readDaemonLoaded() async -> Bool? {
|
private static func readDaemonLoaded() async -> Bool? {
|
||||||
let result = await self.runDaemonCommandResult(
|
let result = await self.runDaemonCommand(["status", "--json", "--no-probe"], timeout: 15, quiet: true)
|
||||||
["status", "--json", "--no-probe"],
|
|
||||||
timeout: 15,
|
|
||||||
quiet: true)
|
|
||||||
guard result.success, let payload = result.payload else { return nil }
|
guard result.success, let payload = result.payload else { return nil }
|
||||||
guard
|
guard
|
||||||
let json = try? JSONSerialization.jsonObject(with: payload) as? [String: Any],
|
let json = try? JSONSerialization.jsonObject(with: payload) as? [String: Any],
|
||||||
|
|||||||
@@ -87,14 +87,6 @@ final class GatewayProcessManager {
|
|||||||
self.status = .stopped
|
self.status = .stopped
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Many surfaces can call `setActive(true)` in quick succession (startup, Canvas, health checks).
|
|
||||||
// Avoid spawning multiple concurrent "start" tasks that can thrash launchd and flap the port.
|
|
||||||
switch self.status {
|
|
||||||
case .starting, .running, .attachedExisting:
|
|
||||||
return
|
|
||||||
case .stopped, .failed:
|
|
||||||
break
|
|
||||||
}
|
|
||||||
self.status = .starting
|
self.status = .starting
|
||||||
self.logger.debug("gateway start requested")
|
self.logger.debug("gateway start requested")
|
||||||
|
|
||||||
|
|||||||
@@ -92,13 +92,10 @@ struct GeneralSettings: View {
|
|||||||
Text(policy.title).tag(policy)
|
Text(policy.title).tag(policy)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.labelsHidden()
|
.pickerStyle(.segmented)
|
||||||
.pickerStyle(.menu)
|
|
||||||
|
|
||||||
Text("""
|
Text("""
|
||||||
Controls remote command execution on this Mac when it is paired as a node. \
|
Controls remote command execution on this Mac when it is paired as a node. "Always Ask" prompts on each command; "Always Allow" runs without prompts; "Never" disables `system.run`.
|
||||||
"Always Ask" prompts on each command; "Always Allow" runs without prompts; \
|
|
||||||
"Never" disables `system.run`.
|
|
||||||
""")
|
""")
|
||||||
.font(.footnote)
|
.font(.footnote)
|
||||||
.foregroundStyle(.tertiary)
|
.foregroundStyle(.tertiary)
|
||||||
@@ -114,8 +111,7 @@ struct GeneralSettings: View {
|
|||||||
Text("While Using").tag(ClawdbotLocationMode.whileUsing.rawValue)
|
Text("While Using").tag(ClawdbotLocationMode.whileUsing.rawValue)
|
||||||
Text("Always").tag(ClawdbotLocationMode.always.rawValue)
|
Text("Always").tag(ClawdbotLocationMode.always.rawValue)
|
||||||
}
|
}
|
||||||
.labelsHidden()
|
.pickerStyle(.segmented)
|
||||||
.pickerStyle(.menu)
|
|
||||||
|
|
||||||
Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
|
Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
|
||||||
.disabled(self.locationMode == .off)
|
.disabled(self.locationMode == .off)
|
||||||
|
|||||||
@@ -460,7 +460,7 @@ actor MacNodeBridgeSession {
|
|||||||
do {
|
do {
|
||||||
try await self.send(response)
|
try await self.send(response)
|
||||||
} catch {
|
} catch {
|
||||||
self.logInvokeSendFailure(error)
|
await self.logInvokeSendFailure(error)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,14 +19,14 @@ enum MacNodeBridgeTLSStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static func loadFingerprint(stableID: String) -> String? {
|
static func loadFingerprint(stableID: String) -> String? {
|
||||||
let key = self.keyPrefix + stableID
|
let key = keyPrefix + stableID
|
||||||
let raw = self.defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines)
|
let raw = defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
return raw?.isEmpty == false ? raw : nil
|
return raw?.isEmpty == false ? raw : nil
|
||||||
}
|
}
|
||||||
|
|
||||||
static func saveFingerprint(_ value: String, stableID: String) {
|
static func saveFingerprint(_ value: String, stableID: String) {
|
||||||
let key = self.keyPrefix + stableID
|
let key = keyPrefix + stableID
|
||||||
self.defaults.set(value, forKey: key)
|
defaults.set(value, forKey: key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,10 +40,11 @@ func makeMacNodeTLSOptions(_ params: MacNodeBridgeTLSParams?) -> NWProtocolTLS.O
|
|||||||
sec_protocol_options_set_verify_block(
|
sec_protocol_options_set_verify_block(
|
||||||
options.securityProtocolOptions,
|
options.securityProtocolOptions,
|
||||||
{ _, trust, complete in
|
{ _, trust, complete in
|
||||||
let trustRef = sec_trust_copy_ref(trust).takeRetainedValue()
|
guard let trust else {
|
||||||
if let chain = SecTrustCopyCertificateChain(trustRef) as? [SecCertificate],
|
complete(false)
|
||||||
let cert = chain.first
|
return
|
||||||
{
|
}
|
||||||
|
if let cert = SecTrustGetCertificateAtIndex(trust, 0) {
|
||||||
let data = SecCertificateCopyData(cert) as Data
|
let data = SecCertificateCopyData(cert) as Data
|
||||||
let fingerprint = sha256Hex(data)
|
let fingerprint = sha256Hex(data)
|
||||||
if let expected {
|
if let expected {
|
||||||
@@ -56,7 +57,7 @@ func makeMacNodeTLSOptions(_ params: MacNodeBridgeTLSParams?) -> NWProtocolTLS.O
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let ok = SecTrustEvaluateWithError(trustRef, nil)
|
let ok = SecTrustEvaluateWithError(trust, nil)
|
||||||
complete(ok)
|
complete(ok)
|
||||||
},
|
},
|
||||||
DispatchQueue(label: "com.clawdbot.macos.bridge.tls.verify"))
|
DispatchQueue(label: "com.clawdbot.macos.bridge.tls.verify"))
|
||||||
@@ -70,5 +71,5 @@ private func sha256Hex(_ data: Data) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func normalizeMacNodeFingerprint(_ raw: String) -> String {
|
private func normalizeMacNodeFingerprint(_ raw: String) -> String {
|
||||||
raw.lowercased().filter(\.isHexDigit)
|
raw.lowercased().filter { $0.isHexDigit }
|
||||||
}
|
}
|
||||||
@@ -164,7 +164,6 @@ final class MacNodeModeCoordinator {
|
|||||||
]
|
]
|
||||||
|
|
||||||
if SystemRunPolicy.load() != .never {
|
if SystemRunPolicy.load() != .never {
|
||||||
commands.append(ClawdbotSystemCommand.which.rawValue)
|
|
||||||
commands.append(ClawdbotSystemCommand.run.rawValue)
|
commands.append(ClawdbotSystemCommand.run.rawValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -464,7 +463,7 @@ final class MacNodeModeCoordinator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated static func targetFromResult(_ result: NWBrowser.Result) -> BridgeTarget? {
|
private static func targetFromResult(_ result: NWBrowser.Result) -> BridgeTarget? {
|
||||||
let endpoint = result.endpoint
|
let endpoint = result.endpoint
|
||||||
guard case .service = endpoint else { return nil }
|
guard case .service = endpoint else { return nil }
|
||||||
let stableID = BridgeEndpointID.stableID(endpoint)
|
let stableID = BridgeEndpointID.stableID(endpoint)
|
||||||
@@ -478,7 +477,7 @@ final class MacNodeModeCoordinator {
|
|||||||
return BridgeTarget(endpoint: endpoint, stableID: stableID, tls: tlsParams)
|
return BridgeTarget(endpoint: endpoint, stableID: stableID, tls: tlsParams)
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated static func resolveDiscoveredTLSParams(
|
private static func resolveDiscoveredTLSParams(
|
||||||
stableID: String,
|
stableID: String,
|
||||||
tlsEnabled: Bool,
|
tlsEnabled: Bool,
|
||||||
tlsFingerprintSha256: String?) -> MacNodeBridgeTLSParams?
|
tlsFingerprintSha256: String?) -> MacNodeBridgeTLSParams?
|
||||||
@@ -504,7 +503,7 @@ final class MacNodeModeCoordinator {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated static func resolveManualTLSParams(stableID: String) -> MacNodeBridgeTLSParams? {
|
private static func resolveManualTLSParams(stableID: String) -> MacNodeBridgeTLSParams? {
|
||||||
if let stored = MacNodeBridgeTLSStore.loadFingerprint(stableID: stableID) {
|
if let stored = MacNodeBridgeTLSStore.loadFingerprint(stableID: stableID) {
|
||||||
return MacNodeBridgeTLSParams(
|
return MacNodeBridgeTLSParams(
|
||||||
required: true,
|
required: true,
|
||||||
@@ -520,12 +519,12 @@ final class MacNodeModeCoordinator {
|
|||||||
storeKey: stableID)
|
storeKey: stableID)
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated static func txtValue(_ dict: [String: String], key: String) -> String? {
|
private static func txtValue(_ dict: [String: String], key: String) -> String? {
|
||||||
let raw = dict[key]?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
let raw = dict[key]?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||||
return raw.isEmpty ? nil : raw
|
return raw.isEmpty ? nil : raw
|
||||||
}
|
}
|
||||||
|
|
||||||
private nonisolated static func txtBoolValue(_ dict: [String: String], key: String) -> Bool {
|
private static func txtBoolValue(_ dict: [String: String], key: String) -> Bool {
|
||||||
guard let raw = self.txtValue(dict, key: key)?.lowercased() else { return false }
|
guard let raw = self.txtValue(dict, key: key)?.lowercased() else { return false }
|
||||||
return raw == "1" || raw == "true" || raw == "yes"
|
return raw == "1" || raw == "true" || raw == "yes"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,8 +55,6 @@ actor MacNodeRuntime {
|
|||||||
return try await self.handleScreenRecordInvoke(req)
|
return try await self.handleScreenRecordInvoke(req)
|
||||||
case ClawdbotSystemCommand.run.rawValue:
|
case ClawdbotSystemCommand.run.rawValue:
|
||||||
return try await self.handleSystemRun(req)
|
return try await self.handleSystemRun(req)
|
||||||
case ClawdbotSystemCommand.which.rawValue:
|
|
||||||
return try await self.handleSystemWhich(req)
|
|
||||||
case ClawdbotSystemCommand.notify.rawValue:
|
case ClawdbotSystemCommand.notify.rawValue:
|
||||||
return try await self.handleSystemNotify(req)
|
return try await self.handleSystemNotify(req)
|
||||||
default:
|
default:
|
||||||
@@ -496,33 +494,6 @@ actor MacNodeRuntime {
|
|||||||
return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
|
return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func handleSystemWhich(_ req: BridgeInvokeRequest) async throws -> BridgeInvokeResponse {
|
|
||||||
let params = try Self.decodeParams(ClawdbotSystemWhichParams.self, from: req.paramsJSON)
|
|
||||||
let bins = params.bins
|
|
||||||
.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
|
|
||||||
.filter { !$0.isEmpty }
|
|
||||||
guard !bins.isEmpty else {
|
|
||||||
return Self.errorResponse(req, code: .invalidRequest, message: "INVALID_REQUEST: bins required")
|
|
||||||
}
|
|
||||||
|
|
||||||
let searchPaths = CommandResolver.preferredPaths()
|
|
||||||
var matches: [String] = []
|
|
||||||
var paths: [String: String] = [:]
|
|
||||||
for bin in bins {
|
|
||||||
if let path = CommandResolver.findExecutable(named: bin, searchPaths: searchPaths) {
|
|
||||||
matches.append(bin)
|
|
||||||
paths[bin] = path
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct WhichPayload: Encodable {
|
|
||||||
let bins: [String]
|
|
||||||
let paths: [String: String]
|
|
||||||
}
|
|
||||||
let payload = try Self.encodePayload(WhichPayload(bins: matches, paths: paths))
|
|
||||||
return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
|
|
||||||
}
|
|
||||||
|
|
||||||
private func handleSystemNotify(_ req: BridgeInvokeRequest) async throws -> BridgeInvokeResponse {
|
private func handleSystemNotify(_ req: BridgeInvokeRequest) async throws -> BridgeInvokeResponse {
|
||||||
let params = try Self.decodeParams(ClawdbotSystemNotifyParams.self, from: req.paramsJSON)
|
let params = try Self.decodeParams(ClawdbotSystemNotifyParams.self, from: req.paramsJSON)
|
||||||
let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
|
let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
@@ -615,8 +586,8 @@ actor MacNodeRuntime {
|
|||||||
let key = rawKey.trimmingCharacters(in: .whitespacesAndNewlines)
|
let key = rawKey.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
guard !key.isEmpty else { continue }
|
guard !key.isEmpty else { continue }
|
||||||
let upper = key.uppercased()
|
let upper = key.uppercased()
|
||||||
if self.blockedEnvKeys.contains(upper) { continue }
|
if blockedEnvKeys.contains(upper) { continue }
|
||||||
if self.blockedEnvPrefixes.contains(where: { upper.hasPrefix($0) }) { continue }
|
if blockedEnvPrefixes.contains(where: { upper.hasPrefix($0) }) { continue }
|
||||||
merged[key] = value
|
merged[key] = value
|
||||||
}
|
}
|
||||||
return merged
|
return merged
|
||||||
|
|||||||
@@ -351,11 +351,10 @@ actor PortGuardian {
|
|||||||
if port == GatewayEnvironment.gatewayPort() { return cmd.contains("ssh") }
|
if port == GatewayEnvironment.gatewayPort() { return cmd.contains("ssh") }
|
||||||
return false
|
return false
|
||||||
case .local:
|
case .local:
|
||||||
// The gateway daemon may listen as `clawdbot` or as its runtime (`node`, `bun`, etc).
|
if !cmd.contains("clawdbot") { return false }
|
||||||
if full.contains("gateway-daemon") { return true }
|
if full.contains("gateway-daemon") { return true }
|
||||||
// If args are unavailable, treat a clawdbot listener as expected.
|
// If args are unavailable, treat a clawdbot listener as expected.
|
||||||
if cmd.contains("clawdbot"), full == cmd { return true }
|
return full == cmd
|
||||||
return false
|
|
||||||
case .unconfigured:
|
case .unconfigured:
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ enum SystemRunPolicy: String, CaseIterable, Identifiable {
|
|||||||
var title: String {
|
var title: String {
|
||||||
switch self {
|
switch self {
|
||||||
case .never:
|
case .never:
|
||||||
"Never"
|
return "Never"
|
||||||
case .ask:
|
case .ask:
|
||||||
"Always Ask"
|
return "Always Ask"
|
||||||
case .always:
|
case .always:
|
||||||
"Always Allow"
|
return "Always Allow"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,13 +75,13 @@ enum SystemRunAllowlist {
|
|||||||
|
|
||||||
static func contains(_ argv: [String], defaults: UserDefaults = .standard) -> Bool {
|
static func contains(_ argv: [String], defaults: UserDefaults = .standard) -> Bool {
|
||||||
let key = key(for: argv)
|
let key = key(for: argv)
|
||||||
return self.load(from: defaults).contains(key)
|
return load(from: defaults).contains(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
static func add(_ argv: [String], defaults: UserDefaults = .standard) {
|
static func add(_ argv: [String], defaults: UserDefaults = .standard) {
|
||||||
let key = key(for: argv)
|
let key = key(for: argv)
|
||||||
guard !key.isEmpty else { return }
|
guard !key.isEmpty else { return }
|
||||||
var allowlist = self.load(from: defaults)
|
var allowlist = load(from: defaults)
|
||||||
if allowlist.insert(key).inserted {
|
if allowlist.insert(key).inserted {
|
||||||
MacNodeConfigFile.setSystemRunAllowlist(Array(allowlist).sorted())
|
MacNodeConfigFile.setSystemRunAllowlist(Array(allowlist).sorted())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import ClawdbotProtocol
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
import Testing
|
import Testing
|
||||||
@testable import Clawdbot
|
@testable import Clawdbot
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ struct CronJobEditorSmokeTests {
|
|||||||
thinking: "low",
|
thinking: "low",
|
||||||
timeoutSeconds: 120,
|
timeoutSeconds: 120,
|
||||||
deliver: true,
|
deliver: true,
|
||||||
channel: "whatsapp",
|
provider: "whatsapp",
|
||||||
to: "+15551234567",
|
to: "+15551234567",
|
||||||
bestEffortDeliver: true),
|
bestEffortDeliver: true),
|
||||||
isolation: CronIsolation(postToMainPrefix: "Cron"),
|
isolation: CronIsolation(postToMainPrefix: "Cron"),
|
||||||
@@ -70,16 +70,22 @@ struct CronJobEditorSmokeTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test func cronJobEditorIncludesDeleteAfterRunForAtSchedule() throws {
|
@Test func cronJobEditorIncludesDeleteAfterRunForAtSchedule() throws {
|
||||||
let view = CronJobEditor(
|
var view = CronJobEditor(
|
||||||
job: nil,
|
job: nil,
|
||||||
isSaving: .constant(false),
|
isSaving: .constant(false),
|
||||||
error: .constant(nil),
|
error: .constant(nil),
|
||||||
onCancel: {},
|
onCancel: {},
|
||||||
onSave: { _ in })
|
onSave: { _ in })
|
||||||
|
view.name = "One-shot"
|
||||||
|
view.sessionTarget = .main
|
||||||
|
view.payloadKind = .systemEvent
|
||||||
|
view.systemEventText = "hello"
|
||||||
|
view.scheduleKind = .at
|
||||||
|
view.atDate = Date(timeIntervalSince1970: 1_700_000_000)
|
||||||
|
view.deleteAfterRun = true
|
||||||
|
|
||||||
var root: [String: Any] = [:]
|
let payload = try view.buildPayload()
|
||||||
view.applyDeleteAfterRun(to: &root, scheduleKind: .at, deleteAfterRun: true)
|
let raw = payload["deleteAfterRun"]?.value as? Bool
|
||||||
let raw = root["deleteAfterRun"] as? Bool
|
|
||||||
#expect(raw == true)
|
#expect(raw == true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -31,7 +31,7 @@ struct CronModelsTests {
|
|||||||
thinking: "low",
|
thinking: "low",
|
||||||
timeoutSeconds: 15,
|
timeoutSeconds: 15,
|
||||||
deliver: true,
|
deliver: true,
|
||||||
channel: "whatsapp",
|
provider: "whatsapp",
|
||||||
to: "+15551234567",
|
to: "+15551234567",
|
||||||
bestEffortDeliver: false)
|
bestEffortDeliver: false)
|
||||||
let data = try JSONEncoder().encode(payload)
|
let data = try JSONEncoder().encode(payload)
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ import Testing
|
|||||||
stateversion: StateVersion(presence: 1, health: 1),
|
stateversion: StateVersion(presence: 1, health: 1),
|
||||||
uptimems: 123,
|
uptimems: 123,
|
||||||
configpath: nil,
|
configpath: nil,
|
||||||
statedir: nil,
|
statedir: nil)
|
||||||
sessiondefaults: nil)
|
|
||||||
|
|
||||||
let hello = HelloOk(
|
let hello = HelloOk(
|
||||||
type: "hello",
|
type: "hello",
|
||||||
|
|||||||
@@ -21,15 +21,6 @@ struct MacNodeRuntimeTests {
|
|||||||
#expect(response.ok == false)
|
#expect(response.ok == false)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test func handleInvokeRejectsEmptySystemWhich() async throws {
|
|
||||||
let runtime = MacNodeRuntime()
|
|
||||||
let params = ClawdbotSystemWhichParams(bins: [])
|
|
||||||
let json = try String(data: JSONEncoder().encode(params), encoding: .utf8)
|
|
||||||
let response = await runtime.handleInvoke(
|
|
||||||
BridgeInvokeRequest(id: "req-2b", command: ClawdbotSystemCommand.which.rawValue, paramsJSON: json))
|
|
||||||
#expect(response.ok == false)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test func handleInvokeRejectsEmptyNotification() async throws {
|
@Test func handleInvokeRejectsEmptyNotification() async throws {
|
||||||
let runtime = MacNodeRuntime()
|
let runtime = MacNodeRuntime()
|
||||||
let params = ClawdbotSystemNotifyParams(title: "", body: "")
|
let params = ClawdbotSystemNotifyParams(title: "", body: "")
|
||||||
@@ -74,10 +65,6 @@ struct MacNodeRuntimeTests {
|
|||||||
{
|
{
|
||||||
CLLocation(latitude: 0, longitude: 0)
|
CLLocation(latitude: 0, longitude: 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
func confirmSystemRun(command: String, cwd: String?) async -> SystemRunDecision {
|
|
||||||
.allowOnce
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let services = await MainActor.run { FakeMainActorServices() }
|
let services = await MainActor.run { FakeMainActorServices() }
|
||||||
|
|||||||
@@ -16,13 +16,13 @@ struct OnboardingViewSmokeTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test func pageOrderOmitsWorkspaceAndIdentitySteps() {
|
@Test func pageOrderOmitsWorkspaceAndIdentitySteps() {
|
||||||
let order = OnboardingView.pageOrder(for: .local, showOnboardingChat: false)
|
let order = OnboardingView.pageOrder(for: .local, needsBootstrap: false)
|
||||||
#expect(!order.contains(7))
|
#expect(!order.contains(7))
|
||||||
#expect(order.contains(3))
|
#expect(order.contains(3))
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test func pageOrderOmitsOnboardingChatWhenIdentityKnown() {
|
@Test func pageOrderOmitsOnboardingChatWhenIdentityKnown() {
|
||||||
let order = OnboardingView.pageOrder(for: .local, showOnboardingChat: false)
|
let order = OnboardingView.pageOrder(for: .local, needsBootstrap: false)
|
||||||
#expect(!order.contains(8))
|
#expect(!order.contains(8))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,7 @@ struct SettingsViewSmokeTests {
|
|||||||
thinking: "low",
|
thinking: "low",
|
||||||
timeoutSeconds: 30,
|
timeoutSeconds: 30,
|
||||||
deliver: true,
|
deliver: true,
|
||||||
channel: "sms",
|
provider: "sms",
|
||||||
to: "+15551234567",
|
to: "+15551234567",
|
||||||
bestEffortDeliver: true),
|
bestEffortDeliver: true),
|
||||||
isolation: CronIsolation(postToMainPrefix: "[cron] "),
|
isolation: CronIsolation(postToMainPrefix: "[cron] "),
|
||||||
|
|||||||
@@ -17,6 +17,6 @@ import Testing
|
|||||||
#expect(opts.thinking == "low")
|
#expect(opts.thinking == "low")
|
||||||
#expect(opts.deliver == true)
|
#expect(opts.deliver == true)
|
||||||
#expect(opts.to == nil)
|
#expect(opts.to == nil)
|
||||||
#expect(opts.channel == .last)
|
#expect(opts.provider == .last)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,6 @@ import Foundation
|
|||||||
|
|
||||||
public enum ClawdbotSystemCommand: String, Codable, Sendable {
|
public enum ClawdbotSystemCommand: String, Codable, Sendable {
|
||||||
case run = "system.run"
|
case run = "system.run"
|
||||||
case which = "system.which"
|
|
||||||
case notify = "system.notify"
|
case notify = "system.notify"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,14 +39,6 @@ public struct ClawdbotSystemRunParams: Codable, Sendable, Equatable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public struct ClawdbotSystemWhichParams: Codable, Sendable, Equatable {
|
|
||||||
public var bins: [String]
|
|
||||||
|
|
||||||
public init(bins: [String]) {
|
|
||||||
self.bins = bins
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public struct ClawdbotSystemNotifyParams: Codable, Sendable, Equatable {
|
public struct ClawdbotSystemNotifyParams: Codable, Sendable, Equatable {
|
||||||
public var title: String
|
public var title: String
|
||||||
public var body: String
|
public var body: String
|
||||||
|
|||||||
@@ -227,8 +227,6 @@ Outbound Discord API calls retry on rate limits (429) using Discord `retry_after
|
|||||||
actions: {
|
actions: {
|
||||||
reactions: true,
|
reactions: true,
|
||||||
stickers: true,
|
stickers: true,
|
||||||
emojiUploads: true,
|
|
||||||
stickerUploads: true,
|
|
||||||
polls: true,
|
polls: true,
|
||||||
permissions: true,
|
permissions: true,
|
||||||
messages: true,
|
messages: true,
|
||||||
@@ -239,7 +237,6 @@ Outbound Discord API calls retry on rate limits (429) using Discord `retry_after
|
|||||||
roleInfo: true,
|
roleInfo: true,
|
||||||
roles: false,
|
roles: false,
|
||||||
channelInfo: true,
|
channelInfo: true,
|
||||||
channels: true,
|
|
||||||
voiceStatus: true,
|
voiceStatus: true,
|
||||||
events: true,
|
events: true,
|
||||||
moderation: false
|
moderation: false
|
||||||
@@ -307,9 +304,8 @@ ack reaction after the bot replies.
|
|||||||
- `retry`: retry policy for outbound Discord API calls (attempts, minDelayMs, maxDelayMs, jitter).
|
- `retry`: retry policy for outbound Discord API calls (attempts, minDelayMs, maxDelayMs, jitter).
|
||||||
- `actions`: per-action tool gates; omit to allow all (set `false` to disable).
|
- `actions`: per-action tool gates; omit to allow all (set `false` to disable).
|
||||||
- `reactions` (covers react + read reactions)
|
- `reactions` (covers react + read reactions)
|
||||||
- `stickers`, `emojiUploads`, `stickerUploads`, `polls`, `permissions`, `messages`, `threads`, `pins`, `search`
|
- `stickers`, `polls`, `permissions`, `messages`, `threads`, `pins`, `search`
|
||||||
- `memberInfo`, `roleInfo`, `channelInfo`, `voiceStatus`, `events`
|
- `memberInfo`, `roleInfo`, `channelInfo`, `voiceStatus`, `events`
|
||||||
- `channels` (create/edit/delete channels + categories + permissions)
|
|
||||||
- `roles` (role add/remove, default `false`)
|
- `roles` (role add/remove, default `false`)
|
||||||
- `moderation` (timeout/kick/ban, default `false`)
|
- `moderation` (timeout/kick/ban, default `false`)
|
||||||
|
|
||||||
@@ -325,8 +321,6 @@ Reaction notifications use `guilds.<id>.reactionNotifications`:
|
|||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| reactions | enabled | React + list reactions + emojiList |
|
| reactions | enabled | React + list reactions + emojiList |
|
||||||
| stickers | enabled | Send stickers |
|
| stickers | enabled | Send stickers |
|
||||||
| emojiUploads | enabled | Upload emojis |
|
|
||||||
| stickerUploads | enabled | Upload stickers |
|
|
||||||
| polls | enabled | Create polls |
|
| polls | enabled | Create polls |
|
||||||
| permissions | enabled | Channel permission snapshot |
|
| permissions | enabled | Channel permission snapshot |
|
||||||
| messages | enabled | Read/send/edit/delete |
|
| messages | enabled | Read/send/edit/delete |
|
||||||
@@ -336,7 +330,6 @@ Reaction notifications use `guilds.<id>.reactionNotifications`:
|
|||||||
| memberInfo | enabled | Member info |
|
| memberInfo | enabled | Member info |
|
||||||
| roleInfo | enabled | Role list |
|
| roleInfo | enabled | Role list |
|
||||||
| channelInfo | enabled | Channel info + list |
|
| channelInfo | enabled | Channel info + list |
|
||||||
| channels | enabled | Channel/category management |
|
|
||||||
| voiceStatus | enabled | Voice state lookup |
|
| voiceStatus | enabled | Voice state lookup |
|
||||||
| events | enabled | List/create scheduled events |
|
| events | enabled | List/create scheduled events |
|
||||||
| roles | disabled | Role add/remove |
|
| roles | disabled | Role add/remove |
|
||||||
|
|||||||
@@ -101,29 +101,6 @@ group messages, so use admin if you need full visibility.
|
|||||||
- Raw HTML from models is escaped to avoid Telegram parse errors.
|
- Raw HTML from models is escaped to avoid Telegram parse errors.
|
||||||
- If Telegram rejects the HTML payload, Clawdbot retries the same message as plain text.
|
- If Telegram rejects the HTML payload, Clawdbot retries the same message as plain text.
|
||||||
|
|
||||||
## Commands (native + custom)
|
|
||||||
Clawdbot registers native commands (like `/status`, `/reset`, `/model`) with Telegram’s bot menu on startup.
|
|
||||||
You can add custom commands to the menu via config:
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
channels: {
|
|
||||||
telegram: {
|
|
||||||
customCommands: [
|
|
||||||
{ command: "backup", description: "Git backup" },
|
|
||||||
{ command: "generate", description: "Create an image" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Notes:
|
|
||||||
- Custom commands are **menu entries only**; Clawdbot does not implement them unless you handle them elsewhere.
|
|
||||||
- Command names are normalized (leading `/` stripped, lowercased) and must match `a-z`, `0-9`, `_` (1–32 chars).
|
|
||||||
- Custom commands **cannot override native commands**. Conflicts are ignored and logged.
|
|
||||||
- If `commands.native` is disabled, only custom commands are registered (or cleared if none).
|
|
||||||
|
|
||||||
## Limits
|
## Limits
|
||||||
- Outbound text is chunked to `channels.telegram.textChunkLimit` (default 4000).
|
- Outbound text is chunked to `channels.telegram.textChunkLimit` (default 4000).
|
||||||
- Media downloads/uploads are capped by `channels.telegram.mediaMaxMb` (default 5).
|
- Media downloads/uploads are capped by `channels.telegram.mediaMaxMb` (default 5).
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
---
|
|
||||||
summary: "CLI reference for `clawdbot config` (get/set/unset config values)"
|
|
||||||
read_when:
|
|
||||||
- You want to read or edit config non-interactively
|
|
||||||
---
|
|
||||||
|
|
||||||
# `clawdbot config`
|
|
||||||
|
|
||||||
Config helpers: get/set/unset values by path. Run without a subcommand to open
|
|
||||||
the configure wizard (same as `clawdbot configure`).
|
|
||||||
|
|
||||||
## Examples
|
|
||||||
|
|
||||||
```bash
|
|
||||||
clawdbot config get browser.executablePath
|
|
||||||
clawdbot config set browser.executablePath "/usr/bin/google-chrome"
|
|
||||||
clawdbot config set agents.defaults.heartbeat.every "2h"
|
|
||||||
clawdbot config unset tools.web.search.apiKey
|
|
||||||
```
|
|
||||||
|
|
||||||
## Paths
|
|
||||||
|
|
||||||
Paths use dot or bracket notation:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
clawdbot config get agents.defaults.workspace
|
|
||||||
clawdbot config get agents.list[0].id
|
|
||||||
```
|
|
||||||
|
|
||||||
## Values
|
|
||||||
|
|
||||||
Values are parsed as JSON5 when possible; otherwise they are treated as strings.
|
|
||||||
Use `--json` to require JSON5 parsing.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
clawdbot config set agents.defaults.heartbeat.every "0m"
|
|
||||||
clawdbot config set gateway.port 19001 --json
|
|
||||||
clawdbot config set channels.whatsapp.groups '["*"]' --json
|
|
||||||
```
|
|
||||||
|
|
||||||
Restart the gateway after edits.
|
|
||||||
@@ -1,19 +1,15 @@
|
|||||||
---
|
---
|
||||||
summary: "CLI reference for `clawdbot configure` (interactive configuration prompts)"
|
summary: "CLI reference for `clawdbot configure` / `clawdbot config` (interactive configuration prompts)"
|
||||||
read_when:
|
read_when:
|
||||||
- You want to tweak credentials, devices, or agent defaults interactively
|
- You want to tweak credentials, devices, or agent defaults interactively
|
||||||
---
|
---
|
||||||
|
|
||||||
# `clawdbot configure`
|
# `clawdbot configure` (alias: `config`)
|
||||||
|
|
||||||
Interactive prompt to set up credentials, devices, and agent defaults.
|
Interactive prompt to set up credentials, devices, and agent defaults.
|
||||||
|
|
||||||
Tip: `clawdbot config` without a subcommand opens the same wizard. Use
|
|
||||||
`clawdbot config get|set|unset` for non-interactive edits.
|
|
||||||
|
|
||||||
Related:
|
Related:
|
||||||
- Gateway configuration reference: [Configuration](/gateway/configuration)
|
- Gateway configuration reference: [Configuration](/gateway/configuration)
|
||||||
- Config CLI: [Config](/cli/config)
|
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
- Choosing where the Gateway runs always updates `gateway.mode`. You can select "Continue" without other sections if that is all you need.
|
- Choosing where the Gateway runs always updates `gateway.mode`. You can select "Continue" without other sections if that is all you need.
|
||||||
|
|||||||
+3
-17
@@ -13,8 +13,7 @@ This page describes the current CLI behavior. If commands change, update this do
|
|||||||
|
|
||||||
- [`setup`](/cli/setup)
|
- [`setup`](/cli/setup)
|
||||||
- [`onboard`](/cli/onboard)
|
- [`onboard`](/cli/onboard)
|
||||||
- [`configure`](/cli/configure)
|
- [`configure`](/cli/configure) (alias: `config`)
|
||||||
- [`config`](/cli/config)
|
|
||||||
- [`doctor`](/cli/doctor)
|
- [`doctor`](/cli/doctor)
|
||||||
- [`dashboard`](/cli/dashboard)
|
- [`dashboard`](/cli/dashboard)
|
||||||
- [`reset`](/cli/reset)
|
- [`reset`](/cli/reset)
|
||||||
@@ -84,11 +83,7 @@ Palette source of truth: `src/terminal/palette.ts` (aka “lobster seam”).
|
|||||||
clawdbot [--dev] [--profile <name>] <command>
|
clawdbot [--dev] [--profile <name>] <command>
|
||||||
setup
|
setup
|
||||||
onboard
|
onboard
|
||||||
configure
|
configure (alias: config)
|
||||||
config
|
|
||||||
get
|
|
||||||
set
|
|
||||||
unset
|
|
||||||
doctor
|
doctor
|
||||||
security
|
security
|
||||||
audit
|
audit
|
||||||
@@ -315,18 +310,9 @@ Options:
|
|||||||
- `--node-manager <npm|pnpm|bun>` (pnpm recommended; bun not recommended for Gateway runtime)
|
- `--node-manager <npm|pnpm|bun>` (pnpm recommended; bun not recommended for Gateway runtime)
|
||||||
- `--json`
|
- `--json`
|
||||||
|
|
||||||
### `configure`
|
### `configure` / `config`
|
||||||
Interactive configuration wizard (models, channels, skills, gateway).
|
Interactive configuration wizard (models, channels, skills, gateway).
|
||||||
|
|
||||||
### `config`
|
|
||||||
Non-interactive config helpers (get/set/unset). Running `clawdbot config` with no
|
|
||||||
subcommand launches the wizard.
|
|
||||||
|
|
||||||
Subcommands:
|
|
||||||
- `config get <path>`: print a config value (dot/bracket path).
|
|
||||||
- `config set <path> <value>`: set a value (JSON5 or raw string).
|
|
||||||
- `config unset <path>`: remove a value.
|
|
||||||
|
|
||||||
### `doctor`
|
### `doctor`
|
||||||
Health checks + quick fixes (config + gateway + legacy services).
|
Health checks + quick fixes (config + gateway + legacy services).
|
||||||
|
|
||||||
|
|||||||
@@ -21,8 +21,6 @@ clawdbot plugins info <id>
|
|||||||
clawdbot plugins enable <id>
|
clawdbot plugins enable <id>
|
||||||
clawdbot plugins disable <id>
|
clawdbot plugins disable <id>
|
||||||
clawdbot plugins doctor
|
clawdbot plugins doctor
|
||||||
clawdbot plugins update <id>
|
|
||||||
clawdbot plugins update --all
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Install
|
### Install
|
||||||
@@ -33,12 +31,3 @@ clawdbot plugins install <npm-spec>
|
|||||||
|
|
||||||
Security note: treat plugin installs like running code. Prefer pinned versions.
|
Security note: treat plugin installs like running code. Prefer pinned versions.
|
||||||
|
|
||||||
### Update
|
|
||||||
|
|
||||||
```bash
|
|
||||||
clawdbot plugins update <id>
|
|
||||||
clawdbot plugins update --all
|
|
||||||
clawdbot plugins update <id> --dry-run
|
|
||||||
```
|
|
||||||
|
|
||||||
Updates only apply to plugins installed from npm (tracked in `plugins.installs`).
|
|
||||||
@@ -871,7 +871,6 @@ Notes:
|
|||||||
- `commands.text: false` disables parsing chat messages for commands.
|
- `commands.text: false` disables parsing chat messages for commands.
|
||||||
- `commands.native: "auto"` (default) turns on native commands for Discord/Telegram and leaves Slack off; unsupported channels stay text-only.
|
- `commands.native: "auto"` (default) turns on native commands for Discord/Telegram and leaves Slack off; unsupported channels stay text-only.
|
||||||
- Set `commands.native: true|false` to force all, or override per channel with `channels.discord.commands.native`, `channels.telegram.commands.native`, `channels.slack.commands.native` (bool or `"auto"`). `false` clears previously registered commands on Discord/Telegram at startup; Slack commands are managed in the Slack app.
|
- Set `commands.native: true|false` to force all, or override per channel with `channels.discord.commands.native`, `channels.telegram.commands.native`, `channels.slack.commands.native` (bool or `"auto"`). `false` clears previously registered commands on Discord/Telegram at startup; Slack commands are managed in the Slack app.
|
||||||
- `channels.telegram.customCommands` adds extra Telegram bot menu entries. Names are normalized; conflicts with native commands are ignored.
|
|
||||||
- `commands.bash: true` enables `! <cmd>` to run host shell commands (`/bash <cmd>` also works as an alias). Requires `tools.elevated.enabled` and allowlisting the sender in `tools.elevated.allowFrom.<channel>`.
|
- `commands.bash: true` enables `! <cmd>` to run host shell commands (`/bash <cmd>` also works as an alias). Requires `tools.elevated.enabled` and allowlisting the sender in `tools.elevated.allowFrom.<channel>`.
|
||||||
- `commands.bashForegroundMs` controls how long bash waits before backgrounding. While a bash job is running, new `! <cmd>` requests are rejected (one at a time).
|
- `commands.bashForegroundMs` controls how long bash waits before backgrounding. While a bash job is running, new `! <cmd>` requests are rejected (one at a time).
|
||||||
- `commands.config: true` enables `/config` (reads/writes `clawdbot.json`).
|
- `commands.config: true` enables `/config` (reads/writes `clawdbot.json`).
|
||||||
@@ -930,10 +929,6 @@ Set `channels.telegram.configWrites: false` to block Telegram-initiated config w
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
customCommands: [
|
|
||||||
{ command: "backup", description: "Git backup" },
|
|
||||||
{ command: "generate", description: "Create an image" }
|
|
||||||
],
|
|
||||||
historyLimit: 50, // include last N group messages as context (0 disables)
|
historyLimit: 50, // include last N group messages as context (0 disables)
|
||||||
replyToMode: "first", // off | first | all
|
replyToMode: "first", // off | first | all
|
||||||
streamMode: "partial", // off | partial | block (draft streaming; separate from block streaming)
|
streamMode: "partial", // off | partial | block (draft streaming; separate from block streaming)
|
||||||
|
|||||||
@@ -169,20 +169,6 @@ The agent was interrupted mid-response.
|
|||||||
|
|
||||||
**Fix:** Just send another message. The session continues.
|
**Fix:** Just send another message. The session continues.
|
||||||
|
|
||||||
### "Agent failed before reply: Unknown model: anthropic/claude-haiku-3-5"
|
|
||||||
|
|
||||||
Clawdbot intentionally rejects **older/insecure models** (especially those more
|
|
||||||
vulnerable to prompt injection). If you see this error, the model name is no
|
|
||||||
longer supported.
|
|
||||||
|
|
||||||
**Fix:**
|
|
||||||
- Pick a **latest** model for the provider and update your config or model alias.
|
|
||||||
- If you’re unsure which models are available, run `clawdbot models list` or
|
|
||||||
`clawdbot models scan` and choose a supported one.
|
|
||||||
- Check gateway logs for the detailed failure reason.
|
|
||||||
|
|
||||||
See also: [Models CLI](/cli/models) and [Model providers](/concepts/model-providers).
|
|
||||||
|
|
||||||
### Messages Not Triggering
|
### Messages Not Triggering
|
||||||
|
|
||||||
**Check 1:** Is the sender allowlisted?
|
**Check 1:** Is the sender allowlisted?
|
||||||
@@ -320,139 +306,6 @@ Clawdbot keeps conversation history in memory.
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Common troubleshooting
|
|
||||||
|
|
||||||
### “All models failed” — what should I check first?
|
|
||||||
|
|
||||||
- **Credentials** present for the provider(s) being tried (auth profiles + env vars).
|
|
||||||
- **Model routing**: confirm `agents.defaults.model.primary` and fallbacks are models you can access.
|
|
||||||
- **Gateway logs** in `/tmp/clawdbot/…` for the exact provider error.
|
|
||||||
- **Model status**: use `/model status` (chat) or `clawdbot models status` (CLI).
|
|
||||||
|
|
||||||
### I’m running on my personal WhatsApp number — why is self-chat weird?
|
|
||||||
|
|
||||||
Enable self-chat mode and allowlist your own number:
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
channels: {
|
|
||||||
whatsapp: {
|
|
||||||
selfChatMode: true,
|
|
||||||
dmPolicy: "allowlist",
|
|
||||||
allowFrom: ["+15555550123"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
See [WhatsApp setup](/channels/whatsapp).
|
|
||||||
|
|
||||||
### WhatsApp logged me out. How do I re‑auth?
|
|
||||||
|
|
||||||
Run the login command again and scan the QR code:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
clawdbot channels login
|
|
||||||
```
|
|
||||||
|
|
||||||
### Build errors on `main` — what’s the standard fix path?
|
|
||||||
|
|
||||||
1) `git pull origin main && pnpm install`
|
|
||||||
2) `pnpm clawdbot doctor`
|
|
||||||
3) Check GitHub issues or Discord
|
|
||||||
4) Temporary workaround: check out an older commit
|
|
||||||
|
|
||||||
### npm install fails (allow-build-scripts / missing tar or yargs). What now?
|
|
||||||
|
|
||||||
If you’re running from source, use the repo’s package manager: **pnpm** (preferred).
|
|
||||||
The repo declares `packageManager: "pnpm@…"`, and pnpm patches are tracked in `pnpm.patchedDependencies`.
|
|
||||||
|
|
||||||
Typical recovery:
|
|
||||||
```bash
|
|
||||||
git status # ensure you’re in the repo root
|
|
||||||
pnpm install
|
|
||||||
pnpm build
|
|
||||||
pnpm clawdbot doctor
|
|
||||||
clawdbot daemon restart
|
|
||||||
```
|
|
||||||
|
|
||||||
Why: pnpm is the configured package manager for this repo, and the dependency
|
|
||||||
patching workflow relies on it.
|
|
||||||
|
|
||||||
### How do I switch between git installs and npm installs?
|
|
||||||
|
|
||||||
Use the **website installer** and select the install method with a flag. It
|
|
||||||
upgrades in place and rewrites the gateway service to point at the new install.
|
|
||||||
|
|
||||||
Switch **to git install**:
|
|
||||||
```bash
|
|
||||||
curl -fsSL https://clawd.bot/install.sh | bash -s -- --install-method git --no-onboard
|
|
||||||
```
|
|
||||||
|
|
||||||
Switch **to npm global**:
|
|
||||||
```bash
|
|
||||||
curl -fsSL https://clawd.bot/install.sh | bash
|
|
||||||
```
|
|
||||||
|
|
||||||
Notes:
|
|
||||||
- The git flow only rebases if the repo is clean. Commit or stash changes first.
|
|
||||||
- After switching, run:
|
|
||||||
```bash
|
|
||||||
clawdbot doctor
|
|
||||||
clawdbot daemon restart
|
|
||||||
```
|
|
||||||
|
|
||||||
### Telegram block streaming isn’t splitting text between tool calls. Why?
|
|
||||||
|
|
||||||
Block streaming only sends **completed text blocks**. Common reasons you see a single message:
|
|
||||||
- `agents.defaults.blockStreamingDefault` is still `"off"`.
|
|
||||||
- `channels.telegram.blockStreaming` is set to `false`.
|
|
||||||
- `channels.telegram.streamMode` is `partial` or `block` **and draft streaming is active**
|
|
||||||
(private chat + topics). Draft streaming disables block streaming in that case.
|
|
||||||
- Your `minChars` / coalesce settings are too high, so chunks get merged.
|
|
||||||
- The model emits one large text block (no mid‑reply flush points).
|
|
||||||
|
|
||||||
Fix checklist:
|
|
||||||
1) Put block streaming settings under `agents.defaults`, not the root.
|
|
||||||
2) Set `channels.telegram.streamMode: "off"` if you want real multi‑message block replies.
|
|
||||||
3) Use smaller chunk/coalesce thresholds while debugging.
|
|
||||||
|
|
||||||
See [Streaming](/concepts/streaming).
|
|
||||||
|
|
||||||
### Discord doesn’t reply in my server even with `requireMention: false`. Why?
|
|
||||||
|
|
||||||
`requireMention` only controls mention‑gating **after** the channel passes allowlists.
|
|
||||||
By default `channels.discord.groupPolicy` is **allowlist**, so guilds must be explicitly enabled.
|
|
||||||
If you set `channels.discord.guilds.<guildId>.channels`, only the listed channels are allowed; omit it to allow all channels in the guild.
|
|
||||||
|
|
||||||
Fix checklist:
|
|
||||||
1) Set `channels.discord.groupPolicy: "open"` **or** add a guild allowlist entry (and optionally a channel allowlist).
|
|
||||||
2) Use **numeric channel IDs** in `channels.discord.guilds.<guildId>.channels`.
|
|
||||||
3) Put `requireMention: false` **under** `channels.discord.guilds` (global or per‑channel).
|
|
||||||
Top‑level `channels.discord.requireMention` is not a supported key.
|
|
||||||
4) Ensure the bot has **Message Content Intent** and channel permissions.
|
|
||||||
5) Run `clawdbot channels status --probe` for audit hints.
|
|
||||||
|
|
||||||
Docs: [Discord](/channels/discord), [Channels troubleshooting](/channels/troubleshooting).
|
|
||||||
|
|
||||||
### Cloud Code Assist API error: invalid tool schema (400). What now?
|
|
||||||
|
|
||||||
This is almost always a **tool schema compatibility** issue. The Cloud Code Assist
|
|
||||||
endpoint accepts a strict subset of JSON Schema. Clawdbot scrubs/normalizes tool
|
|
||||||
schemas in current `main`, but the fix is not in the last release yet (as of
|
|
||||||
January 13, 2026).
|
|
||||||
|
|
||||||
Fix checklist:
|
|
||||||
1) **Update Clawdbot**:
|
|
||||||
- If you can run from source, pull `main` and restart the gateway.
|
|
||||||
- Otherwise, wait for the next release that includes the schema scrubber.
|
|
||||||
2) Avoid unsupported keywords like `anyOf/oneOf/allOf`, `patternProperties`,
|
|
||||||
`additionalProperties`, `minLength`, `maxLength`, `format`, etc.
|
|
||||||
3) If you define custom tools, keep the top‑level schema as `type: "object"` with
|
|
||||||
`properties` and simple enums.
|
|
||||||
|
|
||||||
See [Tools](/tools) and [TypeBox schemas](/concepts/typebox).
|
|
||||||
|
|
||||||
## macOS Specific Issues
|
## macOS Specific Issues
|
||||||
|
|
||||||
### App Crashes when Granting Permissions (Speech/Mic)
|
### App Crashes when Granting Permissions (Speech/Mic)
|
||||||
|
|||||||
@@ -160,15 +160,11 @@ clawdbot plugins install <path> # add a local file/dir to plugins.l
|
|||||||
clawdbot plugins install ./extensions/voice-call # relative path ok
|
clawdbot plugins install ./extensions/voice-call # relative path ok
|
||||||
clawdbot plugins install ./plugin.tgz # install from a local tarball
|
clawdbot plugins install ./plugin.tgz # install from a local tarball
|
||||||
clawdbot plugins install @clawdbot/voice-call # install from npm
|
clawdbot plugins install @clawdbot/voice-call # install from npm
|
||||||
clawdbot plugins update <id>
|
|
||||||
clawdbot plugins update --all
|
|
||||||
clawdbot plugins enable <id>
|
clawdbot plugins enable <id>
|
||||||
clawdbot plugins disable <id>
|
clawdbot plugins disable <id>
|
||||||
clawdbot plugins doctor
|
clawdbot plugins doctor
|
||||||
```
|
```
|
||||||
|
|
||||||
`plugins update` only works for npm installs tracked under `plugins.installs`.
|
|
||||||
|
|
||||||
Plugins may also register their own top‑level commands (example: `clawdbot voicecall`).
|
Plugins may also register their own top‑level commands (example: `clawdbot voicecall`).
|
||||||
|
|
||||||
## Plugin API (overview)
|
## Plugin API (overview)
|
||||||
|
|||||||
+146
-78
@@ -70,14 +70,11 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
|
|||||||
- [I set `COPILOT_GITHUB_TOKEN`, but models status shows “Shell env: off.” Why?](#i-set-copilot_github_token-but-models-status-shows-shell-env-off-why)
|
- [I set `COPILOT_GITHUB_TOKEN`, but models status shows “Shell env: off.” Why?](#i-set-copilot_github_token-but-models-status-shows-shell-env-off-why)
|
||||||
- [Sessions & multiple chats](#sessions-multiple-chats)
|
- [Sessions & multiple chats](#sessions-multiple-chats)
|
||||||
- [How do I start a fresh conversation?](#how-do-i-start-a-fresh-conversation)
|
- [How do I start a fresh conversation?](#how-do-i-start-a-fresh-conversation)
|
||||||
- [Do sessions reset automatically if I never send `/new`?](#do-sessions-reset-automatically-if-i-never-send-new)
|
- [How do I completely reset Clawdbot (but keep it installed)?](#how-do-i-completely-reset-clawdbot-but-keep-it-installed)
|
||||||
- [How do I completely reset Clawdbot but keep it installed?](#how-do-i-completely-reset-clawdbot-but-keep-it-installed)
|
|
||||||
- [I’m getting “context too large” errors — how do I reset or compact?](#im-getting-context-too-large-errors-how-do-i-reset-or-compact)
|
- [I’m getting “context too large” errors — how do I reset or compact?](#im-getting-context-too-large-errors-how-do-i-reset-or-compact)
|
||||||
- [Why am I getting heartbeat messages every 30 minutes?](#why-am-i-getting-heartbeat-messages-every-30-minutes)
|
|
||||||
- [Do I need to add a “bot account” to a WhatsApp group?](#do-i-need-to-add-a-bot-account-to-a-whatsapp-group)
|
- [Do I need to add a “bot account” to a WhatsApp group?](#do-i-need-to-add-a-bot-account-to-a-whatsapp-group)
|
||||||
- [Why doesn’t Clawdbot reply in a group?](#why-doesnt-clawdbot-reply-in-a-group)
|
- [Why doesn’t Clawdbot reply in a group?](#why-doesnt-clawdbot-reply-in-a-group)
|
||||||
- [Do groups/threads share context with DMs?](#do-groupsthreads-share-context-with-dms)
|
- [Do groups/threads share context with DMs?](#do-groupsthreads-share-context-with-dms)
|
||||||
- [How many workspaces and agents can I create?](#how-many-workspaces-and-agents-can-i-create)
|
|
||||||
- [Models: defaults, selection, aliases, switching](#models-defaults-selection-aliases-switching)
|
- [Models: defaults, selection, aliases, switching](#models-defaults-selection-aliases-switching)
|
||||||
- [What is the “default model”?](#what-is-the-default-model)
|
- [What is the “default model”?](#what-is-the-default-model)
|
||||||
- [How do I switch models on the fly (without restarting)?](#how-do-i-switch-models-on-the-fly-without-restarting)
|
- [How do I switch models on the fly (without restarting)?](#how-do-i-switch-models-on-the-fly-without-restarting)
|
||||||
@@ -110,17 +107,25 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
|
|||||||
- [Logging and debugging](#logging-and-debugging)
|
- [Logging and debugging](#logging-and-debugging)
|
||||||
- [Where are logs?](#where-are-logs)
|
- [Where are logs?](#where-are-logs)
|
||||||
- [How do I start/stop/restart the Gateway daemon?](#how-do-i-startstoprestart-the-gateway-daemon)
|
- [How do I start/stop/restart the Gateway daemon?](#how-do-i-startstoprestart-the-gateway-daemon)
|
||||||
- [ELI5: `clawdbot daemon restart` vs `clawdbot gateway`](#eli5-clawdbot-daemon-restart-vs-clawdbot-gateway)
|
|
||||||
- [What’s the fastest way to get more details when something fails?](#whats-the-fastest-way-to-get-more-details-when-something-fails)
|
- [What’s the fastest way to get more details when something fails?](#whats-the-fastest-way-to-get-more-details-when-something-fails)
|
||||||
- [Media & attachments](#media-attachments)
|
- [Media & attachments](#media-attachments)
|
||||||
- [My skill generated an image/PDF, but nothing was sent](#my-skill-generated-an-imagepdf-but-nothing-was-sent)
|
- [My skill generated an image/PDF, but nothing was sent](#my-skill-generated-an-imagepdf-but-nothing-was-sent)
|
||||||
- [Security and access control](#security-and-access-control)
|
- [Security and access control](#security-and-access-control)
|
||||||
- [Is it safe to expose Clawdbot to inbound DMs?](#is-it-safe-to-expose-clawdbot-to-inbound-dms)
|
- [Is it safe to expose Clawdbot to inbound DMs?](#is-it-safe-to-expose-clawdbot-to-inbound-dms)
|
||||||
- [I ran `/start` in Telegram but didn’t get a pairing code](#i-ran-start-in-telegram-but-didnt-get-a-pairing-code)
|
|
||||||
- [WhatsApp: will it message my contacts? How does pairing work?](#whatsapp-will-it-message-my-contacts-how-does-pairing-work)
|
- [WhatsApp: will it message my contacts? How does pairing work?](#whatsapp-will-it-message-my-contacts-how-does-pairing-work)
|
||||||
- [Chat commands, aborting tasks, and “it won’t stop”](#chat-commands-aborting-tasks-and-it-wont-stop)
|
- [Chat commands, aborting tasks, and “it won’t stop”](#chat-commands-aborting-tasks-and-it-wont-stop)
|
||||||
- [How do I stop/cancel a running task?](#how-do-i-stopcancel-a-running-task)
|
- [How do I stop/cancel a running task?](#how-do-i-stopcancel-a-running-task)
|
||||||
- [Why does it feel like the bot “ignores” rapid‑fire messages?](#why-does-it-feel-like-the-bot-ignores-rapidfire-messages)
|
- [Why does it feel like the bot “ignores” rapid‑fire messages?](#why-does-it-feel-like-the-bot-ignores-rapidfire-messages)
|
||||||
|
- [Common troubleshooting](#common-troubleshooting)
|
||||||
|
- [“All models failed” — what should I check first?](#all-models-failed-what-should-i-check-first)
|
||||||
|
- [I’m running on my personal WhatsApp number — why is self-chat weird?](#im-running-on-my-personal-whatsapp-number-why-is-self-chat-weird)
|
||||||
|
- [WhatsApp logged me out. How do I re‑auth?](#whatsapp-logged-me-out-how-do-i-reauth)
|
||||||
|
- [Build errors on `main` — what’s the standard fix path?](#build-errors-on-main-whats-the-standard-fix-path)
|
||||||
|
- [npm install fails (allow-build-scripts / missing tar or yargs). What now?](#npm-install-fails-allow-build-scripts--missing-tar-or-yargs-what-now)
|
||||||
|
- [How do I switch between git installs and npm installs?](#how-do-i-switch-between-git-installs-and-npm-installs)
|
||||||
|
- [Telegram block streaming isn’t splitting text between tool calls. Why?](#telegram-block-streaming-isnt-splitting-text-between-tool-calls-why)
|
||||||
|
- [Discord doesn’t reply in my server even with `requireMention: false`. Why?](#discord-doesnt-reply-in-my-server-even-with-requiremention-false-why)
|
||||||
|
- [Cloud Code Assist API error: invalid tool schema (400). What now?](#cloud-code-assist-api-error-invalid-tool-schema-400-what-now)
|
||||||
|
|
||||||
## First 60 seconds if something's broken
|
## First 60 seconds if something's broken
|
||||||
|
|
||||||
@@ -853,21 +858,7 @@ See [/concepts/model-providers](/concepts/model-providers) and [/environment](/e
|
|||||||
|
|
||||||
Send `/new` or `/reset` as a standalone message. See [Session management](/concepts/session).
|
Send `/new` or `/reset` as a standalone message. See [Session management](/concepts/session).
|
||||||
|
|
||||||
### Do sessions reset automatically if I never send `/new`?
|
### How do I completely reset Clawdbot (but keep it installed)?
|
||||||
|
|
||||||
Yes. Sessions expire after `session.idleMinutes` (default **60**). The **next**
|
|
||||||
message starts a fresh session id for that chat key. This does not delete
|
|
||||||
transcripts — it just starts a new session.
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
session: {
|
|
||||||
idleMinutes: 240
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### How do I completely reset Clawdbot but keep it installed?
|
|
||||||
|
|
||||||
Use the reset command:
|
Use the reset command:
|
||||||
|
|
||||||
@@ -914,24 +905,6 @@ If it keeps happening:
|
|||||||
|
|
||||||
Docs: [Compaction](/concepts/compaction), [Session pruning](/concepts/session-pruning), [Session management](/concepts/session).
|
Docs: [Compaction](/concepts/compaction), [Session pruning](/concepts/session-pruning), [Session management](/concepts/session).
|
||||||
|
|
||||||
### Why am I getting heartbeat messages every 30 minutes?
|
|
||||||
|
|
||||||
Heartbeats run every **30m** by default. Tune or disable them:
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
agents: {
|
|
||||||
defaults: {
|
|
||||||
heartbeat: {
|
|
||||||
every: "2h" // or "0m" to disable
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Per-agent overrides use `agents.list[].heartbeat`. Docs: [Heartbeat](/gateway/heartbeat).
|
|
||||||
|
|
||||||
### Do I need to add a “bot account” to a WhatsApp group?
|
### Do I need to add a “bot account” to a WhatsApp group?
|
||||||
|
|
||||||
No. Clawdbot runs on **your own account**, so if you’re in the group, Clawdbot can see it.
|
No. Clawdbot runs on **your own account**, so if you’re in the group, Clawdbot can see it.
|
||||||
@@ -962,19 +935,6 @@ See [Groups](/concepts/groups) and [Group messages](/concepts/group-messages).
|
|||||||
|
|
||||||
Direct chats collapse to the main session by default. Groups/channels have their own session keys, and Telegram topics / Discord threads are separate sessions. See [Groups](/concepts/groups) and [Group messages](/concepts/group-messages).
|
Direct chats collapse to the main session by default. Groups/channels have their own session keys, and Telegram topics / Discord threads are separate sessions. See [Groups](/concepts/groups) and [Group messages](/concepts/group-messages).
|
||||||
|
|
||||||
### How many workspaces and agents can I create?
|
|
||||||
|
|
||||||
No hard limits. Dozens (even hundreds) are fine, but watch for:
|
|
||||||
|
|
||||||
- **Disk growth:** sessions + transcripts live under `~/.clawdbot/agents/<agentId>/sessions/`.
|
|
||||||
- **Token cost:** more agents means more concurrent model usage.
|
|
||||||
- **Ops overhead:** per-agent auth profiles, workspaces, and channel routing.
|
|
||||||
|
|
||||||
Tips:
|
|
||||||
- Keep one **active** workspace per agent (`agents.defaults.workspace`).
|
|
||||||
- Prune old sessions (delete JSONL or store entries) if disk grows.
|
|
||||||
- Use `clawdbot doctor` to spot stray workspaces and profile mismatches.
|
|
||||||
|
|
||||||
## Models: defaults, selection, aliases, switching
|
## Models: defaults, selection, aliases, switching
|
||||||
|
|
||||||
### What is the “default model”?
|
### What is the “default model”?
|
||||||
@@ -1447,14 +1407,6 @@ clawdbot daemon restart
|
|||||||
|
|
||||||
If you run the gateway manually, `clawdbot gateway --force` can reclaim the port. See [Gateway](/gateway).
|
If you run the gateway manually, `clawdbot gateway --force` can reclaim the port. See [Gateway](/gateway).
|
||||||
|
|
||||||
### ELI5: `clawdbot daemon restart` vs `clawdbot gateway`
|
|
||||||
|
|
||||||
- `clawdbot daemon restart`: restarts the **background service** (launchd/systemd).
|
|
||||||
- `clawdbot gateway`: runs the gateway **in the foreground** for this terminal session.
|
|
||||||
|
|
||||||
If you installed the daemon, use the daemon commands. Use `clawdbot gateway` when
|
|
||||||
you want a one-off, foreground run.
|
|
||||||
|
|
||||||
### What’s the fastest way to get more details when something fails?
|
### What’s the fastest way to get more details when something fails?
|
||||||
|
|
||||||
Start the Gateway with `--verbose` to get more console detail. Then inspect the log file for channel auth, model routing, and RPC errors.
|
Start the Gateway with `--verbose` to get more console detail. Then inspect the log file for channel auth, model routing, and RPC errors.
|
||||||
@@ -1471,11 +1423,7 @@ CLI sending:
|
|||||||
clawdbot message send --to +15555550123 --message "Here you go" --media /path/to/file.png
|
clawdbot message send --to +15555550123 --message "Here you go" --media /path/to/file.png
|
||||||
```
|
```
|
||||||
|
|
||||||
Also check:
|
Note: images are resized/recompressed (max side 2048px) to hit size limits. See [Images](/nodes/images).
|
||||||
- The target channel supports outbound media and isn’t blocked by allowlists.
|
|
||||||
- The file is within the provider’s size limits (images are resized to max 2048px).
|
|
||||||
|
|
||||||
See [Images](/nodes/images).
|
|
||||||
|
|
||||||
## Security and access control
|
## Security and access control
|
||||||
|
|
||||||
@@ -1491,19 +1439,6 @@ Treat inbound DMs as untrusted input. Defaults are designed to reduce risk:
|
|||||||
|
|
||||||
Run `clawdbot doctor` to surface risky DM policies.
|
Run `clawdbot doctor` to surface risky DM policies.
|
||||||
|
|
||||||
### I ran `/start` in Telegram but didn’t get a pairing code
|
|
||||||
|
|
||||||
Pairing codes are sent **only** when an unknown sender messages the bot and
|
|
||||||
`dmPolicy: "pairing"` is enabled. `/start` by itself doesn’t generate a code.
|
|
||||||
|
|
||||||
Check pending requests:
|
|
||||||
```bash
|
|
||||||
clawdbot pairing list telegram
|
|
||||||
```
|
|
||||||
|
|
||||||
If you want immediate access, allowlist your sender id or set `dmPolicy: "open"`
|
|
||||||
for that account.
|
|
||||||
|
|
||||||
### WhatsApp: will it message my contacts? How does pairing work?
|
### WhatsApp: will it message my contacts? How does pairing work?
|
||||||
|
|
||||||
No. Default WhatsApp DM policy is **pairing**. Unknown senders only get a pairing code and their message is **not processed**. Clawdbot only replies to chats it receives or to explicit sends you trigger.
|
No. Default WhatsApp DM policy is **pairing**. Unknown senders only get a pairing code and their message is **not processed**. Clawdbot only replies to chats it receives or to explicit sends you trigger.
|
||||||
@@ -1561,6 +1496,139 @@ Queue mode controls how new messages interact with an in‑flight run. Use `/que
|
|||||||
|
|
||||||
You can add options like `debounce:2s cap:25 drop:summarize` for followup modes.
|
You can add options like `debounce:2s cap:25 drop:summarize` for followup modes.
|
||||||
|
|
||||||
|
## Common troubleshooting
|
||||||
|
|
||||||
|
### “All models failed” — what should I check first?
|
||||||
|
|
||||||
|
- **Credentials** present for the provider(s) being tried (auth profiles + env vars).
|
||||||
|
- **Model routing**: confirm `agents.defaults.model.primary` and fallbacks are models you can access.
|
||||||
|
- **Gateway logs** in `/tmp/clawdbot/…` for the exact provider error.
|
||||||
|
- **`/model status`** to see current configured models + shorthands.
|
||||||
|
|
||||||
|
### I’m running on my personal WhatsApp number — why is self-chat weird?
|
||||||
|
|
||||||
|
Enable self-chat mode and allowlist your own number:
|
||||||
|
|
||||||
|
```json5
|
||||||
|
{
|
||||||
|
channels: {
|
||||||
|
whatsapp: {
|
||||||
|
selfChatMode: true,
|
||||||
|
dmPolicy: "allowlist",
|
||||||
|
allowFrom: ["+15555550123"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
See [WhatsApp setup](/channels/whatsapp).
|
||||||
|
|
||||||
|
### WhatsApp logged me out. How do I re‑auth?
|
||||||
|
|
||||||
|
Run the login command again and scan the QR code:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
clawdbot channels login
|
||||||
|
```
|
||||||
|
|
||||||
|
### Build errors on `main` — what’s the standard fix path?
|
||||||
|
|
||||||
|
1) `git pull origin main && pnpm install`
|
||||||
|
2) `pnpm clawdbot doctor`
|
||||||
|
3) Check GitHub issues or Discord
|
||||||
|
4) Temporary workaround: check out an older commit
|
||||||
|
|
||||||
|
### npm install fails (allow-build-scripts / missing tar or yargs). What now?
|
||||||
|
|
||||||
|
If you’re running from source, use the repo’s package manager: **pnpm** (preferred).
|
||||||
|
The repo declares `packageManager: "pnpm@…"`, and pnpm patches are tracked in `pnpm.patchedDependencies`.
|
||||||
|
|
||||||
|
Typical recovery:
|
||||||
|
```bash
|
||||||
|
git status # ensure you’re in the repo root
|
||||||
|
pnpm install
|
||||||
|
pnpm build
|
||||||
|
pnpm clawdbot doctor
|
||||||
|
clawdbot daemon restart
|
||||||
|
```
|
||||||
|
|
||||||
|
Why: pnpm is the configured package manager for this repo, and the dependency
|
||||||
|
patching workflow relies on it.
|
||||||
|
|
||||||
|
### How do I switch between git installs and npm installs?
|
||||||
|
|
||||||
|
Use the **website installer** and select the install method with a flag. It
|
||||||
|
upgrades in place and rewrites the gateway service to point at the new install.
|
||||||
|
|
||||||
|
Switch **to git install**:
|
||||||
|
```bash
|
||||||
|
curl -fsSL https://clawd.bot/install.sh | bash -s -- --install-method git --no-onboard
|
||||||
|
```
|
||||||
|
|
||||||
|
Switch **to npm global**:
|
||||||
|
```bash
|
||||||
|
curl -fsSL https://clawd.bot/install.sh | bash
|
||||||
|
```
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- The git flow only rebases if the repo is clean. Commit or stash changes first.
|
||||||
|
- After switching, run:
|
||||||
|
```bash
|
||||||
|
clawdbot doctor
|
||||||
|
clawdbot daemon restart
|
||||||
|
```
|
||||||
|
|
||||||
|
### Telegram block streaming isn’t splitting text between tool calls. Why?
|
||||||
|
|
||||||
|
Block streaming only sends **completed text blocks**. Common reasons you see a single message:
|
||||||
|
- `agents.defaults.blockStreamingDefault` is still `"off"`.
|
||||||
|
- `channels.telegram.blockStreaming` is set to `false`.
|
||||||
|
- `channels.telegram.streamMode` is `partial` or `block` **and draft streaming is active**
|
||||||
|
(private chat + topics). Draft streaming disables block streaming in that case.
|
||||||
|
- Your `minChars` / coalesce settings are too high, so chunks get merged.
|
||||||
|
- The model emits one large text block (no mid‑reply flush points).
|
||||||
|
|
||||||
|
Fix checklist:
|
||||||
|
1) Put block streaming settings under `agents.defaults`, not the root.
|
||||||
|
2) Set `channels.telegram.streamMode: "off"` if you want real multi‑message block replies.
|
||||||
|
3) Use smaller chunk/coalesce thresholds while debugging.
|
||||||
|
|
||||||
|
See [Streaming](/concepts/streaming).
|
||||||
|
|
||||||
|
### Discord doesn’t reply in my server even with `requireMention: false`. Why?
|
||||||
|
|
||||||
|
`requireMention` only controls mention‑gating **after** the channel passes allowlists.
|
||||||
|
By default `channels.discord.groupPolicy` is **allowlist**, so guilds must be explicitly enabled.
|
||||||
|
If you set `channels.discord.guilds.<guildId>.channels`, only the listed channels are allowed; omit it to allow all channels in the guild.
|
||||||
|
|
||||||
|
Fix checklist:
|
||||||
|
1) Set `channels.discord.groupPolicy: "open"` **or** add a guild allowlist entry (and optionally a channel allowlist).
|
||||||
|
2) Use **numeric channel IDs** in `channels.discord.guilds.<guildId>.channels`.
|
||||||
|
3) Put `requireMention: false` **under** `channels.discord.guilds` (global or per‑channel).
|
||||||
|
Top‑level `channels.discord.requireMention` is not a supported key.
|
||||||
|
4) Ensure the bot has **Message Content Intent** and channel permissions.
|
||||||
|
5) Run `clawdbot channels status --probe` for audit hints.
|
||||||
|
|
||||||
|
Docs: [Discord](/channels/discord), [Channels troubleshooting](/channels/troubleshooting).
|
||||||
|
|
||||||
|
### Cloud Code Assist API error: invalid tool schema (400). What now?
|
||||||
|
|
||||||
|
This is almost always a **tool schema compatibility** issue. The Cloud Code Assist
|
||||||
|
endpoint accepts a strict subset of JSON Schema. Clawdbot scrubs/normalizes tool
|
||||||
|
schemas in current `main`, but the fix is not in the last release yet (as of
|
||||||
|
January 13, 2026).
|
||||||
|
|
||||||
|
Fix checklist:
|
||||||
|
1) **Update Clawdbot**:
|
||||||
|
- If you can run from source, pull `main` and restart the gateway.
|
||||||
|
- Otherwise, wait for the next release that includes the schema scrubber.
|
||||||
|
2) Avoid unsupported keywords like `anyOf/oneOf/allOf`, `patternProperties`,
|
||||||
|
`additionalProperties`, `minLength`, `maxLength`, `format`, etc.
|
||||||
|
3) If you define custom tools, keep the top‑level schema as `type: "object"` with
|
||||||
|
`properties` and simple enums.
|
||||||
|
|
||||||
|
See [Tools](/tools) and [TypeBox schemas](/concepts/typebox).
|
||||||
|
|
||||||
## Answer the exact question from the screenshot/chat log
|
## Answer the exact question from the screenshot/chat log
|
||||||
|
|
||||||
**Q: “What’s the default model for Anthropic with an API key?”**
|
**Q: “What’s the default model for Anthropic with an API key?”**
|
||||||
|
|||||||
@@ -68,8 +68,6 @@ Tip: `--json` does **not** imply non-interactive mode. Use `--non-interactive` (
|
|||||||
|
|
||||||
1) **Existing config detection**
|
1) **Existing config detection**
|
||||||
- If `~/.clawdbot/clawdbot.json` exists, choose **Keep / Modify / Reset**.
|
- If `~/.clawdbot/clawdbot.json` exists, choose **Keep / Modify / Reset**.
|
||||||
- Re-running the wizard does **not** wipe anything unless you explicitly choose **Reset**
|
|
||||||
(or pass `--reset`).
|
|
||||||
- If the config is invalid or contains legacy keys, the wizard stops and asks
|
- If the config is invalid or contains legacy keys, the wizard stops and asks
|
||||||
you to run `clawdbot doctor` before continuing.
|
you to run `clawdbot doctor` before continuing.
|
||||||
- Reset uses `trash` (never `rm`) and offers scopes:
|
- Reset uses `trash` (never `rm`) and offers scopes:
|
||||||
|
|||||||
@@ -112,18 +112,3 @@ curl -s http://127.0.0.1:18791/tabs
|
|||||||
| `browser.noSandbox` | Add `--no-sandbox` flag (needed for some Linux setups) | `false` |
|
| `browser.noSandbox` | Add `--no-sandbox` flag (needed for some Linux setups) | `false` |
|
||||||
| `browser.attachOnly` | Don't launch browser, only attach to existing | `false` |
|
| `browser.attachOnly` | Don't launch browser, only attach to existing | `false` |
|
||||||
| `browser.cdpPort` | Chrome DevTools Protocol port | `18800` |
|
| `browser.cdpPort` | Chrome DevTools Protocol port | `18800` |
|
||||||
|
|
||||||
### Problem: "Chrome extension relay is running, but no tab is connected"
|
|
||||||
|
|
||||||
You’re using the `chrome` profile (extension relay). It expects the Clawdbot
|
|
||||||
browser extension to be attached to a live tab.
|
|
||||||
|
|
||||||
Fix options:
|
|
||||||
1. **Use the managed browser:** `clawdbot browser start --browser-profile clawd`
|
|
||||||
(or set `browser.defaultProfile: "clawd"`).
|
|
||||||
2. **Use the extension relay:** install the extension, open a tab, and click the
|
|
||||||
Clawdbot extension icon to attach it.
|
|
||||||
|
|
||||||
Notes:
|
|
||||||
- The `chrome` profile uses your **system default Chromium browser** when possible.
|
|
||||||
- Local `clawd` profiles auto-assign `cdpPort`/`cdpUrl`; only set those for remote CDP.
|
|
||||||
+3
-27
@@ -14,10 +14,8 @@ control server.
|
|||||||
|
|
||||||
Beginner view:
|
Beginner view:
|
||||||
- Think of it as a **separate, agent-only browser**.
|
- Think of it as a **separate, agent-only browser**.
|
||||||
- The `clawd` profile does **not** touch your personal browser profile.
|
- It does **not** touch your personal browser profile.
|
||||||
- The agent can **open tabs, read pages, click, and type** in a safe lane.
|
- The agent can **open tabs, read pages, click, and type** in a safe lane.
|
||||||
- The default `chrome` profile uses the **system default Chromium browser** via the
|
|
||||||
extension relay; switch to `clawd` for the isolated managed browser.
|
|
||||||
|
|
||||||
## What you get
|
## What you get
|
||||||
|
|
||||||
@@ -41,14 +39,6 @@ clawdbot browser --browser-profile clawd snapshot
|
|||||||
If you get “Browser disabled”, enable it in config (see below) and restart the
|
If you get “Browser disabled”, enable it in config (see below) and restart the
|
||||||
Gateway.
|
Gateway.
|
||||||
|
|
||||||
## Profiles: `clawd` vs `chrome`
|
|
||||||
|
|
||||||
- `clawd`: managed, isolated browser (no extension required).
|
|
||||||
- `chrome`: extension relay to your **system browser** (requires the Clawdbot
|
|
||||||
extension to be attached to a tab).
|
|
||||||
|
|
||||||
Set `browser.defaultProfile: "clawd"` if you want managed mode by default.
|
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
Browser settings live in `~/.clawdbot/clawdbot.json`.
|
Browser settings live in `~/.clawdbot/clawdbot.json`.
|
||||||
@@ -81,21 +71,11 @@ Notes:
|
|||||||
- `cdpUrl` defaults to `controlUrl + 1` when unset.
|
- `cdpUrl` defaults to `controlUrl + 1` when unset.
|
||||||
- `attachOnly: true` means “never launch a local browser; only attach if it is already running.”
|
- `attachOnly: true` means “never launch a local browser; only attach if it is already running.”
|
||||||
- `color` + per-profile `color` tint the browser UI so you can see which profile is active.
|
- `color` + per-profile `color` tint the browser UI so you can see which profile is active.
|
||||||
- Default profile is `chrome` (extension relay). Use `defaultProfile: "clawd"` for the managed browser.
|
- Auto-detect order: default browser if Chromium-based; otherwise Chrome → Brave → Edge → Chromium → Chrome Canary.
|
||||||
- Auto-detect order: system default browser if Chromium-based; otherwise Chrome → Brave → Edge → Chromium → Chrome Canary.
|
|
||||||
- Local `clawd` profiles auto-assign `cdpPort`/`cdpUrl` — set those only for remote CDP.
|
|
||||||
|
|
||||||
## Use Brave (or another Chromium-based browser)
|
## Use Brave (or another Chromium-based browser)
|
||||||
|
|
||||||
If your **system default** browser is Chromium-based (Chrome/Brave/Edge/etc),
|
Set `browser.executablePath` to override auto-detection:
|
||||||
Clawdbot uses it automatically. Set `browser.executablePath` to override
|
|
||||||
auto-detection:
|
|
||||||
|
|
||||||
CLI example:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
clawdbot config set browser.executablePath "/usr/bin/google-chrome"
|
|
||||||
```
|
|
||||||
|
|
||||||
```json5
|
```json5
|
||||||
// macOS
|
// macOS
|
||||||
@@ -359,10 +339,6 @@ Playwright. If Playwright isn’t installed, those endpoints return a clear 501
|
|||||||
error. ARIA snapshots and basic screenshots still work for clawd-managed Chrome.
|
error. ARIA snapshots and basic screenshots still work for clawd-managed Chrome.
|
||||||
For the Chrome extension relay driver, ARIA snapshots and screenshots require Playwright.
|
For the Chrome extension relay driver, ARIA snapshots and screenshots require Playwright.
|
||||||
|
|
||||||
If you see `Playwright is not available in this gateway build`, install the full
|
|
||||||
Playwright package (not `playwright-core`) and restart the gateway, or reinstall
|
|
||||||
Clawdbot with browser support.
|
|
||||||
|
|
||||||
## How it works (internal)
|
## How it works (internal)
|
||||||
|
|
||||||
High-level flow:
|
High-level flow:
|
||||||
|
|||||||
+7
-25
@@ -206,31 +206,6 @@ if [[ "$NO_SIGN" -ne 1 && -f "${LAUNCHAGENT_DISABLE_MARKER}" ]]; then
|
|||||||
run_step "clear launchagent disable marker" /bin/rm -f "${LAUNCHAGENT_DISABLE_MARKER}"
|
run_step "clear launchagent disable marker" /bin/rm -f "${LAUNCHAGENT_DISABLE_MARKER}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# When unsigned, ensure the gateway LaunchAgent targets the repo CLI (before the app launches).
|
|
||||||
# This reduces noisy "could not connect" errors during app startup.
|
|
||||||
if [ "$NO_SIGN" -eq 1 ]; then
|
|
||||||
run_step "install gateway launch agent (unsigned)" bash -lc "cd '${ROOT_DIR}' && node dist/entry.js daemon install --force --runtime node"
|
|
||||||
run_step "restart gateway daemon (unsigned)" bash -lc "cd '${ROOT_DIR}' && node dist/entry.js daemon restart"
|
|
||||||
if [[ "${GATEWAY_WAIT_SECONDS}" -gt 0 ]]; then
|
|
||||||
run_step "wait for gateway (unsigned)" sleep "${GATEWAY_WAIT_SECONDS}"
|
|
||||||
fi
|
|
||||||
GATEWAY_PORT="$(
|
|
||||||
node -e '
|
|
||||||
const fs = require("node:fs");
|
|
||||||
const path = require("node:path");
|
|
||||||
try {
|
|
||||||
const raw = fs.readFileSync(path.join(process.env.HOME, ".clawdbot", "clawdbot.json"), "utf8");
|
|
||||||
const cfg = JSON.parse(raw);
|
|
||||||
const port = cfg && cfg.gateway && typeof cfg.gateway.port === "number" ? cfg.gateway.port : 18789;
|
|
||||||
process.stdout.write(String(port));
|
|
||||||
} catch {
|
|
||||||
process.stdout.write("18789");
|
|
||||||
}
|
|
||||||
'
|
|
||||||
)"
|
|
||||||
run_step "verify gateway port ${GATEWAY_PORT} (unsigned)" bash -lc "lsof -iTCP:${GATEWAY_PORT} -sTCP:LISTEN | head -n 5 || true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 4) Launch the installed app in the foreground so the menu bar extra appears.
|
# 4) Launch the installed app in the foreground so the menu bar extra appears.
|
||||||
# LaunchServices can inherit a huge environment from this shell (secrets, prompt vars, etc.).
|
# LaunchServices can inherit a huge environment from this shell (secrets, prompt vars, etc.).
|
||||||
# That can cause launchd spawn failures and is undesirable for a GUI app anyway.
|
# That can cause launchd spawn failures and is undesirable for a GUI app anyway.
|
||||||
@@ -251,6 +226,13 @@ else
|
|||||||
fail "App exited immediately. Check ${LOG_PATH} or Console.app (User Reports)."
|
fail "App exited immediately. Check ${LOG_PATH} or Console.app (User Reports)."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# When unsigned, ensure the gateway LaunchAgent targets the repo CLI (after the app launches).
|
||||||
if [ "$NO_SIGN" -eq 1 ]; then
|
if [ "$NO_SIGN" -eq 1 ]; then
|
||||||
|
run_step "install gateway launch agent (unsigned)" bash -lc "cd '${ROOT_DIR}' && node dist/entry.js daemon install --force --runtime node"
|
||||||
|
run_step "restart gateway daemon (unsigned)" bash -lc "cd '${ROOT_DIR}' && node dist/entry.js daemon restart"
|
||||||
|
if [[ "${GATEWAY_WAIT_SECONDS}" -gt 0 ]]; then
|
||||||
|
run_step "wait for gateway (unsigned)" sleep "${GATEWAY_WAIT_SECONDS}"
|
||||||
|
fi
|
||||||
|
run_step "verify gateway port 18789 (unsigned)" bash -lc "lsof -iTCP:18789 -sTCP:LISTEN | head -n 5 || true"
|
||||||
run_step "show gateway launch agent args (unsigned)" bash -lc "/usr/bin/plutil -p '${HOME}/Library/LaunchAgents/com.clawdbot.gateway.plist' | head -n 40 || true"
|
run_step "show gateway launch agent args (unsigned)" bash -lc "/usr/bin/plutil -p '${HOME}/Library/LaunchAgents/com.clawdbot.gateway.plist' | head -n 40 || true"
|
||||||
fi
|
fi
|
||||||
@@ -75,9 +75,7 @@ export function createClawdbotTools(options?: {
|
|||||||
}),
|
}),
|
||||||
createCanvasTool(),
|
createCanvasTool(),
|
||||||
createNodesTool(),
|
createNodesTool(),
|
||||||
createCronTool({
|
createCronTool(),
|
||||||
agentSessionKey: options?.agentSessionKey,
|
|
||||||
}),
|
|
||||||
createMessageTool({
|
createMessageTool({
|
||||||
agentAccountId: options?.agentAccountId,
|
agentAccountId: options?.agentAccountId,
|
||||||
config: options?.config,
|
config: options?.config,
|
||||||
|
|||||||
@@ -9,65 +9,26 @@ import type { EmbeddedContextFile } from "./types.js";
|
|||||||
|
|
||||||
type ContentBlockWithSignature = {
|
type ContentBlockWithSignature = {
|
||||||
thought_signature?: unknown;
|
thought_signature?: unknown;
|
||||||
thoughtSignature?: unknown;
|
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
};
|
};
|
||||||
|
|
||||||
type ThoughtSignatureSanitizeOptions = {
|
|
||||||
allowBase64Only?: boolean;
|
|
||||||
includeCamelCase?: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
function isBase64Signature(value: string): boolean {
|
|
||||||
const trimmed = value.trim();
|
|
||||||
if (!trimmed) return false;
|
|
||||||
const compact = trimmed.replace(/\s+/g, "");
|
|
||||||
if (!/^[A-Za-z0-9+/=_-]+$/.test(compact)) return false;
|
|
||||||
const isUrl = compact.includes("-") || compact.includes("_");
|
|
||||||
try {
|
|
||||||
const buf = Buffer.from(compact, isUrl ? "base64url" : "base64");
|
|
||||||
if (buf.length === 0) return false;
|
|
||||||
const encoded = buf.toString(isUrl ? "base64url" : "base64");
|
|
||||||
const normalize = (input: string) => input.replace(/=+$/g, "");
|
|
||||||
return normalize(encoded) === normalize(compact);
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Strips Claude-style thought_signature fields from content blocks.
|
* Strips Claude-style thought_signature fields from content blocks.
|
||||||
*
|
*
|
||||||
* Gemini expects thought signatures as base64-encoded bytes, but Claude stores message ids
|
* Gemini expects thought signatures as base64-encoded bytes, but Claude stores message ids
|
||||||
* like "msg_abc123...". We only strip "msg_*" to preserve any provider-valid signatures.
|
* like "msg_abc123...". We only strip "msg_*" to preserve any provider-valid signatures.
|
||||||
*/
|
*/
|
||||||
export function stripThoughtSignatures<T>(
|
export function stripThoughtSignatures<T>(content: T): T {
|
||||||
content: T,
|
|
||||||
options?: ThoughtSignatureSanitizeOptions,
|
|
||||||
): T {
|
|
||||||
if (!Array.isArray(content)) return content;
|
if (!Array.isArray(content)) return content;
|
||||||
const allowBase64Only = options?.allowBase64Only ?? false;
|
|
||||||
const includeCamelCase = options?.includeCamelCase ?? false;
|
|
||||||
const shouldStripSignature = (value: unknown): boolean => {
|
|
||||||
if (!allowBase64Only) {
|
|
||||||
return typeof value === "string" && value.startsWith("msg_");
|
|
||||||
}
|
|
||||||
return typeof value !== "string" || !isBase64Signature(value);
|
|
||||||
};
|
|
||||||
return content.map((block) => {
|
return content.map((block) => {
|
||||||
if (!block || typeof block !== "object") return block;
|
if (!block || typeof block !== "object") return block;
|
||||||
const rec = block as ContentBlockWithSignature;
|
const rec = block as ContentBlockWithSignature;
|
||||||
const stripSnake = shouldStripSignature(rec.thought_signature);
|
const signature = rec.thought_signature;
|
||||||
const stripCamel = includeCamelCase
|
if (typeof signature !== "string" || !signature.startsWith("msg_")) {
|
||||||
? shouldStripSignature(rec.thoughtSignature)
|
|
||||||
: false;
|
|
||||||
if (!stripSnake && !stripCamel) {
|
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
const next = { ...rec };
|
const { thought_signature: _signature, ...rest } = rec;
|
||||||
if (stripSnake) delete next.thought_signature;
|
return rest;
|
||||||
if (stripCamel) delete next.thoughtSignature;
|
|
||||||
return next;
|
|
||||||
}) as T;
|
}) as T;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ export { sanitizeGoogleTurnOrdering };
|
|||||||
type GeminiToolCallBlock = {
|
type GeminiToolCallBlock = {
|
||||||
type?: unknown;
|
type?: unknown;
|
||||||
thought_signature?: unknown;
|
thought_signature?: unknown;
|
||||||
thoughtSignature?: unknown;
|
|
||||||
id?: unknown;
|
id?: unknown;
|
||||||
toolCallId?: unknown;
|
toolCallId?: unknown;
|
||||||
name?: unknown;
|
name?: unknown;
|
||||||
@@ -119,8 +118,7 @@ export function downgradeGeminiHistory(messages: AgentMessage[]): AgentMessage[]
|
|||||||
const blockRecord = block as GeminiToolCallBlock;
|
const blockRecord = block as GeminiToolCallBlock;
|
||||||
const type = blockRecord.type;
|
const type = blockRecord.type;
|
||||||
if (type === "toolCall" || type === "functionCall" || type === "toolUse") {
|
if (type === "toolCall" || type === "functionCall" || type === "toolUse") {
|
||||||
const signature = blockRecord.thought_signature ?? blockRecord.thoughtSignature;
|
const hasSignature = Boolean(blockRecord.thought_signature);
|
||||||
const hasSignature = Boolean(signature);
|
|
||||||
if (!hasSignature) {
|
if (!hasSignature) {
|
||||||
const id =
|
const id =
|
||||||
typeof blockRecord.id === "string"
|
typeof blockRecord.id === "string"
|
||||||
|
|||||||
@@ -34,10 +34,6 @@ export async function sanitizeSessionMessagesImages(
|
|||||||
sanitizeToolCallIds?: boolean;
|
sanitizeToolCallIds?: boolean;
|
||||||
enforceToolCallLast?: boolean;
|
enforceToolCallLast?: boolean;
|
||||||
preserveSignatures?: boolean;
|
preserveSignatures?: boolean;
|
||||||
sanitizeThoughtSignatures?: {
|
|
||||||
allowBase64Only?: boolean;
|
|
||||||
includeCamelCase?: boolean;
|
|
||||||
};
|
|
||||||
},
|
},
|
||||||
): Promise<AgentMessage[]> {
|
): Promise<AgentMessage[]> {
|
||||||
// We sanitize historical session messages because Anthropic can reject a request
|
// We sanitize historical session messages because Anthropic can reject a request
|
||||||
@@ -86,7 +82,7 @@ export async function sanitizeSessionMessagesImages(
|
|||||||
if (Array.isArray(content)) {
|
if (Array.isArray(content)) {
|
||||||
const strippedContent = options?.preserveSignatures
|
const strippedContent = options?.preserveSignatures
|
||||||
? content // Keep signatures for Antigravity Claude
|
? content // Keep signatures for Antigravity Claude
|
||||||
: stripThoughtSignatures(content, options?.sanitizeThoughtSignatures); // Strip for Gemini
|
: stripThoughtSignatures(content); // Strip for Gemini
|
||||||
|
|
||||||
const filteredContent = strippedContent.filter((block) => {
|
const filteredContent = strippedContent.filter((block) => {
|
||||||
if (!block || typeof block !== "object") return true;
|
if (!block || typeof block !== "object") return true;
|
||||||
|
|||||||
@@ -145,65 +145,6 @@ describe("sanitizeSessionHistory (google thinking)", () => {
|
|||||||
expect(assistant.content?.[1]?.text).toBe("internal note");
|
expect(assistant.content?.[1]?.text).toBe("internal note");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("strips non-base64 thought signatures for OpenRouter Gemini", async () => {
|
|
||||||
const sessionManager = SessionManager.inMemory();
|
|
||||||
const input = [
|
|
||||||
{
|
|
||||||
role: "user",
|
|
||||||
content: "hi",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
role: "assistant",
|
|
||||||
content: [
|
|
||||||
{ type: "text", text: "hello", thought_signature: "msg_abc123" },
|
|
||||||
{ type: "thinking", thinking: "ok", thought_signature: "c2ln" },
|
|
||||||
{
|
|
||||||
type: "toolCall",
|
|
||||||
id: "call_1",
|
|
||||||
name: "read",
|
|
||||||
arguments: { path: "/tmp/foo" },
|
|
||||||
thoughtSignature: "{\"id\":1}",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: "toolCall",
|
|
||||||
id: "call_2",
|
|
||||||
name: "read",
|
|
||||||
arguments: { path: "/tmp/bar" },
|
|
||||||
thoughtSignature: "c2ln",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
] satisfies AgentMessage[];
|
|
||||||
|
|
||||||
const out = await sanitizeSessionHistory({
|
|
||||||
messages: input,
|
|
||||||
modelApi: "openrouter",
|
|
||||||
provider: "openrouter",
|
|
||||||
modelId: "google/gemini-1.5-pro",
|
|
||||||
sessionManager,
|
|
||||||
sessionId: "session:openrouter-gemini",
|
|
||||||
});
|
|
||||||
|
|
||||||
const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant") as {
|
|
||||||
content?: Array<{ type?: string; thought_signature?: string; thoughtSignature?: string }>;
|
|
||||||
};
|
|
||||||
expect(assistant.content).toEqual([
|
|
||||||
{ type: "text", text: "hello" },
|
|
||||||
{ type: "text", text: "ok" },
|
|
||||||
{
|
|
||||||
type: "text",
|
|
||||||
text: "[Tool Call: read (ID: call_1)]\nArguments: {\n \"path\": \"/tmp/foo\"\n}",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: "toolCall",
|
|
||||||
id: "call_2",
|
|
||||||
name: "read",
|
|
||||||
arguments: { path: "/tmp/bar" },
|
|
||||||
thoughtSignature: "c2ln",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("downgrades only unsigned thinking blocks when mixed with signed ones", async () => {
|
it("downgrades only unsigned thinking blocks when mixed with signed ones", async () => {
|
||||||
const sessionManager = SessionManager.inMemory();
|
const sessionManager = SessionManager.inMemory();
|
||||||
const input = [
|
const input = [
|
||||||
|
|||||||
@@ -1,109 +0,0 @@
|
|||||||
import type { AgentMessage } from "@mariozechner/pi-agent-core";
|
|
||||||
import type { SessionManager } from "@mariozechner/pi-coding-agent";
|
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import * as helpers from "./pi-embedded-helpers.js";
|
|
||||||
import { sanitizeSessionHistory } from "./pi-embedded-runner/google.js";
|
|
||||||
|
|
||||||
// Mock dependencies
|
|
||||||
vi.mock("./pi-embedded-helpers.js", async () => {
|
|
||||||
const actual = await vi.importActual("./pi-embedded-helpers.js");
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
isGoogleModelApi: vi.fn(),
|
|
||||||
downgradeGeminiHistory: vi.fn(),
|
|
||||||
sanitizeSessionMessagesImages: vi
|
|
||||||
.fn()
|
|
||||||
.mockImplementation(async (msgs) => msgs),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
// We don't mock session-transcript-repair.js as it is a pure function and complicates mocking.
|
|
||||||
// We rely on the real implementation which should pass through our simple messages.
|
|
||||||
|
|
||||||
describe("sanitizeSessionHistory", () => {
|
|
||||||
const mockSessionManager = {
|
|
||||||
getEntries: vi.fn().mockReturnValue([]),
|
|
||||||
appendCustomEntry: vi.fn(),
|
|
||||||
} as unknown as SessionManager;
|
|
||||||
|
|
||||||
const mockMessages: AgentMessage[] = [{ role: "user", content: "hello" }];
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.resetAllMocks();
|
|
||||||
vi.mocked(helpers.sanitizeSessionMessagesImages).mockImplementation(
|
|
||||||
async (msgs) => msgs,
|
|
||||||
);
|
|
||||||
// Default mock implementation
|
|
||||||
vi.mocked(helpers.downgradeGeminiHistory).mockImplementation((msgs) => {
|
|
||||||
if (!msgs) return [];
|
|
||||||
return [...msgs, { role: "system", content: "downgraded" }];
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should downgrade history for Google models if provider is not google-antigravity", async () => {
|
|
||||||
vi.mocked(helpers.isGoogleModelApi).mockReturnValue(true);
|
|
||||||
|
|
||||||
const result = await sanitizeSessionHistory({
|
|
||||||
messages: mockMessages,
|
|
||||||
modelApi: "google-gemini",
|
|
||||||
provider: "google-vertex",
|
|
||||||
sessionManager: mockSessionManager,
|
|
||||||
sessionId: "test-session",
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("google-gemini");
|
|
||||||
expect(helpers.downgradeGeminiHistory).toHaveBeenCalled();
|
|
||||||
// Check if the result contains the downgraded message
|
|
||||||
expect(result).toContainEqual({ role: "system", content: "downgraded" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should NOT downgrade history for google-antigravity provider", async () => {
|
|
||||||
vi.mocked(helpers.isGoogleModelApi).mockReturnValue(true);
|
|
||||||
|
|
||||||
const result = await sanitizeSessionHistory({
|
|
||||||
messages: mockMessages,
|
|
||||||
modelApi: "google-gemini",
|
|
||||||
provider: "google-antigravity",
|
|
||||||
sessionManager: mockSessionManager,
|
|
||||||
sessionId: "test-session",
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("google-gemini");
|
|
||||||
expect(helpers.downgradeGeminiHistory).not.toHaveBeenCalled();
|
|
||||||
// Result should not contain the downgraded message
|
|
||||||
expect(result).not.toContainEqual({
|
|
||||||
role: "system",
|
|
||||||
content: "downgraded",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should NOT downgrade history for non-Google models", async () => {
|
|
||||||
vi.mocked(helpers.isGoogleModelApi).mockReturnValue(false);
|
|
||||||
|
|
||||||
const _result = await sanitizeSessionHistory({
|
|
||||||
messages: mockMessages,
|
|
||||||
modelApi: "anthropic-messages",
|
|
||||||
provider: "anthropic",
|
|
||||||
sessionManager: mockSessionManager,
|
|
||||||
sessionId: "test-session",
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("anthropic-messages");
|
|
||||||
expect(helpers.downgradeGeminiHistory).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should downgrade history if provider is undefined but model is Google", async () => {
|
|
||||||
vi.mocked(helpers.isGoogleModelApi).mockReturnValue(true);
|
|
||||||
|
|
||||||
const _result = await sanitizeSessionHistory({
|
|
||||||
messages: mockMessages,
|
|
||||||
modelApi: "google-gemini",
|
|
||||||
provider: undefined,
|
|
||||||
sessionManager: mockSessionManager,
|
|
||||||
sessionId: "test-session",
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("google-gemini");
|
|
||||||
expect(helpers.downgradeGeminiHistory).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -44,11 +44,7 @@ import {
|
|||||||
} from "../skills.js";
|
} from "../skills.js";
|
||||||
import { filterBootstrapFilesForSession, loadWorkspaceBootstrapFiles } from "../workspace.js";
|
import { filterBootstrapFilesForSession, loadWorkspaceBootstrapFiles } from "../workspace.js";
|
||||||
import { buildEmbeddedExtensionPaths } from "./extensions.js";
|
import { buildEmbeddedExtensionPaths } from "./extensions.js";
|
||||||
import {
|
import { logToolSchemasForGoogle, sanitizeSessionHistory } from "./google.js";
|
||||||
logToolSchemasForGoogle,
|
|
||||||
sanitizeSessionHistory,
|
|
||||||
sanitizeToolsForGoogle,
|
|
||||||
} from "./google.js";
|
|
||||||
import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "./history.js";
|
import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "./history.js";
|
||||||
import { resolveGlobalLane, resolveSessionLane } from "./lanes.js";
|
import { resolveGlobalLane, resolveSessionLane } from "./lanes.js";
|
||||||
import { log } from "./logger.js";
|
import { log } from "./logger.js";
|
||||||
@@ -187,7 +183,7 @@ export async function compactEmbeddedPiSession(params: {
|
|||||||
warn: (message) => log.warn(`${message} (sessionKey=${sessionLabel})`),
|
warn: (message) => log.warn(`${message} (sessionKey=${sessionLabel})`),
|
||||||
});
|
});
|
||||||
const runAbortController = new AbortController();
|
const runAbortController = new AbortController();
|
||||||
const toolsRaw = createClawdbotCodingTools({
|
const tools = createClawdbotCodingTools({
|
||||||
exec: {
|
exec: {
|
||||||
...resolveExecToolDefaults(params.config),
|
...resolveExecToolDefaults(params.config),
|
||||||
elevated: params.bashElevated,
|
elevated: params.bashElevated,
|
||||||
@@ -204,7 +200,6 @@ export async function compactEmbeddedPiSession(params: {
|
|||||||
modelId,
|
modelId,
|
||||||
modelAuthMode: resolveModelAuthMode(model.provider, params.config),
|
modelAuthMode: resolveModelAuthMode(model.provider, params.config),
|
||||||
});
|
});
|
||||||
const tools = sanitizeToolsForGoogle({ tools: toolsRaw, provider });
|
|
||||||
logToolSchemasForGoogle({ tools, provider });
|
logToolSchemasForGoogle({ tools, provider });
|
||||||
const machineName = await getMachineDisplayName();
|
const machineName = await getMachineDisplayName();
|
||||||
const runtimeChannel = normalizeMessageChannel(
|
const runtimeChannel = normalizeMessageChannel(
|
||||||
@@ -308,7 +303,6 @@ export async function compactEmbeddedPiSession(params: {
|
|||||||
messages: session.messages,
|
messages: session.messages,
|
||||||
modelApi: model.api,
|
modelApi: model.api,
|
||||||
modelId,
|
modelId,
|
||||||
provider,
|
|
||||||
sessionManager,
|
sessionManager,
|
||||||
sessionId: params.sessionId,
|
sessionId: params.sessionId,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
import { describe, expect, it } from "vitest";
|
|
||||||
|
|
||||||
import type { AgentTool } from "@mariozechner/pi-agent-core";
|
|
||||||
import { sanitizeToolsForGoogle } from "./google.js";
|
|
||||||
|
|
||||||
describe("sanitizeToolsForGoogle", () => {
|
|
||||||
it("strips unsupported schema keywords for Google providers", () => {
|
|
||||||
const tool = {
|
|
||||||
name: "test",
|
|
||||||
description: "test",
|
|
||||||
parameters: {
|
|
||||||
type: "object",
|
|
||||||
additionalProperties: false,
|
|
||||||
properties: {
|
|
||||||
foo: {
|
|
||||||
type: "string",
|
|
||||||
format: "uuid",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
execute: async () => ({ ok: true, content: [] }),
|
|
||||||
} as unknown as AgentTool;
|
|
||||||
|
|
||||||
const [sanitized] = sanitizeToolsForGoogle({
|
|
||||||
tools: [tool],
|
|
||||||
provider: "google-gemini-cli",
|
|
||||||
});
|
|
||||||
|
|
||||||
const params = sanitized.parameters as {
|
|
||||||
additionalProperties?: unknown;
|
|
||||||
properties?: Record<string, { format?: unknown }>;
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(params.additionalProperties).toBeUndefined();
|
|
||||||
expect(params.properties?.foo?.format).toBeUndefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
import type { AgentMessage, AgentTool } from "@mariozechner/pi-agent-core";
|
import type { AgentMessage, AgentTool } from "@mariozechner/pi-agent-core";
|
||||||
import type { TSchema } from "@sinclair/typebox";
|
|
||||||
import type { SessionManager } from "@mariozechner/pi-coding-agent";
|
import type { SessionManager } from "@mariozechner/pi-coding-agent";
|
||||||
|
|
||||||
import { registerUnhandledRejectionHandler } from "../../infra/unhandled-rejections.js";
|
import { registerUnhandledRejectionHandler } from "../../infra/unhandled-rejections.js";
|
||||||
@@ -15,7 +14,6 @@ import { sanitizeToolUseResultPairing } from "../session-transcript-repair.js";
|
|||||||
import { log } from "./logger.js";
|
import { log } from "./logger.js";
|
||||||
import { describeUnknownError } from "./utils.js";
|
import { describeUnknownError } from "./utils.js";
|
||||||
import { isAntigravityClaude } from "../pi-embedded-helpers/google.js";
|
import { isAntigravityClaude } from "../pi-embedded-helpers/google.js";
|
||||||
import { cleanToolSchemaForGemini } from "../pi-tools.schema.js";
|
|
||||||
|
|
||||||
const GOOGLE_TURN_ORDERING_CUSTOM_TYPE = "google-turn-ordering-bootstrap";
|
const GOOGLE_TURN_ORDERING_CUSTOM_TYPE = "google-turn-ordering-bootstrap";
|
||||||
const GOOGLE_SCHEMA_UNSUPPORTED_KEYWORDS = new Set([
|
const GOOGLE_SCHEMA_UNSUPPORTED_KEYWORDS = new Set([
|
||||||
@@ -82,36 +80,17 @@ function findUnsupportedSchemaKeywords(schema: unknown, path: string): string[]
|
|||||||
return violations;
|
return violations;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function sanitizeToolsForGoogle<TSchemaType extends TSchema = TSchema, TResult = unknown>(
|
|
||||||
params: {
|
|
||||||
tools: AgentTool<TSchemaType, TResult>[];
|
|
||||||
provider: string;
|
|
||||||
},
|
|
||||||
): AgentTool<TSchemaType, TResult>[] {
|
|
||||||
if (params.provider !== "google-antigravity" && params.provider !== "google-gemini-cli") {
|
|
||||||
return params.tools;
|
|
||||||
}
|
|
||||||
return params.tools.map((tool) => {
|
|
||||||
if (!tool.parameters || typeof tool.parameters !== "object") return tool;
|
|
||||||
return {
|
|
||||||
...tool,
|
|
||||||
parameters: cleanToolSchemaForGemini(tool.parameters as Record<string, unknown>) as TSchemaType,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export function logToolSchemasForGoogle(params: { tools: AgentTool[]; provider: string }) {
|
export function logToolSchemasForGoogle(params: { tools: AgentTool[]; provider: string }) {
|
||||||
if (params.provider !== "google-antigravity" && params.provider !== "google-gemini-cli") {
|
if (params.provider !== "google-antigravity" && params.provider !== "google-gemini-cli") {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const toolNames = params.tools.map((tool, index) => `${index}:${tool.name}`);
|
const toolNames = params.tools.map((tool, index) => `${index}:${tool.name}`);
|
||||||
const tools = sanitizeToolsForGoogle(params);
|
|
||||||
log.info("google tool schema snapshot", {
|
log.info("google tool schema snapshot", {
|
||||||
provider: params.provider,
|
provider: params.provider,
|
||||||
toolCount: tools.length,
|
toolCount: params.tools.length,
|
||||||
tools: toolNames,
|
tools: toolNames,
|
||||||
});
|
});
|
||||||
for (const [index, tool] of tools.entries()) {
|
for (const [index, tool] of params.tools.entries()) {
|
||||||
const violations = findUnsupportedSchemaKeywords(tool.parameters, `${tool.name}.parameters`);
|
const violations = findUnsupportedSchemaKeywords(tool.parameters, `${tool.name}.parameters`);
|
||||||
if (violations.length > 0) {
|
if (violations.length > 0) {
|
||||||
log.warn("google tool schema has unsupported keywords", {
|
log.warn("google tool schema has unsupported keywords", {
|
||||||
@@ -185,34 +164,22 @@ export async function sanitizeSessionHistory(params: {
|
|||||||
messages: AgentMessage[];
|
messages: AgentMessage[];
|
||||||
modelApi?: string | null;
|
modelApi?: string | null;
|
||||||
modelId?: string;
|
modelId?: string;
|
||||||
provider?: string;
|
|
||||||
sessionManager: SessionManager;
|
sessionManager: SessionManager;
|
||||||
sessionId: string;
|
sessionId: string;
|
||||||
}): Promise<AgentMessage[]> {
|
}): Promise<AgentMessage[]> {
|
||||||
const isAntigravityClaudeModel = isAntigravityClaude(params.modelApi, params.modelId);
|
const isAntigravityClaudeModel = isAntigravityClaude(params.modelApi, params.modelId);
|
||||||
const provider = (params.provider ?? "").toLowerCase();
|
|
||||||
const modelId = (params.modelId ?? "").toLowerCase();
|
|
||||||
const isOpenRouterGemini =
|
|
||||||
(provider === "openrouter" || provider === "opencode") && modelId.includes("gemini");
|
|
||||||
const isGeminiLike = isGoogleModelApi(params.modelApi) || isOpenRouterGemini;
|
|
||||||
const sanitizedImages = await sanitizeSessionMessagesImages(params.messages, "session:history", {
|
const sanitizedImages = await sanitizeSessionMessagesImages(params.messages, "session:history", {
|
||||||
sanitizeToolCallIds: shouldSanitizeToolCallIds(params.modelApi),
|
sanitizeToolCallIds: shouldSanitizeToolCallIds(params.modelApi),
|
||||||
enforceToolCallLast: params.modelApi === "anthropic-messages",
|
enforceToolCallLast: params.modelApi === "anthropic-messages",
|
||||||
preserveSignatures: params.modelApi === "google-antigravity" && isAntigravityClaudeModel,
|
preserveSignatures: params.modelApi === "google-antigravity" && isAntigravityClaudeModel,
|
||||||
sanitizeThoughtSignatures: isOpenRouterGemini
|
|
||||||
? { allowBase64Only: true, includeCamelCase: true }
|
|
||||||
: undefined,
|
|
||||||
});
|
});
|
||||||
const repairedTools = sanitizeToolUseResultPairing(sanitizedImages);
|
const repairedTools = sanitizeToolUseResultPairing(sanitizedImages);
|
||||||
const isAntigravityProvider =
|
const shouldDowngradeGemini = isGoogleModelApi(params.modelApi) && !isAntigravityClaudeModel;
|
||||||
provider === "google-antigravity" || params.modelApi === "google-antigravity";
|
|
||||||
const shouldDowngradeThinking = isGeminiLike && !isAntigravityClaudeModel;
|
|
||||||
// Gemini rejects unsigned thinking blocks; downgrade them before send to avoid INVALID_ARGUMENT.
|
// Gemini rejects unsigned thinking blocks; downgrade them before send to avoid INVALID_ARGUMENT.
|
||||||
const downgradedThinking = shouldDowngradeThinking
|
const downgradedThinking = shouldDowngradeGemini
|
||||||
? downgradeGeminiThinkingBlocks(repairedTools)
|
? downgradeGeminiThinkingBlocks(repairedTools)
|
||||||
: repairedTools;
|
: repairedTools;
|
||||||
const shouldDowngradeHistory = shouldDowngradeThinking && !isAntigravityProvider;
|
const downgraded = shouldDowngradeGemini
|
||||||
const downgraded = shouldDowngradeHistory
|
|
||||||
? downgradeGeminiHistory(downgradedThinking)
|
? downgradeGeminiHistory(downgradedThinking)
|
||||||
: downgradedThinking;
|
: downgradedThinking;
|
||||||
|
|
||||||
|
|||||||
@@ -45,11 +45,7 @@ import { filterBootstrapFilesForSession, loadWorkspaceBootstrapFiles } from "../
|
|||||||
import { isAbortError } from "../abort.js";
|
import { isAbortError } from "../abort.js";
|
||||||
import { buildEmbeddedExtensionPaths } from "../extensions.js";
|
import { buildEmbeddedExtensionPaths } from "../extensions.js";
|
||||||
import { applyExtraParamsToAgent } from "../extra-params.js";
|
import { applyExtraParamsToAgent } from "../extra-params.js";
|
||||||
import {
|
import { logToolSchemasForGoogle, sanitizeSessionHistory } from "../google.js";
|
||||||
logToolSchemasForGoogle,
|
|
||||||
sanitizeSessionHistory,
|
|
||||||
sanitizeToolsForGoogle,
|
|
||||||
} from "../google.js";
|
|
||||||
import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "../history.js";
|
import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "../history.js";
|
||||||
import { log } from "../logger.js";
|
import { log } from "../logger.js";
|
||||||
import { buildModelAliasLines } from "../model.js";
|
import { buildModelAliasLines } from "../model.js";
|
||||||
@@ -131,7 +127,7 @@ export async function runEmbeddedAttempt(
|
|||||||
|
|
||||||
const agentDir = params.agentDir ?? resolveClawdbotAgentDir();
|
const agentDir = params.agentDir ?? resolveClawdbotAgentDir();
|
||||||
|
|
||||||
const toolsRaw = createClawdbotCodingTools({
|
const tools = createClawdbotCodingTools({
|
||||||
exec: {
|
exec: {
|
||||||
...resolveExecToolDefaults(params.config),
|
...resolveExecToolDefaults(params.config),
|
||||||
elevated: params.bashElevated,
|
elevated: params.bashElevated,
|
||||||
@@ -152,7 +148,6 @@ export async function runEmbeddedAttempt(
|
|||||||
replyToMode: params.replyToMode,
|
replyToMode: params.replyToMode,
|
||||||
hasRepliedRef: params.hasRepliedRef,
|
hasRepliedRef: params.hasRepliedRef,
|
||||||
});
|
});
|
||||||
const tools = sanitizeToolsForGoogle({ tools: toolsRaw, provider: params.provider });
|
|
||||||
logToolSchemasForGoogle({ tools, provider: params.provider });
|
logToolSchemasForGoogle({ tools, provider: params.provider });
|
||||||
|
|
||||||
const machineName = await getMachineDisplayName();
|
const machineName = await getMachineDisplayName();
|
||||||
@@ -323,7 +318,6 @@ export async function runEmbeddedAttempt(
|
|||||||
messages: activeSession.messages,
|
messages: activeSession.messages,
|
||||||
modelApi: params.model.api,
|
modelApi: params.model.api,
|
||||||
modelId: params.modelId,
|
modelId: params.modelId,
|
||||||
provider: params.provider,
|
|
||||||
sessionManager,
|
sessionManager,
|
||||||
sessionId: params.sessionId,
|
sessionId: params.sessionId,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export function handleAgentStart(ctx: EmbeddedPiSubscribeContext) {
|
|||||||
startedAt: Date.now(),
|
startedAt: Date.now(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
void ctx.params.onAgentEvent?.({
|
ctx.params.onAgentEvent?.({
|
||||||
stream: "lifecycle",
|
stream: "lifecycle",
|
||||||
data: { phase: "start" },
|
data: { phase: "start" },
|
||||||
});
|
});
|
||||||
@@ -24,7 +24,7 @@ export function handleAutoCompactionStart(ctx: EmbeddedPiSubscribeContext) {
|
|||||||
ctx.state.compactionInFlight = true;
|
ctx.state.compactionInFlight = true;
|
||||||
ctx.ensureCompactionPromise();
|
ctx.ensureCompactionPromise();
|
||||||
ctx.log.debug(`embedded run compaction start: runId=${ctx.params.runId}`);
|
ctx.log.debug(`embedded run compaction start: runId=${ctx.params.runId}`);
|
||||||
void ctx.params.onAgentEvent?.({
|
ctx.params.onAgentEvent?.({
|
||||||
stream: "compaction",
|
stream: "compaction",
|
||||||
data: { phase: "start" },
|
data: { phase: "start" },
|
||||||
});
|
});
|
||||||
@@ -43,7 +43,7 @@ export function handleAutoCompactionEnd(
|
|||||||
} else {
|
} else {
|
||||||
ctx.maybeResolveCompactionWait();
|
ctx.maybeResolveCompactionWait();
|
||||||
}
|
}
|
||||||
void ctx.params.onAgentEvent?.({
|
ctx.params.onAgentEvent?.({
|
||||||
stream: "compaction",
|
stream: "compaction",
|
||||||
data: { phase: "end", willRetry },
|
data: { phase: "end", willRetry },
|
||||||
});
|
});
|
||||||
@@ -59,7 +59,7 @@ export function handleAgentEnd(ctx: EmbeddedPiSubscribeContext) {
|
|||||||
endedAt: Date.now(),
|
endedAt: Date.now(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
void ctx.params.onAgentEvent?.({
|
ctx.params.onAgentEvent?.({
|
||||||
stream: "lifecycle",
|
stream: "lifecycle",
|
||||||
data: { phase: "end" },
|
data: { phase: "end" },
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export function handleMessageUpdate(
|
|||||||
mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
|
mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
void ctx.params.onAgentEvent?.({
|
ctx.params.onAgentEvent?.({
|
||||||
stream: "assistant",
|
stream: "assistant",
|
||||||
data: {
|
data: {
|
||||||
text: cleanedText,
|
text: cleanedText,
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import {
|
|||||||
} from "./pi-embedded-subscribe.tools.js";
|
} from "./pi-embedded-subscribe.tools.js";
|
||||||
import { inferToolMetaFromArgs } from "./pi-embedded-utils.js";
|
import { inferToolMetaFromArgs } from "./pi-embedded-utils.js";
|
||||||
|
|
||||||
export async function handleToolExecutionStart(
|
export function handleToolExecutionStart(
|
||||||
ctx: EmbeddedPiSubscribeContext,
|
ctx: EmbeddedPiSubscribeContext,
|
||||||
evt: AgentEvent & { toolName: string; toolCallId: string; args: unknown },
|
evt: AgentEvent & { toolName: string; toolCallId: string; args: unknown },
|
||||||
) {
|
) {
|
||||||
@@ -53,8 +53,7 @@ export async function handleToolExecutionStart(
|
|||||||
args: args as Record<string, unknown>,
|
args: args as Record<string, unknown>,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
// Await onAgentEvent to ensure typing indicator starts before tool summaries are emitted.
|
ctx.params.onAgentEvent?.({
|
||||||
await ctx.params.onAgentEvent?.({
|
|
||||||
stream: "tool",
|
stream: "tool",
|
||||||
data: { phase: "start", name: toolName, toolCallId },
|
data: { phase: "start", name: toolName, toolCallId },
|
||||||
});
|
});
|
||||||
@@ -109,7 +108,7 @@ export function handleToolExecutionUpdate(
|
|||||||
partialResult: sanitized,
|
partialResult: sanitized,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
void ctx.params.onAgentEvent?.({
|
ctx.params.onAgentEvent?.({
|
||||||
stream: "tool",
|
stream: "tool",
|
||||||
data: {
|
data: {
|
||||||
phase: "update",
|
phase: "update",
|
||||||
@@ -171,7 +170,7 @@ export function handleToolExecutionEnd(
|
|||||||
result: sanitizedResult,
|
result: sanitizedResult,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
void ctx.params.onAgentEvent?.({
|
ctx.params.onAgentEvent?.({
|
||||||
stream: "tool",
|
stream: "tool",
|
||||||
data: {
|
data: {
|
||||||
phase: "result",
|
phase: "result",
|
||||||
|
|||||||
@@ -32,11 +32,7 @@ export function createEmbeddedPiSessionEventHandler(ctx: EmbeddedPiSubscribeCont
|
|||||||
handleMessageEnd(ctx, evt as never);
|
handleMessageEnd(ctx, evt as never);
|
||||||
return;
|
return;
|
||||||
case "tool_execution_start":
|
case "tool_execution_start":
|
||||||
// Async handler - awaits typing indicator before emitting tool summaries.
|
handleToolExecutionStart(ctx, evt as never);
|
||||||
// Catch rejections to avoid unhandled promise rejection crashes.
|
|
||||||
handleToolExecutionStart(ctx, evt as never).catch((err) => {
|
|
||||||
ctx.log.debug(`tool_execution_start handler failed: ${String(err)}`);
|
|
||||||
});
|
|
||||||
return;
|
return;
|
||||||
case "tool_execution_update":
|
case "tool_execution_update":
|
||||||
handleToolExecutionUpdate(ctx, evt as never);
|
handleToolExecutionUpdate(ctx, evt as never);
|
||||||
|
|||||||
+2
-8
@@ -13,7 +13,7 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
{ tag: "antthinking", open: "<antthinking>", close: "</antthinking>" },
|
{ tag: "antthinking", open: "<antthinking>", close: "</antthinking>" },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
it("includes canvas action metadata in tool summaries", async () => {
|
it("includes canvas action metadata in tool summaries", () => {
|
||||||
let handler: ((evt: unknown) => void) | undefined;
|
let handler: ((evt: unknown) => void) | undefined;
|
||||||
const session: StubSession = {
|
const session: StubSession = {
|
||||||
subscribe: (fn) => {
|
subscribe: (fn) => {
|
||||||
@@ -38,9 +38,6 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
args: { action: "a2ui_push", jsonlPath: "/tmp/a2ui.jsonl" },
|
args: { action: "a2ui_push", jsonlPath: "/tmp/a2ui.jsonl" },
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait for async handler to complete
|
|
||||||
await Promise.resolve();
|
|
||||||
|
|
||||||
expect(onToolResult).toHaveBeenCalledTimes(1);
|
expect(onToolResult).toHaveBeenCalledTimes(1);
|
||||||
const payload = onToolResult.mock.calls[0][0];
|
const payload = onToolResult.mock.calls[0][0];
|
||||||
expect(payload.text).toContain("🖼️");
|
expect(payload.text).toContain("🖼️");
|
||||||
@@ -75,7 +72,7 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
|
|
||||||
expect(onToolResult).not.toHaveBeenCalled();
|
expect(onToolResult).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
it("emits tool summaries when shouldEmitToolResult overrides verbose", async () => {
|
it("emits tool summaries when shouldEmitToolResult overrides verbose", () => {
|
||||||
let handler: ((evt: unknown) => void) | undefined;
|
let handler: ((evt: unknown) => void) | undefined;
|
||||||
const session: StubSession = {
|
const session: StubSession = {
|
||||||
subscribe: (fn) => {
|
subscribe: (fn) => {
|
||||||
@@ -101,9 +98,6 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
args: { path: "/tmp/c.txt" },
|
args: { path: "/tmp/c.txt" },
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait for async handler to complete
|
|
||||||
await Promise.resolve();
|
|
||||||
|
|
||||||
expect(onToolResult).toHaveBeenCalledTimes(1);
|
expect(onToolResult).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
+2
-8
@@ -14,7 +14,7 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
{ tag: "antthinking", open: "<antthinking>", close: "</antthinking>" },
|
{ tag: "antthinking", open: "<antthinking>", close: "</antthinking>" },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
it("suppresses message_end block replies when the message tool already sent", async () => {
|
it("suppresses message_end block replies when the message tool already sent", () => {
|
||||||
let handler: ((evt: unknown) => void) | undefined;
|
let handler: ((evt: unknown) => void) | undefined;
|
||||||
const session: StubSession = {
|
const session: StubSession = {
|
||||||
subscribe: (fn) => {
|
subscribe: (fn) => {
|
||||||
@@ -41,9 +41,6 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
args: { action: "send", to: "+1555", message: messageText },
|
args: { action: "send", to: "+1555", message: messageText },
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait for async handler to complete
|
|
||||||
await Promise.resolve();
|
|
||||||
|
|
||||||
handler?.({
|
handler?.({
|
||||||
type: "tool_execution_end",
|
type: "tool_execution_end",
|
||||||
toolName: "message",
|
toolName: "message",
|
||||||
@@ -61,7 +58,7 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
|
|
||||||
expect(onBlockReply).not.toHaveBeenCalled();
|
expect(onBlockReply).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
it("does not suppress message_end replies when message tool reports error", async () => {
|
it("does not suppress message_end replies when message tool reports error", () => {
|
||||||
let handler: ((evt: unknown) => void) | undefined;
|
let handler: ((evt: unknown) => void) | undefined;
|
||||||
const session: StubSession = {
|
const session: StubSession = {
|
||||||
subscribe: (fn) => {
|
subscribe: (fn) => {
|
||||||
@@ -88,9 +85,6 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
args: { action: "send", to: "+1555", message: messageText },
|
args: { action: "send", to: "+1555", message: messageText },
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait for async handler to complete
|
|
||||||
await Promise.resolve();
|
|
||||||
|
|
||||||
handler?.({
|
handler?.({
|
||||||
type: "tool_execution_end",
|
type: "tool_execution_end",
|
||||||
toolName: "message",
|
toolName: "message",
|
||||||
|
|||||||
+2
-8
@@ -54,7 +54,7 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
await waitPromise;
|
await waitPromise;
|
||||||
expect(resolved).toBe(true);
|
expect(resolved).toBe(true);
|
||||||
});
|
});
|
||||||
it("emits tool summaries at tool start when verbose is on", async () => {
|
it("emits tool summaries at tool start when verbose is on", () => {
|
||||||
let handler: ((evt: unknown) => void) | undefined;
|
let handler: ((evt: unknown) => void) | undefined;
|
||||||
const session: StubSession = {
|
const session: StubSession = {
|
||||||
subscribe: (fn) => {
|
subscribe: (fn) => {
|
||||||
@@ -79,9 +79,6 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
args: { path: "/tmp/a.txt" },
|
args: { path: "/tmp/a.txt" },
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait for async handler to complete
|
|
||||||
await Promise.resolve();
|
|
||||||
|
|
||||||
expect(onToolResult).toHaveBeenCalledTimes(1);
|
expect(onToolResult).toHaveBeenCalledTimes(1);
|
||||||
const payload = onToolResult.mock.calls[0][0];
|
const payload = onToolResult.mock.calls[0][0];
|
||||||
expect(payload.text).toContain("/tmp/a.txt");
|
expect(payload.text).toContain("/tmp/a.txt");
|
||||||
@@ -96,7 +93,7 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
|
|
||||||
expect(onToolResult).toHaveBeenCalledTimes(1);
|
expect(onToolResult).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
it("includes browser action metadata in tool summaries", async () => {
|
it("includes browser action metadata in tool summaries", () => {
|
||||||
let handler: ((evt: unknown) => void) | undefined;
|
let handler: ((evt: unknown) => void) | undefined;
|
||||||
const session: StubSession = {
|
const session: StubSession = {
|
||||||
subscribe: (fn) => {
|
subscribe: (fn) => {
|
||||||
@@ -121,9 +118,6 @@ describe("subscribeEmbeddedPiSession", () => {
|
|||||||
args: { action: "snapshot", targetUrl: "https://example.com" },
|
args: { action: "snapshot", targetUrl: "https://example.com" },
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait for async handler to complete
|
|
||||||
await Promise.resolve();
|
|
||||||
|
|
||||||
expect(onToolResult).toHaveBeenCalledTimes(1);
|
expect(onToolResult).toHaveBeenCalledTimes(1);
|
||||||
const payload = onToolResult.mock.calls[0][0];
|
const payload = onToolResult.mock.calls[0][0];
|
||||||
expect(payload.text).toContain("🌐");
|
expect(payload.text).toContain("🌐");
|
||||||
|
|||||||
@@ -22,10 +22,7 @@ export type SubscribeEmbeddedPiSessionParams = {
|
|||||||
blockReplyChunking?: BlockReplyChunking;
|
blockReplyChunking?: BlockReplyChunking;
|
||||||
onPartialReply?: (payload: { text?: string; mediaUrls?: string[] }) => void | Promise<void>;
|
onPartialReply?: (payload: { text?: string; mediaUrls?: string[] }) => void | Promise<void>;
|
||||||
onAssistantMessageStart?: () => void | Promise<void>;
|
onAssistantMessageStart?: () => void | Promise<void>;
|
||||||
onAgentEvent?: (evt: {
|
onAgentEvent?: (evt: { stream: string; data: Record<string, unknown> }) => void;
|
||||||
stream: string;
|
|
||||||
data: Record<string, unknown>;
|
|
||||||
}) => void | Promise<void>;
|
|
||||||
enforceFinalTag?: boolean;
|
enforceFinalTag?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ export function ensureSkillsWatcher(params: { workspaceDir: string; config?: Cla
|
|||||||
if (!watchEnabled) {
|
if (!watchEnabled) {
|
||||||
if (existing) {
|
if (existing) {
|
||||||
watchers.delete(workspaceDir);
|
watchers.delete(workspaceDir);
|
||||||
if (existing.timer) clearTimeout(existing.timer);
|
existing.timer && clearTimeout(existing.timer);
|
||||||
void existing.watcher.close().catch(() => {});
|
void existing.watcher.close().catch(() => {});
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -115,7 +115,7 @@ export function ensureSkillsWatcher(params: { workspaceDir: string; config?: Cla
|
|||||||
}
|
}
|
||||||
if (existing) {
|
if (existing) {
|
||||||
watchers.delete(workspaceDir);
|
watchers.delete(workspaceDir);
|
||||||
if (existing.timer) clearTimeout(existing.timer);
|
existing.timer && clearTimeout(existing.timer);
|
||||||
void existing.watcher.close().catch(() => {});
|
void existing.watcher.close().catch(() => {});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ export function buildAgentSystemPrompt(params: {
|
|||||||
browser: "Control web browser",
|
browser: "Control web browser",
|
||||||
canvas: "Present/eval/snapshot the Canvas",
|
canvas: "Present/eval/snapshot the Canvas",
|
||||||
nodes: "List/describe/notify/camera/screen on paired nodes",
|
nodes: "List/describe/notify/camera/screen on paired nodes",
|
||||||
cron: "Manage cron jobs and wake events (use for reminders; include recent context in reminder text if appropriate)",
|
cron: "Manage cron jobs and wake events (use for reminders)",
|
||||||
message: "Send messages and channel actions",
|
message: "Send messages and channel actions",
|
||||||
gateway: "Restart, apply config, or run updates on the running Clawdbot process",
|
gateway: "Restart, apply config, or run updates on the running Clawdbot process",
|
||||||
agents_list: "List agent ids allowed for sessions_spawn",
|
agents_list: "List agent ids allowed for sessions_spawn",
|
||||||
@@ -319,7 +319,7 @@ export function buildAgentSystemPrompt(params: {
|
|||||||
"- browser: control clawd's dedicated browser",
|
"- browser: control clawd's dedicated browser",
|
||||||
"- canvas: present/eval/snapshot the Canvas",
|
"- canvas: present/eval/snapshot the Canvas",
|
||||||
"- nodes: list/describe/notify/camera/screen on paired nodes",
|
"- nodes: list/describe/notify/camera/screen on paired nodes",
|
||||||
"- cron: manage cron jobs and wake events (use for reminders; include recent context in reminder text if appropriate)",
|
"- cron: manage cron jobs and wake events (use for reminders)",
|
||||||
"- sessions_list: list sessions",
|
"- sessions_list: list sessions",
|
||||||
"- sessions_history: fetch session history",
|
"- sessions_history: fetch session history",
|
||||||
"- sessions_send: send to another session",
|
"- sessions_send: send to another session",
|
||||||
|
|||||||
@@ -84,47 +84,4 @@ describe("cron tool", () => {
|
|||||||
payload: { kind: "systemEvent", text: "hello" },
|
payload: { kind: "systemEvent", text: "hello" },
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("adds recent context for systemEvent reminders when session key is available", async () => {
|
|
||||||
callGatewayMock
|
|
||||||
.mockResolvedValueOnce({
|
|
||||||
messages: [
|
|
||||||
{ role: "user", content: [{ type: "text", text: "Discussed Q2 budget" }] },
|
|
||||||
{
|
|
||||||
role: "assistant",
|
|
||||||
content: [{ type: "text", text: "We agreed to review on Tuesday." }],
|
|
||||||
},
|
|
||||||
{ role: "user", content: [{ type: "text", text: "Remind me about the thing at 2pm" }] },
|
|
||||||
],
|
|
||||||
})
|
|
||||||
.mockResolvedValueOnce({ ok: true });
|
|
||||||
|
|
||||||
const tool = createCronTool({ agentSessionKey: "main" });
|
|
||||||
await tool.execute("call3", {
|
|
||||||
action: "add",
|
|
||||||
job: {
|
|
||||||
name: "reminder",
|
|
||||||
schedule: { atMs: 123 },
|
|
||||||
payload: { text: "Reminder: the thing." },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(callGatewayMock).toHaveBeenCalledTimes(2);
|
|
||||||
const historyCall = callGatewayMock.mock.calls[0]?.[0] as {
|
|
||||||
method?: string;
|
|
||||||
params?: unknown;
|
|
||||||
};
|
|
||||||
expect(historyCall.method).toBe("chat.history");
|
|
||||||
|
|
||||||
const cronCall = callGatewayMock.mock.calls[1]?.[0] as {
|
|
||||||
method?: string;
|
|
||||||
params?: { payload?: { text?: string } };
|
|
||||||
};
|
|
||||||
expect(cronCall.method).toBe("cron.add");
|
|
||||||
const text = cronCall.params?.payload?.text ?? "";
|
|
||||||
expect(text).toContain("Recent context:");
|
|
||||||
expect(text).toContain("User: Discussed Q2 budget");
|
|
||||||
expect(text).toContain("Assistant: We agreed to review on Tuesday.");
|
|
||||||
expect(text).toContain("User: Remind me about the thing at 2pm");
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
@@ -1,11 +1,8 @@
|
|||||||
import { Type } from "@sinclair/typebox";
|
import { Type } from "@sinclair/typebox";
|
||||||
import { normalizeCronJobCreate, normalizeCronJobPatch } from "../../cron/normalize.js";
|
import { normalizeCronJobCreate, normalizeCronJobPatch } from "../../cron/normalize.js";
|
||||||
import { loadConfig } from "../../config/config.js";
|
|
||||||
import { truncateUtf16Safe } from "../../utils.js";
|
|
||||||
import { optionalStringEnum, stringEnum } from "../schema/typebox.js";
|
import { optionalStringEnum, stringEnum } from "../schema/typebox.js";
|
||||||
import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
|
import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
|
||||||
import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
|
import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
|
||||||
import { resolveInternalSessionKey, resolveMainSessionAlias } from "./sessions-helpers.js";
|
|
||||||
|
|
||||||
// NOTE: We use Type.Object({}, { additionalProperties: true }) for job/patch
|
// NOTE: We use Type.Object({}, { additionalProperties: true }) for job/patch
|
||||||
// instead of CronAddParamsSchema/CronJobPatchSchema because the gateway schemas
|
// instead of CronAddParamsSchema/CronJobPatchSchema because the gateway schemas
|
||||||
@@ -16,11 +13,6 @@ const CRON_ACTIONS = ["status", "list", "add", "update", "remove", "run", "runs"
|
|||||||
|
|
||||||
const CRON_WAKE_MODES = ["now", "next-heartbeat"] as const;
|
const CRON_WAKE_MODES = ["now", "next-heartbeat"] as const;
|
||||||
|
|
||||||
const REMINDER_CONTEXT_MESSAGES = 3;
|
|
||||||
const REMINDER_CONTEXT_PER_MESSAGE_MAX = 220;
|
|
||||||
const REMINDER_CONTEXT_TOTAL_MAX = 700;
|
|
||||||
const REMINDER_CONTEXT_MARKER = "\n\nRecent context:\n";
|
|
||||||
|
|
||||||
// Flattened schema: runtime validates per-action requirements.
|
// Flattened schema: runtime validates per-action requirements.
|
||||||
const CronToolSchema = Type.Object({
|
const CronToolSchema = Type.Object({
|
||||||
action: stringEnum(CRON_ACTIONS),
|
action: stringEnum(CRON_ACTIONS),
|
||||||
@@ -36,90 +28,7 @@ const CronToolSchema = Type.Object({
|
|||||||
mode: optionalStringEnum(CRON_WAKE_MODES),
|
mode: optionalStringEnum(CRON_WAKE_MODES),
|
||||||
});
|
});
|
||||||
|
|
||||||
type CronToolOptions = {
|
export function createCronTool(): AnyAgentTool {
|
||||||
agentSessionKey?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type ChatMessage = {
|
|
||||||
role?: unknown;
|
|
||||||
content?: unknown;
|
|
||||||
};
|
|
||||||
|
|
||||||
function stripExistingContext(text: string) {
|
|
||||||
const index = text.indexOf(REMINDER_CONTEXT_MARKER);
|
|
||||||
if (index === -1) return text;
|
|
||||||
return text.slice(0, index).trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
function truncateText(input: string, maxLen: number) {
|
|
||||||
if (input.length <= maxLen) return input;
|
|
||||||
const truncated = truncateUtf16Safe(input, Math.max(0, maxLen - 3)).trimEnd();
|
|
||||||
return `${truncated}...`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeContextText(raw: string) {
|
|
||||||
return raw.replace(/\s+/g, " ").trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
function extractMessageText(message: ChatMessage): { role: string; text: string } | null {
|
|
||||||
const role = typeof message.role === "string" ? message.role : "";
|
|
||||||
if (role !== "user" && role !== "assistant") return null;
|
|
||||||
const content = message.content;
|
|
||||||
if (typeof content === "string") {
|
|
||||||
const normalized = normalizeContextText(content);
|
|
||||||
return normalized ? { role, text: normalized } : null;
|
|
||||||
}
|
|
||||||
if (!Array.isArray(content)) return null;
|
|
||||||
const chunks: string[] = [];
|
|
||||||
for (const block of content) {
|
|
||||||
if (!block || typeof block !== "object") continue;
|
|
||||||
if ((block as { type?: unknown }).type !== "text") continue;
|
|
||||||
const text = (block as { text?: unknown }).text;
|
|
||||||
if (typeof text === "string" && text.trim()) {
|
|
||||||
chunks.push(text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const joined = normalizeContextText(chunks.join(" "));
|
|
||||||
return joined ? { role, text: joined } : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function buildReminderContextLines(params: {
|
|
||||||
agentSessionKey?: string;
|
|
||||||
gatewayOpts: GatewayCallOptions;
|
|
||||||
}) {
|
|
||||||
const sessionKey = params.agentSessionKey?.trim();
|
|
||||||
if (!sessionKey) return [];
|
|
||||||
const cfg = loadConfig();
|
|
||||||
const { mainKey, alias } = resolveMainSessionAlias(cfg);
|
|
||||||
const resolvedKey = resolveInternalSessionKey({ key: sessionKey, alias, mainKey });
|
|
||||||
try {
|
|
||||||
const res = (await callGatewayTool("chat.history", params.gatewayOpts, {
|
|
||||||
sessionKey: resolvedKey,
|
|
||||||
limit: 12,
|
|
||||||
})) as { messages?: unknown[] };
|
|
||||||
const messages = Array.isArray(res?.messages) ? res.messages : [];
|
|
||||||
const parsed = messages
|
|
||||||
.map((msg) => extractMessageText(msg as ChatMessage))
|
|
||||||
.filter((msg): msg is { role: string; text: string } => Boolean(msg));
|
|
||||||
const recent = parsed.slice(-REMINDER_CONTEXT_MESSAGES);
|
|
||||||
if (recent.length === 0) return [];
|
|
||||||
const lines: string[] = [];
|
|
||||||
let total = 0;
|
|
||||||
for (const entry of recent) {
|
|
||||||
const label = entry.role === "user" ? "User" : "Assistant";
|
|
||||||
const text = truncateText(entry.text, REMINDER_CONTEXT_PER_MESSAGE_MAX);
|
|
||||||
const line = `- ${label}: ${text}`;
|
|
||||||
total += line.length;
|
|
||||||
if (total > REMINDER_CONTEXT_TOTAL_MAX) break;
|
|
||||||
lines.push(line);
|
|
||||||
}
|
|
||||||
return lines;
|
|
||||||
} catch {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
|
|
||||||
return {
|
return {
|
||||||
label: "Cron",
|
label: "Cron",
|
||||||
name: "cron",
|
name: "cron",
|
||||||
@@ -149,24 +58,6 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
|
|||||||
throw new Error("job required");
|
throw new Error("job required");
|
||||||
}
|
}
|
||||||
const job = normalizeCronJobCreate(params.job) ?? params.job;
|
const job = normalizeCronJobCreate(params.job) ?? params.job;
|
||||||
if (
|
|
||||||
job &&
|
|
||||||
typeof job === "object" &&
|
|
||||||
"payload" in job &&
|
|
||||||
(job as { payload?: { kind?: string; text?: string } }).payload?.kind === "systemEvent"
|
|
||||||
) {
|
|
||||||
const payload = (job as { payload: { kind: string; text: string } }).payload;
|
|
||||||
if (typeof payload.text === "string" && payload.text.trim()) {
|
|
||||||
const contextLines = await buildReminderContextLines({
|
|
||||||
agentSessionKey: opts?.agentSessionKey,
|
|
||||||
gatewayOpts,
|
|
||||||
});
|
|
||||||
if (contextLines.length > 0) {
|
|
||||||
const baseText = stripExistingContext(payload.text);
|
|
||||||
payload.text = `${baseText}${REMINDER_CONTEXT_MARKER}${contextLines.join("\n")}`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return jsonResult(await callGatewayTool("cron.add", gatewayOpts, job));
|
return jsonResult(await callGatewayTool("cron.add", gatewayOpts, job));
|
||||||
}
|
}
|
||||||
case "update": {
|
case "update": {
|
||||||
|
|||||||
@@ -219,7 +219,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult({ ok: true, event });
|
return jsonResult({ ok: true, event });
|
||||||
}
|
}
|
||||||
case "channelCreate": {
|
case "channelCreate": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const guildId = readStringParam(params, "guildId", { required: true });
|
const guildId = readStringParam(params, "guildId", { required: true });
|
||||||
@@ -241,7 +241,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult({ ok: true, channel });
|
return jsonResult({ ok: true, channel });
|
||||||
}
|
}
|
||||||
case "channelEdit": {
|
case "channelEdit": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const channelId = readStringParam(params, "channelId", {
|
const channelId = readStringParam(params, "channelId", {
|
||||||
@@ -267,7 +267,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult({ ok: true, channel });
|
return jsonResult({ ok: true, channel });
|
||||||
}
|
}
|
||||||
case "channelDelete": {
|
case "channelDelete": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const channelId = readStringParam(params, "channelId", {
|
const channelId = readStringParam(params, "channelId", {
|
||||||
@@ -277,7 +277,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult(result);
|
return jsonResult(result);
|
||||||
}
|
}
|
||||||
case "channelMove": {
|
case "channelMove": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const guildId = readStringParam(params, "guildId", { required: true });
|
const guildId = readStringParam(params, "guildId", { required: true });
|
||||||
@@ -295,7 +295,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult({ ok: true });
|
return jsonResult({ ok: true });
|
||||||
}
|
}
|
||||||
case "categoryCreate": {
|
case "categoryCreate": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const guildId = readStringParam(params, "guildId", { required: true });
|
const guildId = readStringParam(params, "guildId", { required: true });
|
||||||
@@ -310,7 +310,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult({ ok: true, category: channel });
|
return jsonResult({ ok: true, category: channel });
|
||||||
}
|
}
|
||||||
case "categoryEdit": {
|
case "categoryEdit": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const categoryId = readStringParam(params, "categoryId", {
|
const categoryId = readStringParam(params, "categoryId", {
|
||||||
@@ -326,7 +326,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult({ ok: true, category: channel });
|
return jsonResult({ ok: true, category: channel });
|
||||||
}
|
}
|
||||||
case "categoryDelete": {
|
case "categoryDelete": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const categoryId = readStringParam(params, "categoryId", {
|
const categoryId = readStringParam(params, "categoryId", {
|
||||||
@@ -336,7 +336,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult(result);
|
return jsonResult(result);
|
||||||
}
|
}
|
||||||
case "channelPermissionSet": {
|
case "channelPermissionSet": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const channelId = readStringParam(params, "channelId", {
|
const channelId = readStringParam(params, "channelId", {
|
||||||
@@ -359,7 +359,7 @@ export async function handleDiscordGuildAction(
|
|||||||
return jsonResult({ ok: true });
|
return jsonResult({ ok: true });
|
||||||
}
|
}
|
||||||
case "channelPermissionRemove": {
|
case "channelPermissionRemove": {
|
||||||
if (!isActionEnabled("channels")) {
|
if (!isActionEnabled("channels", false)) {
|
||||||
throw new Error("Discord channel management is disabled.");
|
throw new Error("Discord channel management is disabled.");
|
||||||
}
|
}
|
||||||
const channelId = readStringParam(params, "channelId", {
|
const channelId = readStringParam(params, "channelId", {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import type { VerboseLevel } from "../thinking.js";
|
|||||||
import { isSilentReplyText, SILENT_REPLY_TOKEN } from "../tokens.js";
|
import { isSilentReplyText, SILENT_REPLY_TOKEN } from "../tokens.js";
|
||||||
import type { GetReplyOptions, ReplyPayload } from "../types.js";
|
import type { GetReplyOptions, ReplyPayload } from "../types.js";
|
||||||
import { buildThreadingToolContext, resolveEnforceFinalTag } from "./agent-runner-utils.js";
|
import { buildThreadingToolContext, resolveEnforceFinalTag } from "./agent-runner-utils.js";
|
||||||
import { createBlockReplyPayloadKey, type BlockReplyPipeline } from "./block-reply-pipeline.js";
|
import type { BlockReplyPipeline } from "./block-reply-pipeline.js";
|
||||||
import type { FollowupRun } from "./queue.js";
|
import type { FollowupRun } from "./queue.js";
|
||||||
import { parseReplyDirectives } from "./reply-directives.js";
|
import { parseReplyDirectives } from "./reply-directives.js";
|
||||||
import { applyReplyTagsToPayload, isRenderablePayload } from "./reply-payloads.js";
|
import { applyReplyTagsToPayload, isRenderablePayload } from "./reply-payloads.js";
|
||||||
@@ -40,8 +40,6 @@ export type AgentRunLoopResult =
|
|||||||
fallbackModel?: string;
|
fallbackModel?: string;
|
||||||
didLogHeartbeatStrip: boolean;
|
didLogHeartbeatStrip: boolean;
|
||||||
autoCompactionCompleted: boolean;
|
autoCompactionCompleted: boolean;
|
||||||
/** Payload keys sent directly (not via pipeline) during tool flush. */
|
|
||||||
directlySentBlockKeys?: Set<string>;
|
|
||||||
}
|
}
|
||||||
| { kind: "final"; payload: ReplyPayload };
|
| { kind: "final"; payload: ReplyPayload };
|
||||||
|
|
||||||
@@ -72,8 +70,6 @@ export async function runAgentTurnWithFallback(params: {
|
|||||||
}): Promise<AgentRunLoopResult> {
|
}): Promise<AgentRunLoopResult> {
|
||||||
let didLogHeartbeatStrip = false;
|
let didLogHeartbeatStrip = false;
|
||||||
let autoCompactionCompleted = false;
|
let autoCompactionCompleted = false;
|
||||||
// Track payloads sent directly (not via pipeline) during tool flush to avoid duplicates.
|
|
||||||
const directlySentBlockKeys = new Set<string>();
|
|
||||||
|
|
||||||
const runId = crypto.randomUUID();
|
const runId = crypto.randomUUID();
|
||||||
if (params.sessionKey) {
|
if (params.sessionKey) {
|
||||||
@@ -248,13 +244,12 @@ export async function runAgentTurnWithFallback(params: {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
onAgentEvent: async (evt) => {
|
onAgentEvent: (evt) => {
|
||||||
// Trigger typing when tools start executing.
|
// Trigger typing when tools start executing
|
||||||
// Must await to ensure typing indicator starts before tool summaries are emitted.
|
|
||||||
if (evt.stream === "tool") {
|
if (evt.stream === "tool") {
|
||||||
const phase = typeof evt.data.phase === "string" ? evt.data.phase : "";
|
const phase = typeof evt.data.phase === "string" ? evt.data.phase : "";
|
||||||
if (phase === "start" || phase === "update") {
|
if (phase === "start" || phase === "update") {
|
||||||
await params.typingSignals.signalToolStart();
|
void params.typingSignals.signalToolStart();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Track auto-compaction completion
|
// Track auto-compaction completion
|
||||||
@@ -266,67 +261,57 @@ export async function runAgentTurnWithFallback(params: {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// Always pass onBlockReply so flushBlockReplyBuffer works before tool execution,
|
onBlockReply:
|
||||||
// even when regular block streaming is disabled. The handler sends directly
|
params.blockStreamingEnabled && params.opts?.onBlockReply
|
||||||
// via opts.onBlockReply when the pipeline isn't available.
|
? async (payload) => {
|
||||||
onBlockReply: params.opts?.onBlockReply
|
const { text, skip } = normalizeStreamingText(payload);
|
||||||
? async (payload) => {
|
const hasPayloadMedia = (payload.mediaUrls?.length ?? 0) > 0;
|
||||||
const { text, skip } = normalizeStreamingText(payload);
|
if (skip && !hasPayloadMedia) return;
|
||||||
const hasPayloadMedia = (payload.mediaUrls?.length ?? 0) > 0;
|
const taggedPayload = applyReplyTagsToPayload(
|
||||||
if (skip && !hasPayloadMedia) return;
|
{
|
||||||
const taggedPayload = applyReplyTagsToPayload(
|
text,
|
||||||
{
|
mediaUrls: payload.mediaUrls,
|
||||||
text,
|
mediaUrl: payload.mediaUrls?.[0],
|
||||||
mediaUrls: payload.mediaUrls,
|
},
|
||||||
mediaUrl: payload.mediaUrls?.[0],
|
params.sessionCtx.MessageSid,
|
||||||
},
|
);
|
||||||
params.sessionCtx.MessageSid,
|
// Let through payloads with audioAsVoice flag even if empty (need to track it)
|
||||||
);
|
if (!isRenderablePayload(taggedPayload) && !payload.audioAsVoice) return;
|
||||||
// Let through payloads with audioAsVoice flag even if empty (need to track it)
|
const parsed = parseReplyDirectives(taggedPayload.text ?? "", {
|
||||||
if (!isRenderablePayload(taggedPayload) && !payload.audioAsVoice) return;
|
currentMessageId: params.sessionCtx.MessageSid,
|
||||||
const parsed = parseReplyDirectives(taggedPayload.text ?? "", {
|
silentToken: SILENT_REPLY_TOKEN,
|
||||||
currentMessageId: params.sessionCtx.MessageSid,
|
});
|
||||||
silentToken: SILENT_REPLY_TOKEN,
|
const cleaned = parsed.text || undefined;
|
||||||
});
|
const hasRenderableMedia =
|
||||||
const cleaned = parsed.text || undefined;
|
Boolean(taggedPayload.mediaUrl) || (taggedPayload.mediaUrls?.length ?? 0) > 0;
|
||||||
const hasRenderableMedia =
|
// Skip empty payloads unless they have audioAsVoice flag (need to track it)
|
||||||
Boolean(taggedPayload.mediaUrl) || (taggedPayload.mediaUrls?.length ?? 0) > 0;
|
if (
|
||||||
// Skip empty payloads unless they have audioAsVoice flag (need to track it)
|
!cleaned &&
|
||||||
if (
|
!hasRenderableMedia &&
|
||||||
!cleaned &&
|
!payload.audioAsVoice &&
|
||||||
!hasRenderableMedia &&
|
!parsed.audioAsVoice
|
||||||
!payload.audioAsVoice &&
|
)
|
||||||
!parsed.audioAsVoice
|
return;
|
||||||
)
|
if (parsed.isSilent && !hasRenderableMedia) return;
|
||||||
return;
|
|
||||||
if (parsed.isSilent && !hasRenderableMedia) return;
|
|
||||||
|
|
||||||
const blockPayload: ReplyPayload = params.applyReplyToMode({
|
const blockPayload: ReplyPayload = params.applyReplyToMode({
|
||||||
...taggedPayload,
|
...taggedPayload,
|
||||||
text: cleaned,
|
text: cleaned,
|
||||||
audioAsVoice: Boolean(parsed.audioAsVoice || payload.audioAsVoice),
|
audioAsVoice: Boolean(parsed.audioAsVoice || payload.audioAsVoice),
|
||||||
replyToId: taggedPayload.replyToId ?? parsed.replyToId,
|
replyToId: taggedPayload.replyToId ?? parsed.replyToId,
|
||||||
replyToTag: taggedPayload.replyToTag || parsed.replyToTag,
|
replyToTag: taggedPayload.replyToTag || parsed.replyToTag,
|
||||||
replyToCurrent: taggedPayload.replyToCurrent || parsed.replyToCurrent,
|
replyToCurrent: taggedPayload.replyToCurrent || parsed.replyToCurrent,
|
||||||
});
|
|
||||||
|
|
||||||
void params.typingSignals
|
|
||||||
.signalTextDelta(cleaned ?? taggedPayload.text)
|
|
||||||
.catch((err) => {
|
|
||||||
logVerbose(`block reply typing signal failed: ${String(err)}`);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Use pipeline if available (block streaming enabled), otherwise send directly
|
void params.typingSignals
|
||||||
if (params.blockStreamingEnabled && params.blockReplyPipeline) {
|
.signalTextDelta(cleaned ?? taggedPayload.text)
|
||||||
params.blockReplyPipeline.enqueue(blockPayload);
|
.catch((err) => {
|
||||||
} else {
|
logVerbose(`block reply typing signal failed: ${String(err)}`);
|
||||||
// Send directly when flushing before tool execution (no streaming).
|
});
|
||||||
// Track sent key to avoid duplicate in final payloads.
|
|
||||||
directlySentBlockKeys.add(createBlockReplyPayloadKey(blockPayload));
|
params.blockReplyPipeline?.enqueue(blockPayload);
|
||||||
await params.opts?.onBlockReply?.(blockPayload);
|
|
||||||
}
|
}
|
||||||
}
|
: undefined,
|
||||||
: undefined,
|
|
||||||
onBlockReplyFlush:
|
onBlockReplyFlush:
|
||||||
params.blockStreamingEnabled && blockReplyPipeline
|
params.blockStreamingEnabled && blockReplyPipeline
|
||||||
? async () => {
|
? async () => {
|
||||||
@@ -462,6 +447,5 @@ export async function runAgentTurnWithFallback(params: {
|
|||||||
fallbackModel,
|
fallbackModel,
|
||||||
didLogHeartbeatStrip,
|
didLogHeartbeatStrip,
|
||||||
autoCompactionCompleted,
|
autoCompactionCompleted,
|
||||||
directlySentBlockKeys: directlySentBlockKeys.size > 0 ? directlySentBlockKeys : undefined,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,7 @@ import type { OriginatingChannelType } from "../templating.js";
|
|||||||
import { SILENT_REPLY_TOKEN } from "../tokens.js";
|
import { SILENT_REPLY_TOKEN } from "../tokens.js";
|
||||||
import type { ReplyPayload } from "../types.js";
|
import type { ReplyPayload } from "../types.js";
|
||||||
import { formatBunFetchSocketError, isBunFetchSocketError } from "./agent-runner-utils.js";
|
import { formatBunFetchSocketError, isBunFetchSocketError } from "./agent-runner-utils.js";
|
||||||
import { createBlockReplyPayloadKey, type BlockReplyPipeline } from "./block-reply-pipeline.js";
|
import type { BlockReplyPipeline } from "./block-reply-pipeline.js";
|
||||||
import { parseReplyDirectives } from "./reply-directives.js";
|
import { parseReplyDirectives } from "./reply-directives.js";
|
||||||
import {
|
import {
|
||||||
applyReplyThreading,
|
applyReplyThreading,
|
||||||
@@ -20,8 +20,6 @@ export function buildReplyPayloads(params: {
|
|||||||
didLogHeartbeatStrip: boolean;
|
didLogHeartbeatStrip: boolean;
|
||||||
blockStreamingEnabled: boolean;
|
blockStreamingEnabled: boolean;
|
||||||
blockReplyPipeline: BlockReplyPipeline | null;
|
blockReplyPipeline: BlockReplyPipeline | null;
|
||||||
/** Payload keys sent directly (not via pipeline) during tool flush. */
|
|
||||||
directlySentBlockKeys?: Set<string>;
|
|
||||||
replyToMode: ReplyToMode;
|
replyToMode: ReplyToMode;
|
||||||
replyToChannel?: OriginatingChannelType;
|
replyToChannel?: OriginatingChannelType;
|
||||||
currentMessageId?: string;
|
currentMessageId?: string;
|
||||||
@@ -100,16 +98,11 @@ export function buildReplyPayloads(params: {
|
|||||||
payloads: replyTaggedPayloads,
|
payloads: replyTaggedPayloads,
|
||||||
sentTexts: messagingToolSentTexts,
|
sentTexts: messagingToolSentTexts,
|
||||||
});
|
});
|
||||||
// Filter out payloads already sent via pipeline or directly during tool flush.
|
|
||||||
const filteredPayloads = shouldDropFinalPayloads
|
const filteredPayloads = shouldDropFinalPayloads
|
||||||
? []
|
? []
|
||||||
: params.blockStreamingEnabled
|
: params.blockStreamingEnabled
|
||||||
? dedupedPayloads.filter((payload) => !params.blockReplyPipeline?.hasSentPayload(payload))
|
? dedupedPayloads.filter((payload) => !params.blockReplyPipeline?.hasSentPayload(payload))
|
||||||
: params.directlySentBlockKeys?.size
|
: dedupedPayloads;
|
||||||
? dedupedPayloads.filter(
|
|
||||||
(payload) => !params.directlySentBlockKeys!.has(createBlockReplyPayloadKey(payload)),
|
|
||||||
)
|
|
||||||
: dedupedPayloads;
|
|
||||||
const replyPayloads = suppressMessagingToolReplies ? [] : filteredPayloads;
|
const replyPayloads = suppressMessagingToolReplies ? [] : filteredPayloads;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -272,7 +272,7 @@ export async function runReplyAgent(params: {
|
|||||||
return finalizeWithFollowup(runOutcome.payload, queueKey, runFollowupTurn);
|
return finalizeWithFollowup(runOutcome.payload, queueKey, runFollowupTurn);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { runResult, fallbackProvider, fallbackModel, directlySentBlockKeys } = runOutcome;
|
const { runResult, fallbackProvider, fallbackModel } = runOutcome;
|
||||||
let { didLogHeartbeatStrip, autoCompactionCompleted } = runOutcome;
|
let { didLogHeartbeatStrip, autoCompactionCompleted } = runOutcome;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
@@ -314,7 +314,6 @@ export async function runReplyAgent(params: {
|
|||||||
didLogHeartbeatStrip,
|
didLogHeartbeatStrip,
|
||||||
blockStreamingEnabled,
|
blockStreamingEnabled,
|
||||||
blockReplyPipeline,
|
blockReplyPipeline,
|
||||||
directlySentBlockKeys,
|
|
||||||
replyToMode,
|
replyToMode,
|
||||||
replyToChannel,
|
replyToChannel,
|
||||||
currentMessageId: sessionCtx.MessageSid,
|
currentMessageId: sessionCtx.MessageSid,
|
||||||
|
|||||||
@@ -13,9 +13,6 @@ export type BrowserStatus = {
|
|||||||
cdpPort: number;
|
cdpPort: number;
|
||||||
cdpUrl?: string;
|
cdpUrl?: string;
|
||||||
chosenBrowser: string | null;
|
chosenBrowser: string | null;
|
||||||
detectedBrowser?: string | null;
|
|
||||||
detectedExecutablePath?: string | null;
|
|
||||||
detectError?: string | null;
|
|
||||||
userDataDir: string | null;
|
userDataDir: string | null;
|
||||||
color: string;
|
color: string;
|
||||||
headless: boolean;
|
headless: boolean;
|
||||||
|
|||||||
@@ -63,11 +63,7 @@ export async function requirePwAi(
|
|||||||
jsonError(
|
jsonError(
|
||||||
res,
|
res,
|
||||||
501,
|
501,
|
||||||
[
|
`Playwright is not available in this gateway build; '${feature}' is unsupported.`,
|
||||||
`Playwright is not available in this gateway build; '${feature}' is unsupported.`,
|
|
||||||
"Install the full Playwright package (not playwright-core) and restart the gateway, or reinstall with browser support.",
|
|
||||||
"Docs: /tools/browser#playwright-requirement",
|
|
||||||
].join("\n"),
|
|
||||||
);
|
);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import type express from "express";
|
import type express from "express";
|
||||||
|
|
||||||
import { resolveBrowserExecutableForPlatform } from "../chrome.executables.js";
|
|
||||||
import { createBrowserProfilesService } from "../profiles-service.js";
|
import { createBrowserProfilesService } from "../profiles-service.js";
|
||||||
import type { BrowserRouteContext } from "../server-context.js";
|
import type { BrowserRouteContext } from "../server-context.js";
|
||||||
import { getProfileContext, jsonError, toStringOrEmpty } from "./utils.js";
|
import { getProfileContext, jsonError, toStringOrEmpty } from "./utils.js";
|
||||||
@@ -37,19 +36,6 @@ export function registerBrowserBasicRoutes(app: express.Express, ctx: BrowserRou
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
const profileState = current.profiles.get(profileCtx.profile.name);
|
const profileState = current.profiles.get(profileCtx.profile.name);
|
||||||
let detectedBrowser: string | null = null;
|
|
||||||
let detectedExecutablePath: string | null = null;
|
|
||||||
let detectError: string | null = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const detected = resolveBrowserExecutableForPlatform(current.resolved, process.platform);
|
|
||||||
if (detected) {
|
|
||||||
detectedBrowser = detected.kind;
|
|
||||||
detectedExecutablePath = detected.path;
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
detectError = String(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
enabled: current.resolved.enabled,
|
enabled: current.resolved.enabled,
|
||||||
@@ -62,9 +48,6 @@ export function registerBrowserBasicRoutes(app: express.Express, ctx: BrowserRou
|
|||||||
cdpPort: profileCtx.profile.cdpPort,
|
cdpPort: profileCtx.profile.cdpPort,
|
||||||
cdpUrl: profileCtx.profile.cdpUrl,
|
cdpUrl: profileCtx.profile.cdpUrl,
|
||||||
chosenBrowser: profileState?.running?.exe.kind ?? null,
|
chosenBrowser: profileState?.running?.exe.kind ?? null,
|
||||||
detectedBrowser,
|
|
||||||
detectedExecutablePath,
|
|
||||||
detectError,
|
|
||||||
userDataDir: profileState?.running?.userDataDir ?? null,
|
userDataDir: profileState?.running?.userDataDir ?? null,
|
||||||
color: profileCtx.profile.color,
|
color: profileCtx.profile.color,
|
||||||
headless: current.resolved.headless,
|
headless: current.resolved.headless,
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
e8286176aaf2c0daf5f4b30dd221c3d7aa1aec8329d6865cac3d9636fd7f08f6
|
7a41e2cbe78e007eeaa03a65e18b8edf3fe17263de427426eaf58e946728eaf6
|
||||||
+17439
-15246
File diff suppressed because it is too large.
Load diff
@@ -1,24 +0,0 @@
|
|||||||
import { describe, expect, it } from "vitest";
|
|
||||||
|
|
||||||
import type { ClawdbotConfig } from "../../../config/config.js";
|
|
||||||
import { discordMessageActions } from "./discord.js";
|
|
||||||
|
|
||||||
describe("discord message actions", () => {
|
|
||||||
it("lists channel and upload actions by default", () => {
|
|
||||||
const cfg = { channels: { discord: { token: "d0" } } } as ClawdbotConfig;
|
|
||||||
const actions = discordMessageActions.listActions?.({ cfg }) ?? [];
|
|
||||||
|
|
||||||
expect(actions).toContain("emoji-upload");
|
|
||||||
expect(actions).toContain("sticker-upload");
|
|
||||||
expect(actions).toContain("channel-create");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("respects disabled channel actions", () => {
|
|
||||||
const cfg = {
|
|
||||||
channels: { discord: { token: "d0", actions: { channels: false } } },
|
|
||||||
} as ClawdbotConfig;
|
|
||||||
const actions = discordMessageActions.listActions?.({ cfg }) ?? [];
|
|
||||||
|
|
||||||
expect(actions).not.toContain("channel-create");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -47,7 +47,7 @@ export const discordMessageActions: ChannelMessageActionAdapter = {
|
|||||||
actions.add("channel-info");
|
actions.add("channel-info");
|
||||||
actions.add("channel-list");
|
actions.add("channel-list");
|
||||||
}
|
}
|
||||||
if (gate("channels")) {
|
if (gate("channels", false)) {
|
||||||
actions.add("channel-create");
|
actions.add("channel-create");
|
||||||
actions.add("channel-edit");
|
actions.add("channel-edit");
|
||||||
actions.add("channel-delete");
|
actions.add("channel-delete");
|
||||||
|
|||||||
@@ -47,10 +47,7 @@ export function registerBrowserManageCommands(
|
|||||||
`cdpPort: ${status.cdpPort}`,
|
`cdpPort: ${status.cdpPort}`,
|
||||||
`cdpUrl: ${status.cdpUrl ?? `http://127.0.0.1:${status.cdpPort}`}`,
|
`cdpUrl: ${status.cdpUrl ?? `http://127.0.0.1:${status.cdpPort}`}`,
|
||||||
`browser: ${status.chosenBrowser ?? "unknown"}`,
|
`browser: ${status.chosenBrowser ?? "unknown"}`,
|
||||||
`detectedBrowser: ${status.detectedBrowser ?? "unknown"}`,
|
|
||||||
`detectedPath: ${status.detectedExecutablePath ?? status.executablePath ?? "auto"}`,
|
|
||||||
`profileColor: ${status.color}`,
|
`profileColor: ${status.color}`,
|
||||||
...(status.detectError ? [`detectError: ${status.detectError}`] : []),
|
|
||||||
].join("\n"),
|
].join("\n"),
|
||||||
);
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -1,297 +0,0 @@
|
|||||||
import JSON5 from "json5";
|
|
||||||
import type { Command } from "commander";
|
|
||||||
|
|
||||||
import { readConfigFileSnapshot, writeConfigFile } from "../config/config.js";
|
|
||||||
import { danger, info } from "../globals.js";
|
|
||||||
import { defaultRuntime } from "../runtime.js";
|
|
||||||
import { formatDocsLink } from "../terminal/links.js";
|
|
||||||
import { theme } from "../terminal/theme.js";
|
|
||||||
|
|
||||||
type PathSegment = string;
|
|
||||||
|
|
||||||
function isIndexSegment(raw: string): boolean {
|
|
||||||
return /^[0-9]+$/.test(raw);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parsePath(raw: string): PathSegment[] {
|
|
||||||
const trimmed = raw.trim();
|
|
||||||
if (!trimmed) return [];
|
|
||||||
const parts: string[] = [];
|
|
||||||
let current = "";
|
|
||||||
let i = 0;
|
|
||||||
while (i < trimmed.length) {
|
|
||||||
const ch = trimmed[i];
|
|
||||||
if (ch === "\\") {
|
|
||||||
const next = trimmed[i + 1];
|
|
||||||
if (next) current += next;
|
|
||||||
i += 2;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (ch === ".") {
|
|
||||||
if (current) parts.push(current);
|
|
||||||
current = "";
|
|
||||||
i += 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (ch === "[") {
|
|
||||||
if (current) parts.push(current);
|
|
||||||
current = "";
|
|
||||||
const close = trimmed.indexOf("]", i);
|
|
||||||
if (close === -1) throw new Error(`Invalid path (missing "]"): ${raw}`);
|
|
||||||
const inside = trimmed.slice(i + 1, close).trim();
|
|
||||||
if (!inside) throw new Error(`Invalid path (empty "[]"): ${raw}`);
|
|
||||||
parts.push(inside);
|
|
||||||
i = close + 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
current += ch;
|
|
||||||
i += 1;
|
|
||||||
}
|
|
||||||
if (current) parts.push(current);
|
|
||||||
return parts.map((part) => part.trim()).filter(Boolean);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseValue(raw: string, opts: { json?: boolean }): unknown {
|
|
||||||
const trimmed = raw.trim();
|
|
||||||
if (opts.json) {
|
|
||||||
try {
|
|
||||||
return JSON5.parse(trimmed);
|
|
||||||
} catch (err) {
|
|
||||||
throw new Error(`Failed to parse JSON5 value: ${String(err)}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
return JSON5.parse(trimmed);
|
|
||||||
} catch {
|
|
||||||
return raw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getAtPath(root: unknown, path: PathSegment[]): { found: boolean; value?: unknown } {
|
|
||||||
let current: unknown = root;
|
|
||||||
for (const segment of path) {
|
|
||||||
if (!current || typeof current !== "object") return { found: false };
|
|
||||||
if (Array.isArray(current)) {
|
|
||||||
if (!isIndexSegment(segment)) return { found: false };
|
|
||||||
const index = Number.parseInt(segment, 10);
|
|
||||||
if (!Number.isFinite(index) || index < 0 || index >= current.length) {
|
|
||||||
return { found: false };
|
|
||||||
}
|
|
||||||
current = current[index];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const record = current as Record<string, unknown>;
|
|
||||||
if (!(segment in record)) return { found: false };
|
|
||||||
current = record[segment];
|
|
||||||
}
|
|
||||||
return { found: true, value: current };
|
|
||||||
}
|
|
||||||
|
|
||||||
function setAtPath(root: Record<string, unknown>, path: PathSegment[], value: unknown): void {
|
|
||||||
let current: unknown = root;
|
|
||||||
for (let i = 0; i < path.length - 1; i += 1) {
|
|
||||||
const segment = path[i];
|
|
||||||
const next = path[i + 1];
|
|
||||||
const nextIsIndex = Boolean(next && isIndexSegment(next));
|
|
||||||
if (Array.isArray(current)) {
|
|
||||||
if (!isIndexSegment(segment)) {
|
|
||||||
throw new Error(`Expected numeric index for array segment "${segment}"`);
|
|
||||||
}
|
|
||||||
const index = Number.parseInt(segment, 10);
|
|
||||||
const existing = current[index];
|
|
||||||
if (!existing || typeof existing !== "object") {
|
|
||||||
current[index] = nextIsIndex ? [] : {};
|
|
||||||
}
|
|
||||||
current = current[index];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!current || typeof current !== "object") {
|
|
||||||
throw new Error(`Cannot traverse into "${segment}" (not an object)`);
|
|
||||||
}
|
|
||||||
const record = current as Record<string, unknown>;
|
|
||||||
const existing = record[segment];
|
|
||||||
if (!existing || typeof existing !== "object") {
|
|
||||||
record[segment] = nextIsIndex ? [] : {};
|
|
||||||
}
|
|
||||||
current = record[segment];
|
|
||||||
}
|
|
||||||
|
|
||||||
const last = path[path.length - 1];
|
|
||||||
if (Array.isArray(current)) {
|
|
||||||
if (!isIndexSegment(last)) {
|
|
||||||
throw new Error(`Expected numeric index for array segment "${last}"`);
|
|
||||||
}
|
|
||||||
const index = Number.parseInt(last, 10);
|
|
||||||
current[index] = value;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!current || typeof current !== "object") {
|
|
||||||
throw new Error(`Cannot set "${last}" (parent is not an object)`);
|
|
||||||
}
|
|
||||||
(current as Record<string, unknown>)[last] = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
function unsetAtPath(root: Record<string, unknown>, path: PathSegment[]): boolean {
|
|
||||||
let current: unknown = root;
|
|
||||||
for (let i = 0; i < path.length - 1; i += 1) {
|
|
||||||
const segment = path[i];
|
|
||||||
if (!current || typeof current !== "object") return false;
|
|
||||||
if (Array.isArray(current)) {
|
|
||||||
if (!isIndexSegment(segment)) return false;
|
|
||||||
const index = Number.parseInt(segment, 10);
|
|
||||||
if (!Number.isFinite(index) || index < 0 || index >= current.length) return false;
|
|
||||||
current = current[index];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const record = current as Record<string, unknown>;
|
|
||||||
if (!(segment in record)) return false;
|
|
||||||
current = record[segment];
|
|
||||||
}
|
|
||||||
|
|
||||||
const last = path[path.length - 1];
|
|
||||||
if (Array.isArray(current)) {
|
|
||||||
if (!isIndexSegment(last)) return false;
|
|
||||||
const index = Number.parseInt(last, 10);
|
|
||||||
if (!Number.isFinite(index) || index < 0 || index >= current.length) return false;
|
|
||||||
current.splice(index, 1);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (!current || typeof current !== "object") return false;
|
|
||||||
const record = current as Record<string, unknown>;
|
|
||||||
if (!(last in record)) return false;
|
|
||||||
delete record[last];
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadValidConfig() {
|
|
||||||
const snapshot = await readConfigFileSnapshot();
|
|
||||||
if (snapshot.valid) return snapshot;
|
|
||||||
defaultRuntime.error(`Config invalid at ${snapshot.path}.`);
|
|
||||||
for (const issue of snapshot.issues) {
|
|
||||||
defaultRuntime.error(`- ${issue.path || "<root>"}: ${issue.message}`);
|
|
||||||
}
|
|
||||||
defaultRuntime.error("Run `clawdbot doctor` to repair, then retry.");
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
return snapshot;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function registerConfigCli(program: Command) {
|
|
||||||
const cmd = program
|
|
||||||
.command("config")
|
|
||||||
.description("Config helpers (get/set/unset). Run without subcommand for the wizard.")
|
|
||||||
.addHelpText(
|
|
||||||
"after",
|
|
||||||
() =>
|
|
||||||
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/config", "docs.clawd.bot/cli/config")}\n`,
|
|
||||||
)
|
|
||||||
.option(
|
|
||||||
"--section <section>",
|
|
||||||
"Configure wizard sections (repeatable). Use with no subcommand.",
|
|
||||||
(value: string, previous: string[]) => [...previous, value],
|
|
||||||
[] as string[],
|
|
||||||
)
|
|
||||||
.action(async (opts) => {
|
|
||||||
const { CONFIGURE_WIZARD_SECTIONS, configureCommand, configureCommandWithSections } =
|
|
||||||
await import("../commands/configure.js");
|
|
||||||
const sections: string[] = Array.isArray(opts.section)
|
|
||||||
? opts.section
|
|
||||||
.map((value: unknown) => (typeof value === "string" ? value.trim() : ""))
|
|
||||||
.filter(Boolean)
|
|
||||||
: [];
|
|
||||||
if (sections.length === 0) {
|
|
||||||
await configureCommand(defaultRuntime);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const invalid = sections.filter((s) => !CONFIGURE_WIZARD_SECTIONS.includes(s as never));
|
|
||||||
if (invalid.length > 0) {
|
|
||||||
defaultRuntime.error(
|
|
||||||
`Invalid --section: ${invalid.join(", ")}. Expected one of: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}.`,
|
|
||||||
);
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await configureCommandWithSections(sections as never, defaultRuntime);
|
|
||||||
});
|
|
||||||
|
|
||||||
cmd
|
|
||||||
.command("get")
|
|
||||||
.description("Get a config value by dot path")
|
|
||||||
.argument("<path>", "Config path (dot or bracket notation)")
|
|
||||||
.option("--json", "Output JSON", false)
|
|
||||||
.action(async (path: string, opts) => {
|
|
||||||
try {
|
|
||||||
const parsedPath = parsePath(path);
|
|
||||||
if (parsedPath.length === 0) {
|
|
||||||
throw new Error("Path is empty.");
|
|
||||||
}
|
|
||||||
const snapshot = await loadValidConfig();
|
|
||||||
const res = getAtPath(snapshot.config, parsedPath);
|
|
||||||
if (!res.found) {
|
|
||||||
defaultRuntime.error(danger(`Config path not found: ${path}`));
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (opts.json) {
|
|
||||||
defaultRuntime.log(JSON.stringify(res.value ?? null, null, 2));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (typeof res.value === "string" || typeof res.value === "number" || typeof res.value === "boolean") {
|
|
||||||
defaultRuntime.log(String(res.value));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
defaultRuntime.log(JSON.stringify(res.value ?? null, null, 2));
|
|
||||||
} catch (err) {
|
|
||||||
defaultRuntime.error(danger(String(err)));
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
cmd
|
|
||||||
.command("set")
|
|
||||||
.description("Set a config value by dot path")
|
|
||||||
.argument("<path>", "Config path (dot or bracket notation)")
|
|
||||||
.argument("<value>", "Value (JSON5 or raw string)")
|
|
||||||
.option("--json", "Parse value as JSON5 (required)", false)
|
|
||||||
.action(async (path: string, value: string, opts) => {
|
|
||||||
try {
|
|
||||||
const parsedPath = parsePath(path);
|
|
||||||
if (parsedPath.length === 0) throw new Error("Path is empty.");
|
|
||||||
const parsedValue = parseValue(value, opts);
|
|
||||||
const snapshot = await loadValidConfig();
|
|
||||||
const next = snapshot.config as Record<string, unknown>;
|
|
||||||
setAtPath(next, parsedPath, parsedValue);
|
|
||||||
await writeConfigFile(next);
|
|
||||||
defaultRuntime.log(info(`Updated ${path}. Restart the gateway to apply.`));
|
|
||||||
} catch (err) {
|
|
||||||
defaultRuntime.error(danger(String(err)));
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
cmd
|
|
||||||
.command("unset")
|
|
||||||
.description("Remove a config value by dot path")
|
|
||||||
.argument("<path>", "Config path (dot or bracket notation)")
|
|
||||||
.action(async (path: string) => {
|
|
||||||
try {
|
|
||||||
const parsedPath = parsePath(path);
|
|
||||||
if (parsedPath.length === 0) throw new Error("Path is empty.");
|
|
||||||
const snapshot = await loadValidConfig();
|
|
||||||
const next = snapshot.config as Record<string, unknown>;
|
|
||||||
const removed = unsetAtPath(next, parsedPath);
|
|
||||||
if (!removed) {
|
|
||||||
defaultRuntime.error(danger(`Config path not found: ${path}`));
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
await writeConfigFile(next);
|
|
||||||
defaultRuntime.log(info(`Removed ${path}. Restart the gateway to apply.`));
|
|
||||||
} catch (err) {
|
|
||||||
defaultRuntime.error(danger(String(err)));
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
+3
-156
@@ -1,17 +1,10 @@
|
|||||||
import fs from "node:fs";
|
import fs from "node:fs";
|
||||||
import fsp from "node:fs/promises";
|
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import chalk from "chalk";
|
import chalk from "chalk";
|
||||||
import type { Command } from "commander";
|
import type { Command } from "commander";
|
||||||
|
|
||||||
import { loadConfig, writeConfigFile } from "../config/config.js";
|
import { loadConfig, writeConfigFile } from "../config/config.js";
|
||||||
import type { ClawdbotConfig } from "../config/config.js";
|
import { installPluginFromArchive, installPluginFromNpmSpec } from "../plugins/install.js";
|
||||||
import {
|
|
||||||
installPluginFromArchive,
|
|
||||||
installPluginFromNpmSpec,
|
|
||||||
resolvePluginInstallDir,
|
|
||||||
} from "../plugins/install.js";
|
|
||||||
import { recordPluginInstall } from "../plugins/installs.js";
|
|
||||||
import type { PluginRecord } from "../plugins/registry.js";
|
import type { PluginRecord } from "../plugins/registry.js";
|
||||||
import { buildPluginStatusReport } from "../plugins/status.js";
|
import { buildPluginStatusReport } from "../plugins/status.js";
|
||||||
import { defaultRuntime } from "../runtime.js";
|
import { defaultRuntime } from "../runtime.js";
|
||||||
@@ -29,11 +22,6 @@ export type PluginInfoOptions = {
|
|||||||
json?: boolean;
|
json?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PluginUpdateOptions = {
|
|
||||||
all?: boolean;
|
|
||||||
dryRun?: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
function formatPluginLine(plugin: PluginRecord, verbose = false): string {
|
function formatPluginLine(plugin: PluginRecord, verbose = false): string {
|
||||||
const status =
|
const status =
|
||||||
plugin.status === "loaded"
|
plugin.status === "loaded"
|
||||||
@@ -68,16 +56,6 @@ function formatPluginLine(plugin: PluginRecord, verbose = false): string {
|
|||||||
return parts.join("\n");
|
return parts.join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
async function readInstalledPackageVersion(dir: string): Promise<string | undefined> {
|
|
||||||
try {
|
|
||||||
const raw = await fsp.readFile(path.join(dir, "package.json"), "utf-8");
|
|
||||||
const parsed = JSON.parse(raw) as { version?: unknown };
|
|
||||||
return typeof parsed.version === "string" ? parsed.version : undefined;
|
|
||||||
} catch {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function registerPluginsCli(program: Command) {
|
export function registerPluginsCli(program: Command) {
|
||||||
const plugins = program
|
const plugins = program
|
||||||
.command("plugins")
|
.command("plugins")
|
||||||
@@ -140,8 +118,6 @@ export function registerPluginsCli(program: Command) {
|
|||||||
defaultRuntime.error(`Plugin not found: ${id}`);
|
defaultRuntime.error(`Plugin not found: ${id}`);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
const cfg = loadConfig();
|
|
||||||
const install = cfg.plugins?.installs?.[plugin.id];
|
|
||||||
|
|
||||||
if (opts.json) {
|
if (opts.json) {
|
||||||
defaultRuntime.log(JSON.stringify(plugin, null, 2));
|
defaultRuntime.log(JSON.stringify(plugin, null, 2));
|
||||||
@@ -175,15 +151,6 @@ export function registerPluginsCli(program: Command) {
|
|||||||
lines.push(`Services: ${plugin.services.join(", ")}`);
|
lines.push(`Services: ${plugin.services.join(", ")}`);
|
||||||
}
|
}
|
||||||
if (plugin.error) lines.push(chalk.red(`Error: ${plugin.error}`));
|
if (plugin.error) lines.push(chalk.red(`Error: ${plugin.error}`));
|
||||||
if (install) {
|
|
||||||
lines.push("");
|
|
||||||
lines.push(`Install: ${install.source}`);
|
|
||||||
if (install.spec) lines.push(`Spec: ${install.spec}`);
|
|
||||||
if (install.sourcePath) lines.push(`Source path: ${install.sourcePath}`);
|
|
||||||
if (install.installPath) lines.push(`Install path: ${install.installPath}`);
|
|
||||||
if (install.version) lines.push(`Recorded version: ${install.version}`);
|
|
||||||
if (install.installedAt) lines.push(`Installed at: ${install.installedAt}`);
|
|
||||||
}
|
|
||||||
defaultRuntime.log(lines.join("\n"));
|
defaultRuntime.log(lines.join("\n"));
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -256,7 +223,7 @@ export function registerPluginsCli(program: Command) {
|
|||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
let next: ClawdbotConfig = {
|
const next = {
|
||||||
...cfg,
|
...cfg,
|
||||||
plugins: {
|
plugins: {
|
||||||
...cfg.plugins,
|
...cfg.plugins,
|
||||||
@@ -269,13 +236,6 @@ export function registerPluginsCli(program: Command) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
next = recordPluginInstall(next, {
|
|
||||||
pluginId: result.pluginId,
|
|
||||||
source: "archive",
|
|
||||||
sourcePath: resolved,
|
|
||||||
installPath: result.targetDir,
|
|
||||||
version: result.version,
|
|
||||||
});
|
|
||||||
await writeConfigFile(next);
|
await writeConfigFile(next);
|
||||||
defaultRuntime.log(`Installed plugin: ${result.pluginId}`);
|
defaultRuntime.log(`Installed plugin: ${result.pluginId}`);
|
||||||
defaultRuntime.log(`Restart the gateway to load plugins.`);
|
defaultRuntime.log(`Restart the gateway to load plugins.`);
|
||||||
@@ -327,7 +287,7 @@ export function registerPluginsCli(program: Command) {
|
|||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
let next: ClawdbotConfig = {
|
const next = {
|
||||||
...cfg,
|
...cfg,
|
||||||
plugins: {
|
plugins: {
|
||||||
...cfg.plugins,
|
...cfg.plugins,
|
||||||
@@ -340,124 +300,11 @@ export function registerPluginsCli(program: Command) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
next = recordPluginInstall(next, {
|
|
||||||
pluginId: result.pluginId,
|
|
||||||
source: "npm",
|
|
||||||
spec: raw,
|
|
||||||
installPath: result.targetDir,
|
|
||||||
version: result.version,
|
|
||||||
});
|
|
||||||
await writeConfigFile(next);
|
await writeConfigFile(next);
|
||||||
defaultRuntime.log(`Installed plugin: ${result.pluginId}`);
|
defaultRuntime.log(`Installed plugin: ${result.pluginId}`);
|
||||||
defaultRuntime.log(`Restart the gateway to load plugins.`);
|
defaultRuntime.log(`Restart the gateway to load plugins.`);
|
||||||
});
|
});
|
||||||
|
|
||||||
plugins
|
|
||||||
.command("update")
|
|
||||||
.description("Update installed plugins (npm installs only)")
|
|
||||||
.argument("[id]", "Plugin id (omit with --all)")
|
|
||||||
.option("--all", "Update all tracked plugins", false)
|
|
||||||
.option("--dry-run", "Show what would change without writing", false)
|
|
||||||
.action(async (id: string | undefined, opts: PluginUpdateOptions) => {
|
|
||||||
const cfg = loadConfig();
|
|
||||||
const installs = cfg.plugins?.installs ?? {};
|
|
||||||
const targets = opts.all ? Object.keys(installs) : id ? [id] : [];
|
|
||||||
|
|
||||||
if (targets.length === 0) {
|
|
||||||
defaultRuntime.error("Provide a plugin id or use --all.");
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
let nextCfg = cfg;
|
|
||||||
let updatedCount = 0;
|
|
||||||
|
|
||||||
for (const pluginId of targets) {
|
|
||||||
const record = installs[pluginId];
|
|
||||||
if (!record) {
|
|
||||||
defaultRuntime.log(chalk.yellow(`No install record for "${pluginId}".`));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (record.source !== "npm") {
|
|
||||||
defaultRuntime.log(
|
|
||||||
chalk.yellow(`Skipping "${pluginId}" (source: ${record.source}).`),
|
|
||||||
);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!record.spec) {
|
|
||||||
defaultRuntime.log(chalk.yellow(`Skipping "${pluginId}" (missing npm spec).`));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const installPath = record.installPath ?? resolvePluginInstallDir(pluginId);
|
|
||||||
const currentVersion = await readInstalledPackageVersion(installPath);
|
|
||||||
|
|
||||||
if (opts.dryRun) {
|
|
||||||
const probe = await installPluginFromNpmSpec({
|
|
||||||
spec: record.spec,
|
|
||||||
mode: "update",
|
|
||||||
dryRun: true,
|
|
||||||
expectedPluginId: pluginId,
|
|
||||||
logger: {
|
|
||||||
info: (msg) => defaultRuntime.log(msg),
|
|
||||||
warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!probe.ok) {
|
|
||||||
defaultRuntime.log(chalk.red(`Failed to check ${pluginId}: ${probe.error}`));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const nextVersion = probe.version ?? "unknown";
|
|
||||||
const currentLabel = currentVersion ?? "unknown";
|
|
||||||
if (currentVersion && probe.version && currentVersion === probe.version) {
|
|
||||||
defaultRuntime.log(`${pluginId} is up to date (${currentLabel}).`);
|
|
||||||
} else {
|
|
||||||
defaultRuntime.log(
|
|
||||||
`Would update ${pluginId}: ${currentLabel} → ${nextVersion}.`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await installPluginFromNpmSpec({
|
|
||||||
spec: record.spec,
|
|
||||||
mode: "update",
|
|
||||||
expectedPluginId: pluginId,
|
|
||||||
logger: {
|
|
||||||
info: (msg) => defaultRuntime.log(msg),
|
|
||||||
warn: (msg) => defaultRuntime.log(chalk.yellow(msg)),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!result.ok) {
|
|
||||||
defaultRuntime.log(chalk.red(`Failed to update ${pluginId}: ${result.error}`));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const nextVersion = result.version ?? (await readInstalledPackageVersion(result.targetDir));
|
|
||||||
nextCfg = recordPluginInstall(nextCfg, {
|
|
||||||
pluginId,
|
|
||||||
source: "npm",
|
|
||||||
spec: record.spec,
|
|
||||||
installPath: result.targetDir,
|
|
||||||
version: nextVersion,
|
|
||||||
});
|
|
||||||
updatedCount += 1;
|
|
||||||
|
|
||||||
const currentLabel = currentVersion ?? "unknown";
|
|
||||||
const nextLabel = nextVersion ?? "unknown";
|
|
||||||
if (currentVersion && nextVersion && currentVersion === nextVersion) {
|
|
||||||
defaultRuntime.log(`${pluginId} already at ${currentLabel}.`);
|
|
||||||
} else {
|
|
||||||
defaultRuntime.log(`Updated ${pluginId}: ${currentLabel} → ${nextLabel}.`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (updatedCount > 0) {
|
|
||||||
await writeConfigFile(nextCfg);
|
|
||||||
defaultRuntime.log("Restart the gateway to load plugins.");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
plugins
|
plugins
|
||||||
.command("doctor")
|
.command("doctor")
|
||||||
.description("Report plugin load issues")
|
.description("Report plugin load issues")
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { Command } from "commander";
|
import { Command } from "commander";
|
||||||
import { registerBrowserCli } from "../browser-cli.js";
|
import { registerBrowserCli } from "../browser-cli.js";
|
||||||
import { registerConfigCli } from "../config-cli.js";
|
|
||||||
import { createProgramContext } from "./context.js";
|
import { createProgramContext } from "./context.js";
|
||||||
import { configureProgramHelp } from "./help.js";
|
import { configureProgramHelp } from "./help.js";
|
||||||
import { registerPreActionHooks } from "./preaction.js";
|
import { registerPreActionHooks } from "./preaction.js";
|
||||||
@@ -23,7 +22,6 @@ export function buildProgram() {
|
|||||||
registerSetupCommand(program);
|
registerSetupCommand(program);
|
||||||
registerOnboardCommand(program);
|
registerOnboardCommand(program);
|
||||||
registerConfigureCommand(program);
|
registerConfigureCommand(program);
|
||||||
registerConfigCli(program);
|
|
||||||
registerMaintenanceCommands(program);
|
registerMaintenanceCommands(program);
|
||||||
registerMessageCommands(program, ctx);
|
registerMessageCommands(program, ctx);
|
||||||
registerAgentCommands(program, {
|
registerAgentCommands(program, {
|
||||||
|
|||||||
@@ -9,45 +9,54 @@ import { formatDocsLink } from "../../terminal/links.js";
|
|||||||
import { theme } from "../../terminal/theme.js";
|
import { theme } from "../../terminal/theme.js";
|
||||||
|
|
||||||
export function registerConfigureCommand(program: Command) {
|
export function registerConfigureCommand(program: Command) {
|
||||||
program
|
const register = (name: "configure" | "config") => {
|
||||||
.command("configure")
|
program
|
||||||
.description("Interactive prompt to set up credentials, devices, and agent defaults")
|
.command(name)
|
||||||
.addHelpText(
|
.description(
|
||||||
"after",
|
name === "config"
|
||||||
() =>
|
? "Alias for `clawdbot configure`"
|
||||||
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/configure", "docs.clawd.bot/cli/configure")}\n`,
|
: "Interactive prompt to set up credentials, devices, and agent defaults",
|
||||||
)
|
)
|
||||||
.option(
|
.addHelpText(
|
||||||
"--section <section>",
|
"after",
|
||||||
`Configuration sections (repeatable). Options: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}`,
|
() =>
|
||||||
(value: string, previous: string[]) => [...previous, value],
|
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/configure", "docs.clawd.bot/cli/configure")}\n`,
|
||||||
[] as string[],
|
)
|
||||||
)
|
.option(
|
||||||
.action(async (opts) => {
|
"--section <section>",
|
||||||
try {
|
`Configuration sections (repeatable). Options: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}`,
|
||||||
const sections: string[] = Array.isArray(opts.section)
|
(value: string, previous: string[]) => [...previous, value],
|
||||||
? opts.section
|
[] as string[],
|
||||||
.map((value: unknown) => (typeof value === "string" ? value.trim() : ""))
|
)
|
||||||
.filter(Boolean)
|
.action(async (opts) => {
|
||||||
: [];
|
try {
|
||||||
if (sections.length === 0) {
|
const sections: string[] = Array.isArray(opts.section)
|
||||||
await configureCommand(defaultRuntime);
|
? opts.section
|
||||||
return;
|
.map((value: unknown) => (typeof value === "string" ? value.trim() : ""))
|
||||||
}
|
.filter(Boolean)
|
||||||
|
: [];
|
||||||
|
if (sections.length === 0) {
|
||||||
|
await configureCommand(defaultRuntime);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const invalid = sections.filter((s) => !CONFIGURE_WIZARD_SECTIONS.includes(s as never));
|
const invalid = sections.filter((s) => !CONFIGURE_WIZARD_SECTIONS.includes(s as never));
|
||||||
if (invalid.length > 0) {
|
if (invalid.length > 0) {
|
||||||
defaultRuntime.error(
|
defaultRuntime.error(
|
||||||
`Invalid --section: ${invalid.join(", ")}. Expected one of: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}.`,
|
`Invalid --section: ${invalid.join(", ")}. Expected one of: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}.`,
|
||||||
);
|
);
|
||||||
|
defaultRuntime.exit(1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await configureCommandWithSections(sections as never, defaultRuntime);
|
||||||
|
} catch (err) {
|
||||||
|
defaultRuntime.error(String(err));
|
||||||
defaultRuntime.exit(1);
|
defaultRuntime.exit(1);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
await configureCommandWithSections(sections as never, defaultRuntime);
|
register("configure");
|
||||||
} catch (err) {
|
register("config");
|
||||||
defaultRuntime.error(String(err));
|
|
||||||
defaultRuntime.exit(1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
@@ -372,7 +372,7 @@ describe("doctor command", () => {
|
|||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
).toBe(true);
|
).toBe(true);
|
||||||
}, 20_000);
|
}, 10_000);
|
||||||
|
|
||||||
it("warns when extra workspace directories exist", async () => {
|
it("warns when extra workspace directories exist", async () => {
|
||||||
readConfigFileSnapshot.mockResolvedValue({
|
readConfigFileSnapshot.mockResolvedValue({
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ const resolveGatewayPort = vi.fn(() => 18789);
|
|||||||
const discoverGatewayBeacons = vi.fn(async () => []);
|
const discoverGatewayBeacons = vi.fn(async () => []);
|
||||||
const pickPrimaryTailnetIPv4 = vi.fn(() => "100.64.0.10");
|
const pickPrimaryTailnetIPv4 = vi.fn(() => "100.64.0.10");
|
||||||
const sshStop = vi.fn(async () => {});
|
const sshStop = vi.fn(async () => {});
|
||||||
const resolveSshConfig = vi.fn(async () => null);
|
|
||||||
const startSshPortForward = vi.fn(async () => ({
|
const startSshPortForward = vi.fn(async () => ({
|
||||||
parsedTarget: { user: "me", host: "studio", port: 22 },
|
parsedTarget: { user: "me", host: "studio", port: 22 },
|
||||||
localPort: 18789,
|
localPort: 18789,
|
||||||
@@ -93,16 +92,8 @@ vi.mock("../infra/tailnet.js", () => ({
|
|||||||
pickPrimaryTailnetIPv4: () => pickPrimaryTailnetIPv4(),
|
pickPrimaryTailnetIPv4: () => pickPrimaryTailnetIPv4(),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("../infra/ssh-tunnel.js", async (importOriginal) => {
|
vi.mock("../infra/ssh-tunnel.js", () => ({
|
||||||
const actual = await importOriginal<typeof import("../infra/ssh-tunnel.js")>();
|
startSshPortForward: (opts: unknown) => startSshPortForward(opts),
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
startSshPortForward: (opts: unknown) => startSshPortForward(opts),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
vi.mock("../infra/ssh-config.js", () => ({
|
|
||||||
resolveSshConfig: (opts: unknown) => resolveSshConfig(opts),
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("../gateway/probe.js", () => ({
|
vi.mock("../gateway/probe.js", () => ({
|
||||||
@@ -188,122 +179,4 @@ describe("gateway-status command", () => {
|
|||||||
const targets = parsed.targets as Array<Record<string, unknown>>;
|
const targets = parsed.targets as Array<Record<string, unknown>>;
|
||||||
expect(targets.some((t) => t.kind === "sshTunnel")).toBe(true);
|
expect(targets.some((t) => t.kind === "sshTunnel")).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("infers SSH target from gateway.remote.url and ssh config", async () => {
|
|
||||||
const runtimeLogs: string[] = [];
|
|
||||||
const runtime = {
|
|
||||||
log: (msg: string) => runtimeLogs.push(msg),
|
|
||||||
error: (_msg: string) => {},
|
|
||||||
exit: (code: number) => {
|
|
||||||
throw new Error(`__exit__:${code}`);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const originalUser = process.env.USER;
|
|
||||||
try {
|
|
||||||
process.env.USER = "steipete";
|
|
||||||
loadConfig.mockReturnValueOnce({
|
|
||||||
gateway: {
|
|
||||||
mode: "remote",
|
|
||||||
remote: { url: "ws://peters-mac-studio-1.sheep-coho.ts.net:18789", token: "rtok" },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
resolveSshConfig.mockResolvedValueOnce({
|
|
||||||
user: "steipete",
|
|
||||||
host: "peters-mac-studio-1.sheep-coho.ts.net",
|
|
||||||
port: 2222,
|
|
||||||
identityFiles: ["/tmp/id_ed25519"],
|
|
||||||
});
|
|
||||||
|
|
||||||
startSshPortForward.mockClear();
|
|
||||||
const { gatewayStatusCommand } = await import("./gateway-status.js");
|
|
||||||
await gatewayStatusCommand(
|
|
||||||
{ timeout: "1000", json: true },
|
|
||||||
runtime as unknown as import("../runtime.js").RuntimeEnv,
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(startSshPortForward).toHaveBeenCalledTimes(1);
|
|
||||||
const call = startSshPortForward.mock.calls[0]?.[0] as {
|
|
||||||
target: string;
|
|
||||||
identity?: string;
|
|
||||||
};
|
|
||||||
expect(call.target).toBe("steipete@peters-mac-studio-1.sheep-coho.ts.net:2222");
|
|
||||||
expect(call.identity).toBe("/tmp/id_ed25519");
|
|
||||||
} finally {
|
|
||||||
process.env.USER = originalUser;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it("falls back to host-only when USER is missing and ssh config is unavailable", async () => {
|
|
||||||
const runtimeLogs: string[] = [];
|
|
||||||
const runtime = {
|
|
||||||
log: (msg: string) => runtimeLogs.push(msg),
|
|
||||||
error: (_msg: string) => {},
|
|
||||||
exit: (code: number) => {
|
|
||||||
throw new Error(`__exit__:${code}`);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const originalUser = process.env.USER;
|
|
||||||
try {
|
|
||||||
process.env.USER = "";
|
|
||||||
loadConfig.mockReturnValueOnce({
|
|
||||||
gateway: {
|
|
||||||
mode: "remote",
|
|
||||||
remote: { url: "ws://studio.example:18789", token: "rtok" },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
resolveSshConfig.mockResolvedValueOnce(null);
|
|
||||||
|
|
||||||
startSshPortForward.mockClear();
|
|
||||||
const { gatewayStatusCommand } = await import("./gateway-status.js");
|
|
||||||
await gatewayStatusCommand(
|
|
||||||
{ timeout: "1000", json: true },
|
|
||||||
runtime as unknown as import("../runtime.js").RuntimeEnv,
|
|
||||||
);
|
|
||||||
|
|
||||||
const call = startSshPortForward.mock.calls[0]?.[0] as {
|
|
||||||
target: string;
|
|
||||||
};
|
|
||||||
expect(call.target).toBe("studio.example");
|
|
||||||
} finally {
|
|
||||||
process.env.USER = originalUser;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it("keeps explicit SSH identity even when ssh config provides one", async () => {
|
|
||||||
const runtimeLogs: string[] = [];
|
|
||||||
const runtime = {
|
|
||||||
log: (msg: string) => runtimeLogs.push(msg),
|
|
||||||
error: (_msg: string) => {},
|
|
||||||
exit: (code: number) => {
|
|
||||||
throw new Error(`__exit__:${code}`);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
loadConfig.mockReturnValueOnce({
|
|
||||||
gateway: {
|
|
||||||
mode: "remote",
|
|
||||||
remote: { url: "ws://studio.example:18789", token: "rtok" },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
resolveSshConfig.mockResolvedValueOnce({
|
|
||||||
user: "me",
|
|
||||||
host: "studio.example",
|
|
||||||
port: 22,
|
|
||||||
identityFiles: ["/tmp/id_from_config"],
|
|
||||||
});
|
|
||||||
|
|
||||||
startSshPortForward.mockClear();
|
|
||||||
const { gatewayStatusCommand } = await import("./gateway-status.js");
|
|
||||||
await gatewayStatusCommand(
|
|
||||||
{ timeout: "1000", json: true, sshIdentity: "/tmp/explicit_id" },
|
|
||||||
runtime as unknown as import("../runtime.js").RuntimeEnv,
|
|
||||||
);
|
|
||||||
|
|
||||||
const call = startSshPortForward.mock.calls[0]?.[0] as {
|
|
||||||
identity?: string;
|
|
||||||
};
|
|
||||||
expect(call.identity).toBe("/tmp/explicit_id");
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
@@ -2,8 +2,7 @@ import { withProgress } from "../cli/progress.js";
|
|||||||
import { loadConfig, resolveGatewayPort } from "../config/config.js";
|
import { loadConfig, resolveGatewayPort } from "../config/config.js";
|
||||||
import { probeGateway } from "../gateway/probe.js";
|
import { probeGateway } from "../gateway/probe.js";
|
||||||
import { discoverGatewayBeacons } from "../infra/bonjour-discovery.js";
|
import { discoverGatewayBeacons } from "../infra/bonjour-discovery.js";
|
||||||
import { resolveSshConfig } from "../infra/ssh-config.js";
|
import { startSshPortForward } from "../infra/ssh-tunnel.js";
|
||||||
import { parseSshTarget, startSshPortForward } from "../infra/ssh-tunnel.js";
|
|
||||||
import type { RuntimeEnv } from "../runtime.js";
|
import type { RuntimeEnv } from "../runtime.js";
|
||||||
import { colorize, isRich, theme } from "../terminal/theme.js";
|
import { colorize, isRich, theme } from "../terminal/theme.js";
|
||||||
|
|
||||||
@@ -48,25 +47,13 @@ export async function gatewayStatusCommand(
|
|||||||
});
|
});
|
||||||
|
|
||||||
let sshTarget = sanitizeSshTarget(opts.ssh) ?? sanitizeSshTarget(cfg.gateway?.remote?.sshTarget);
|
let sshTarget = sanitizeSshTarget(opts.ssh) ?? sanitizeSshTarget(cfg.gateway?.remote?.sshTarget);
|
||||||
let sshIdentity =
|
const sshIdentity =
|
||||||
sanitizeSshTarget(opts.sshIdentity) ?? sanitizeSshTarget(cfg.gateway?.remote?.sshIdentity);
|
sanitizeSshTarget(opts.sshIdentity) ?? sanitizeSshTarget(cfg.gateway?.remote?.sshIdentity);
|
||||||
const remotePort = resolveGatewayPort(cfg);
|
const remotePort = resolveGatewayPort(cfg);
|
||||||
|
|
||||||
let sshTunnelError: string | null = null;
|
let sshTunnelError: string | null = null;
|
||||||
let sshTunnelStarted = false;
|
let sshTunnelStarted = false;
|
||||||
|
|
||||||
if (!sshTarget) {
|
|
||||||
sshTarget = inferSshTargetFromRemoteUrl(cfg.gateway?.remote?.url);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sshTarget) {
|
|
||||||
const resolved = await resolveSshTarget(sshTarget, sshIdentity, overallTimeoutMs);
|
|
||||||
if (resolved) {
|
|
||||||
sshTarget = resolved.target;
|
|
||||||
if (!sshIdentity && resolved.identity) sshIdentity = resolved.identity;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const { discovery, probed } = await withProgress(
|
const { discovery, probed } = await withProgress(
|
||||||
{
|
{
|
||||||
label: "Inspecting gateways…",
|
label: "Inspecting gateways…",
|
||||||
@@ -327,53 +314,3 @@ export async function gatewayStatusCommand(
|
|||||||
|
|
||||||
if (!ok) runtime.exit(1);
|
if (!ok) runtime.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
function inferSshTargetFromRemoteUrl(rawUrl?: string | null): string | null {
|
|
||||||
if (typeof rawUrl !== "string") return null;
|
|
||||||
const trimmed = rawUrl.trim();
|
|
||||||
if (!trimmed) return null;
|
|
||||||
let host: string | null = null;
|
|
||||||
try {
|
|
||||||
host = new URL(trimmed).hostname || null;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (!host) return null;
|
|
||||||
const user = process.env.USER?.trim() || "";
|
|
||||||
return user ? `${user}@${host}` : host;
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildSshTarget(input: { user?: string; host?: string; port?: number }): string | null {
|
|
||||||
const host = input.host?.trim() ?? "";
|
|
||||||
if (!host) return null;
|
|
||||||
const user = input.user?.trim() ?? "";
|
|
||||||
const base = user ? `${user}@${host}` : host;
|
|
||||||
const port = input.port ?? 22;
|
|
||||||
if (port && port !== 22) return `${base}:${port}`;
|
|
||||||
return base;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function resolveSshTarget(
|
|
||||||
rawTarget: string,
|
|
||||||
identity: string | null,
|
|
||||||
overallTimeoutMs: number,
|
|
||||||
): Promise<{ target: string; identity?: string } | null> {
|
|
||||||
const parsed = parseSshTarget(rawTarget);
|
|
||||||
if (!parsed) return null;
|
|
||||||
const config = await resolveSshConfig(parsed, {
|
|
||||||
identity: identity ?? undefined,
|
|
||||||
timeoutMs: Math.min(800, overallTimeoutMs),
|
|
||||||
});
|
|
||||||
if (!config) return { target: rawTarget, identity: identity ?? undefined };
|
|
||||||
const target = buildSshTarget({
|
|
||||||
user: config.user ?? parsed.user,
|
|
||||||
host: config.host ?? parsed.host,
|
|
||||||
port: config.port ?? parsed.port,
|
|
||||||
});
|
|
||||||
if (!target) return { target: rawTarget, identity: identity ?? undefined };
|
|
||||||
const identityFile =
|
|
||||||
identity ??
|
|
||||||
config.identityFiles.find((entry) => entry.trim().length > 0)?.trim() ??
|
|
||||||
undefined;
|
|
||||||
return { target, identity: identityFile };
|
|
||||||
}
|
|
||||||
@@ -68,9 +68,6 @@ describe("ensureOnboardingPluginInstalled", () => {
|
|||||||
expect(result.installed).toBe(true);
|
expect(result.installed).toBe(true);
|
||||||
expect(result.cfg.plugins?.entries?.zalo?.enabled).toBe(true);
|
expect(result.cfg.plugins?.entries?.zalo?.enabled).toBe(true);
|
||||||
expect(result.cfg.plugins?.allow).toContain("zalo");
|
expect(result.cfg.plugins?.allow).toContain("zalo");
|
||||||
expect(result.cfg.plugins?.installs?.zalo?.source).toBe("npm");
|
|
||||||
expect(result.cfg.plugins?.installs?.zalo?.spec).toBe("@clawdbot/zalo");
|
|
||||||
expect(result.cfg.plugins?.installs?.zalo?.installPath).toBe("/tmp/zalo");
|
|
||||||
expect(installPluginFromNpmSpec).toHaveBeenCalledWith(
|
expect(installPluginFromNpmSpec).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({ spec: "@clawdbot/zalo" }),
|
expect.objectContaining({ spec: "@clawdbot/zalo" }),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../../agents/ag
|
|||||||
import type { ChannelPluginCatalogEntry } from "../../channels/plugins/catalog.js";
|
import type { ChannelPluginCatalogEntry } from "../../channels/plugins/catalog.js";
|
||||||
import type { ClawdbotConfig } from "../../config/config.js";
|
import type { ClawdbotConfig } from "../../config/config.js";
|
||||||
import { createSubsystemLogger } from "../../logging.js";
|
import { createSubsystemLogger } from "../../logging.js";
|
||||||
import { recordPluginInstall } from "../../plugins/installs.js";
|
|
||||||
import { loadClawdbotPlugins } from "../../plugins/loader.js";
|
import { loadClawdbotPlugins } from "../../plugins/loader.js";
|
||||||
import { installPluginFromNpmSpec } from "../../plugins/install.js";
|
import { installPluginFromNpmSpec } from "../../plugins/install.js";
|
||||||
import type { RuntimeEnv } from "../../runtime.js";
|
import type { RuntimeEnv } from "../../runtime.js";
|
||||||
@@ -159,13 +158,6 @@ export async function ensureOnboardingPluginInstalled(params: {
|
|||||||
|
|
||||||
if (result.ok) {
|
if (result.ok) {
|
||||||
next = ensurePluginEnabled(next, result.pluginId);
|
next = ensurePluginEnabled(next, result.pluginId);
|
||||||
next = recordPluginInstall(next, {
|
|
||||||
pluginId: result.pluginId,
|
|
||||||
source: "npm",
|
|
||||||
spec: entry.install.npmSpec,
|
|
||||||
installPath: result.targetDir,
|
|
||||||
version: result.version,
|
|
||||||
});
|
|
||||||
return { cfg: next, installed: true };
|
return { cfg: next, installed: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -119,11 +119,10 @@ export async function statusAllCommand(
|
|||||||
|
|
||||||
const localFallbackAuth = resolveProbeAuth("local");
|
const localFallbackAuth = resolveProbeAuth("local");
|
||||||
const remoteAuth = resolveProbeAuth("remote");
|
const remoteAuth = resolveProbeAuth("remote");
|
||||||
const probeAuth = isRemoteMode && !remoteUrlMissing ? remoteAuth : localFallbackAuth;
|
|
||||||
|
|
||||||
const gatewayProbe = await probeGateway({
|
const gatewayProbe = await probeGateway({
|
||||||
url: connection.url,
|
url: connection.url,
|
||||||
auth: probeAuth,
|
auth: remoteUrlMissing ? localFallbackAuth : remoteAuth,
|
||||||
timeoutMs: Math.min(5000, opts?.timeoutMs ?? 10_000),
|
timeoutMs: Math.min(5000, opts?.timeoutMs ?? 10_000),
|
||||||
}).catch(() => null);
|
}).catch(() => null);
|
||||||
const gatewayReachable = gatewayProbe?.ok === true;
|
const gatewayReachable = gatewayProbe?.ok === true;
|
||||||
@@ -292,7 +291,7 @@ export async function statusAllCommand(
|
|||||||
? `unreachable (${gatewayProbe.error})`
|
? `unreachable (${gatewayProbe.error})`
|
||||||
: "unreachable";
|
: "unreachable";
|
||||||
const gatewayAuth = gatewayReachable
|
const gatewayAuth = gatewayReachable
|
||||||
? ` · auth ${formatGatewayAuthUsed(probeAuth)}`
|
? ` · auth ${formatGatewayAuthUsed(remoteUrlMissing ? localFallbackAuth : remoteAuth)}`
|
||||||
: "";
|
: "";
|
||||||
const gatewaySelfLine =
|
const gatewaySelfLine =
|
||||||
gatewaySelf?.host || gatewaySelf?.ip || gatewaySelf?.version || gatewaySelf?.platform
|
gatewaySelf?.host || gatewaySelf?.ip || gatewaySelf?.version || gatewaySelf?.platform
|
||||||
|
|||||||
@@ -28,18 +28,13 @@ describe("config discord", () => {
|
|||||||
dm: {
|
dm: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
allowFrom: ["steipete"],
|
allowFrom: ["steipete"],
|
||||||
groupEnabled: true,
|
groupEnabled: true,
|
||||||
groupChannels: ["clawd-dm"],
|
groupChannels: ["clawd-dm"],
|
||||||
},
|
},
|
||||||
actions: {
|
guilds: {
|
||||||
emojiUploads: true,
|
"123": {
|
||||||
stickerUploads: false,
|
slug: "friends-of-clawd",
|
||||||
channels: true,
|
requireMention: false,
|
||||||
},
|
|
||||||
guilds: {
|
|
||||||
"123": {
|
|
||||||
slug: "friends-of-clawd",
|
|
||||||
requireMention: false,
|
|
||||||
users: ["steipete"],
|
users: ["steipete"],
|
||||||
channels: {
|
channels: {
|
||||||
general: { allow: true },
|
general: { allow: true },
|
||||||
@@ -62,9 +57,6 @@ describe("config discord", () => {
|
|||||||
expect(cfg.channels?.discord?.enabled).toBe(true);
|
expect(cfg.channels?.discord?.enabled).toBe(true);
|
||||||
expect(cfg.channels?.discord?.dm?.groupEnabled).toBe(true);
|
expect(cfg.channels?.discord?.dm?.groupEnabled).toBe(true);
|
||||||
expect(cfg.channels?.discord?.dm?.groupChannels).toEqual(["clawd-dm"]);
|
expect(cfg.channels?.discord?.dm?.groupChannels).toEqual(["clawd-dm"]);
|
||||||
expect(cfg.channels?.discord?.actions?.emojiUploads).toBe(true);
|
|
||||||
expect(cfg.channels?.discord?.actions?.stickerUploads).toBe(false);
|
|
||||||
expect(cfg.channels?.discord?.actions?.channels).toBe(true);
|
|
||||||
expect(cfg.channels?.discord?.guilds?.["123"]?.slug).toBe("friends-of-clawd");
|
expect(cfg.channels?.discord?.guilds?.["123"]?.slug).toBe("friends-of-clawd");
|
||||||
expect(cfg.channels?.discord?.guilds?.["123"]?.channels?.general?.allow).toBe(true);
|
expect(cfg.channels?.discord?.guilds?.["123"]?.channels?.general?.allow).toBe(true);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
import { describe, expect, it } from "vitest";
|
|
||||||
|
|
||||||
import { ClawdbotSchema } from "./zod-schema.js";
|
|
||||||
|
|
||||||
describe("telegram custom commands schema", () => {
|
|
||||||
it("normalizes custom commands", () => {
|
|
||||||
const res = ClawdbotSchema.safeParse({
|
|
||||||
channels: {
|
|
||||||
telegram: {
|
|
||||||
customCommands: [{ command: "/Backup", description: " Git backup " }],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(res.success).toBe(true);
|
|
||||||
if (!res.success) return;
|
|
||||||
|
|
||||||
expect(res.data.channels?.telegram?.customCommands).toEqual([
|
|
||||||
{ command: "backup", description: "Git backup" },
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rejects custom commands with invalid names", () => {
|
|
||||||
const res = ClawdbotSchema.safeParse({
|
|
||||||
channels: {
|
|
||||||
telegram: {
|
|
||||||
customCommands: [{ command: "Bad-Name", description: "Override status" }],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(res.success).toBe(false);
|
|
||||||
if (res.success) return;
|
|
||||||
|
|
||||||
expect(
|
|
||||||
res.error.issues.some(
|
|
||||||
(issue) =>
|
|
||||||
issue.path.join(".") === "channels.telegram.customCommands.0.command" &&
|
|
||||||
issue.message.includes("invalid"),
|
|
||||||
),
|
|
||||||
).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -175,7 +175,6 @@ const FIELD_LABELS: Record<string, string> = {
|
|||||||
"talk.apiKey": "Talk API Key",
|
"talk.apiKey": "Talk API Key",
|
||||||
"channels.whatsapp": "WhatsApp",
|
"channels.whatsapp": "WhatsApp",
|
||||||
"channels.telegram": "Telegram",
|
"channels.telegram": "Telegram",
|
||||||
"channels.telegram.customCommands": "Telegram Custom Commands",
|
|
||||||
"channels.discord": "Discord",
|
"channels.discord": "Discord",
|
||||||
"channels.slack": "Slack",
|
"channels.slack": "Slack",
|
||||||
"channels.signal": "Signal",
|
"channels.signal": "Signal",
|
||||||
@@ -221,13 +220,6 @@ const FIELD_LABELS: Record<string, string> = {
|
|||||||
"plugins.entries": "Plugin Entries",
|
"plugins.entries": "Plugin Entries",
|
||||||
"plugins.entries.*.enabled": "Plugin Enabled",
|
"plugins.entries.*.enabled": "Plugin Enabled",
|
||||||
"plugins.entries.*.config": "Plugin Config",
|
"plugins.entries.*.config": "Plugin Config",
|
||||||
"plugins.installs": "Plugin Install Records",
|
|
||||||
"plugins.installs.*.source": "Plugin Install Source",
|
|
||||||
"plugins.installs.*.spec": "Plugin Install Spec",
|
|
||||||
"plugins.installs.*.sourcePath": "Plugin Install Source Path",
|
|
||||||
"plugins.installs.*.installPath": "Plugin Install Path",
|
|
||||||
"plugins.installs.*.version": "Plugin Install Version",
|
|
||||||
"plugins.installs.*.installedAt": "Plugin Install Time",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const FIELD_HELP: Record<string, string> = {
|
const FIELD_HELP: Record<string, string> = {
|
||||||
@@ -299,14 +291,6 @@ const FIELD_HELP: Record<string, string> = {
|
|||||||
"plugins.entries": "Per-plugin settings keyed by plugin id (enable/disable + config payloads).",
|
"plugins.entries": "Per-plugin settings keyed by plugin id (enable/disable + config payloads).",
|
||||||
"plugins.entries.*.enabled": "Overrides plugin enable/disable for this entry (restart required).",
|
"plugins.entries.*.enabled": "Overrides plugin enable/disable for this entry (restart required).",
|
||||||
"plugins.entries.*.config": "Plugin-defined config payload (schema is provided by the plugin).",
|
"plugins.entries.*.config": "Plugin-defined config payload (schema is provided by the plugin).",
|
||||||
"plugins.installs":
|
|
||||||
"CLI-managed install metadata (used by `clawdbot plugins update` to locate install sources).",
|
|
||||||
"plugins.installs.*.source": 'Install source ("npm", "archive", or "path").',
|
|
||||||
"plugins.installs.*.spec": "Original npm spec used for install (if source is npm).",
|
|
||||||
"plugins.installs.*.sourcePath": "Original archive/path used for install (if any).",
|
|
||||||
"plugins.installs.*.installPath": "Resolved install directory (usually ~/.clawdbot/extensions/<id>).",
|
|
||||||
"plugins.installs.*.version": "Version recorded at install time (if available).",
|
|
||||||
"plugins.installs.*.installedAt": "ISO timestamp of last install/update.",
|
|
||||||
"agents.defaults.model.primary": "Primary model (provider/model).",
|
"agents.defaults.model.primary": "Primary model (provider/model).",
|
||||||
"agents.defaults.model.fallbacks":
|
"agents.defaults.model.fallbacks":
|
||||||
"Ordered fallback models (provider/model). Used when the primary model fails.",
|
"Ordered fallback models (provider/model). Used when the primary model fails.",
|
||||||
@@ -349,8 +333,6 @@ const FIELD_HELP: Record<string, string> = {
|
|||||||
"channels.slack.commands.native": 'Override native commands for Slack (bool or "auto").',
|
"channels.slack.commands.native": 'Override native commands for Slack (bool or "auto").',
|
||||||
"session.agentToAgent.maxPingPongTurns":
|
"session.agentToAgent.maxPingPongTurns":
|
||||||
"Max reply-back turns between requester and target (0–5).",
|
"Max reply-back turns between requester and target (0–5).",
|
||||||
"channels.telegram.customCommands":
|
|
||||||
"Additional Telegram bot menu commands (merged with native; conflicts ignored).",
|
|
||||||
"messages.ackReaction": "Emoji reaction used to acknowledge inbound messages (empty disables).",
|
"messages.ackReaction": "Emoji reaction used to acknowledge inbound messages (empty disables).",
|
||||||
"messages.ackReactionScope":
|
"messages.ackReactionScope":
|
||||||
'When to send ack reactions ("group-mentions", "group-all", "direct", "all").',
|
'When to send ack reactions ("group-mentions", "group-all", "direct", "all").',
|
||||||
|
|||||||
@@ -1,93 +0,0 @@
|
|||||||
export const TELEGRAM_COMMAND_NAME_PATTERN = /^[a-z0-9_]{1,32}$/;
|
|
||||||
|
|
||||||
export type TelegramCustomCommandInput = {
|
|
||||||
command?: string | null;
|
|
||||||
description?: string | null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type TelegramCustomCommandIssue = {
|
|
||||||
index: number;
|
|
||||||
field: "command" | "description";
|
|
||||||
message: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export function normalizeTelegramCommandName(value: string): string {
|
|
||||||
const trimmed = value.trim();
|
|
||||||
if (!trimmed) return "";
|
|
||||||
const withoutSlash = trimmed.startsWith("/") ? trimmed.slice(1) : trimmed;
|
|
||||||
return withoutSlash.trim().toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
export function normalizeTelegramCommandDescription(value: string): string {
|
|
||||||
return value.trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
export function resolveTelegramCustomCommands(params: {
|
|
||||||
commands?: TelegramCustomCommandInput[] | null;
|
|
||||||
reservedCommands?: Set<string>;
|
|
||||||
checkReserved?: boolean;
|
|
||||||
checkDuplicates?: boolean;
|
|
||||||
}): {
|
|
||||||
commands: Array<{ command: string; description: string }>;
|
|
||||||
issues: TelegramCustomCommandIssue[];
|
|
||||||
} {
|
|
||||||
const entries = Array.isArray(params.commands) ? params.commands : [];
|
|
||||||
const reserved = params.reservedCommands ?? new Set<string>();
|
|
||||||
const checkReserved = params.checkReserved !== false;
|
|
||||||
const checkDuplicates = params.checkDuplicates !== false;
|
|
||||||
const seen = new Set<string>();
|
|
||||||
const resolved: Array<{ command: string; description: string }> = [];
|
|
||||||
const issues: TelegramCustomCommandIssue[] = [];
|
|
||||||
|
|
||||||
for (let index = 0; index < entries.length; index += 1) {
|
|
||||||
const entry = entries[index];
|
|
||||||
const normalized = normalizeTelegramCommandName(String(entry?.command ?? ""));
|
|
||||||
if (!normalized) {
|
|
||||||
issues.push({
|
|
||||||
index,
|
|
||||||
field: "command",
|
|
||||||
message: "Telegram custom command is missing a command name.",
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!TELEGRAM_COMMAND_NAME_PATTERN.test(normalized)) {
|
|
||||||
issues.push({
|
|
||||||
index,
|
|
||||||
field: "command",
|
|
||||||
message: `Telegram custom command "/${normalized}" is invalid (use a-z, 0-9, underscore; max 32 chars).`,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (checkReserved && reserved.has(normalized)) {
|
|
||||||
issues.push({
|
|
||||||
index,
|
|
||||||
field: "command",
|
|
||||||
message: `Telegram custom command "/${normalized}" conflicts with a native command.`,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (checkDuplicates && seen.has(normalized)) {
|
|
||||||
issues.push({
|
|
||||||
index,
|
|
||||||
field: "command",
|
|
||||||
message: `Telegram custom command "/${normalized}" is duplicated.`,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const description = normalizeTelegramCommandDescription(String(entry?.description ?? ""));
|
|
||||||
if (!description) {
|
|
||||||
issues.push({
|
|
||||||
index,
|
|
||||||
field: "description",
|
|
||||||
message: `Telegram custom command "/${normalized}" is missing a description.`,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (checkDuplicates) {
|
|
||||||
seen.add(normalized);
|
|
||||||
}
|
|
||||||
resolved.push({ command: normalized, description });
|
|
||||||
}
|
|
||||||
|
|
||||||
return { commands: resolved, issues };
|
|
||||||
}
|
|
||||||
@@ -8,15 +8,6 @@ export type PluginsLoadConfig = {
|
|||||||
paths?: string[];
|
paths?: string[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PluginInstallRecord = {
|
|
||||||
source: "npm" | "archive" | "path";
|
|
||||||
spec?: string;
|
|
||||||
sourcePath?: string;
|
|
||||||
installPath?: string;
|
|
||||||
version?: string;
|
|
||||||
installedAt?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type PluginsConfig = {
|
export type PluginsConfig = {
|
||||||
/** Enable or disable plugin loading. */
|
/** Enable or disable plugin loading. */
|
||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
@@ -26,5 +17,4 @@ export type PluginsConfig = {
|
|||||||
deny?: string[];
|
deny?: string[];
|
||||||
load?: PluginsLoadConfig;
|
load?: PluginsLoadConfig;
|
||||||
entries?: Record<string, PluginEntryConfig>;
|
entries?: Record<string, PluginEntryConfig>;
|
||||||
installs?: Record<string, PluginInstallRecord>;
|
|
||||||
};
|
};
|
||||||
@@ -14,14 +14,6 @@ export type TelegramActionConfig = {
|
|||||||
deleteMessage?: boolean;
|
deleteMessage?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Custom command definition for Telegram bot menu. */
|
|
||||||
export type TelegramCustomCommand = {
|
|
||||||
/** Command name (without leading /). */
|
|
||||||
command: string;
|
|
||||||
/** Description shown in Telegram command menu. */
|
|
||||||
description: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type TelegramAccountConfig = {
|
export type TelegramAccountConfig = {
|
||||||
/** Optional display name for this account (used in CLI/UI lists). */
|
/** Optional display name for this account (used in CLI/UI lists). */
|
||||||
name?: string;
|
name?: string;
|
||||||
@@ -29,8 +21,6 @@ export type TelegramAccountConfig = {
|
|||||||
capabilities?: string[];
|
capabilities?: string[];
|
||||||
/** Override native command registration for Telegram (bool or "auto"). */
|
/** Override native command registration for Telegram (bool or "auto"). */
|
||||||
commands?: ProviderCommandsConfig;
|
commands?: ProviderCommandsConfig;
|
||||||
/** Custom commands to register in Telegram's command menu (merged with native). */
|
|
||||||
customCommands?: TelegramCustomCommand[];
|
|
||||||
/** Allow channel-initiated config writes (default: true). */
|
/** Allow channel-initiated config writes (default: true). */
|
||||||
configWrites?: boolean;
|
configWrites?: boolean;
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -13,11 +13,6 @@ import {
|
|||||||
RetryConfigSchema,
|
RetryConfigSchema,
|
||||||
requireOpenAllowFrom,
|
requireOpenAllowFrom,
|
||||||
} from "./zod-schema.core.js";
|
} from "./zod-schema.core.js";
|
||||||
import {
|
|
||||||
normalizeTelegramCommandDescription,
|
|
||||||
normalizeTelegramCommandName,
|
|
||||||
resolveTelegramCustomCommands,
|
|
||||||
} from "./telegram-custom-commands.js";
|
|
||||||
|
|
||||||
export const TelegramTopicSchema = z.object({
|
export const TelegramTopicSchema = z.object({
|
||||||
requireMention: z.boolean().optional(),
|
requireMention: z.boolean().optional(),
|
||||||
@@ -36,36 +31,11 @@ export const TelegramGroupSchema = z.object({
|
|||||||
topics: z.record(z.string(), TelegramTopicSchema.optional()).optional(),
|
topics: z.record(z.string(), TelegramTopicSchema.optional()).optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
const TelegramCustomCommandSchema = z.object({
|
|
||||||
command: z.string().transform(normalizeTelegramCommandName),
|
|
||||||
description: z.string().transform(normalizeTelegramCommandDescription),
|
|
||||||
});
|
|
||||||
|
|
||||||
const validateTelegramCustomCommands = (
|
|
||||||
value: { customCommands?: Array<{ command?: string; description?: string }> },
|
|
||||||
ctx: z.RefinementCtx,
|
|
||||||
) => {
|
|
||||||
if (!value.customCommands || value.customCommands.length === 0) return;
|
|
||||||
const { issues } = resolveTelegramCustomCommands({
|
|
||||||
commands: value.customCommands,
|
|
||||||
checkReserved: false,
|
|
||||||
checkDuplicates: false,
|
|
||||||
});
|
|
||||||
for (const issue of issues) {
|
|
||||||
ctx.addIssue({
|
|
||||||
code: z.ZodIssueCode.custom,
|
|
||||||
path: ["customCommands", issue.index, issue.field],
|
|
||||||
message: issue.message,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const TelegramAccountSchemaBase = z.object({
|
export const TelegramAccountSchemaBase = z.object({
|
||||||
name: z.string().optional(),
|
name: z.string().optional(),
|
||||||
capabilities: z.array(z.string()).optional(),
|
capabilities: z.array(z.string()).optional(),
|
||||||
enabled: z.boolean().optional(),
|
enabled: z.boolean().optional(),
|
||||||
commands: ProviderCommandsSchema,
|
commands: ProviderCommandsSchema,
|
||||||
customCommands: z.array(TelegramCustomCommandSchema).optional(),
|
|
||||||
configWrites: z.boolean().optional(),
|
configWrites: z.boolean().optional(),
|
||||||
dmPolicy: DmPolicySchema.optional().default("pairing"),
|
dmPolicy: DmPolicySchema.optional().default("pairing"),
|
||||||
botToken: z.string().optional(),
|
botToken: z.string().optional(),
|
||||||
@@ -110,7 +80,6 @@ export const TelegramAccountSchema = TelegramAccountSchemaBase.superRefine((valu
|
|||||||
message:
|
message:
|
||||||
'channels.telegram.dmPolicy="open" requires channels.telegram.allowFrom to include "*"',
|
'channels.telegram.dmPolicy="open" requires channels.telegram.allowFrom to include "*"',
|
||||||
});
|
});
|
||||||
validateTelegramCustomCommands(value, ctx);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const TelegramConfigSchema = TelegramAccountSchemaBase.extend({
|
export const TelegramConfigSchema = TelegramAccountSchemaBase.extend({
|
||||||
@@ -124,7 +93,6 @@ export const TelegramConfigSchema = TelegramAccountSchemaBase.extend({
|
|||||||
message:
|
message:
|
||||||
'channels.telegram.dmPolicy="open" requires channels.telegram.allowFrom to include "*"',
|
'channels.telegram.dmPolicy="open" requires channels.telegram.allowFrom to include "*"',
|
||||||
});
|
});
|
||||||
validateTelegramCustomCommands(value, ctx);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const DiscordDmSchema = z
|
export const DiscordDmSchema = z
|
||||||
@@ -186,8 +154,6 @@ export const DiscordAccountSchema = z.object({
|
|||||||
.object({
|
.object({
|
||||||
reactions: z.boolean().optional(),
|
reactions: z.boolean().optional(),
|
||||||
stickers: z.boolean().optional(),
|
stickers: z.boolean().optional(),
|
||||||
emojiUploads: z.boolean().optional(),
|
|
||||||
stickerUploads: z.boolean().optional(),
|
|
||||||
polls: z.boolean().optional(),
|
polls: z.boolean().optional(),
|
||||||
permissions: z.boolean().optional(),
|
permissions: z.boolean().optional(),
|
||||||
messages: z.boolean().optional(),
|
messages: z.boolean().optional(),
|
||||||
@@ -201,7 +167,6 @@ export const DiscordAccountSchema = z.object({
|
|||||||
voiceStatus: z.boolean().optional(),
|
voiceStatus: z.boolean().optional(),
|
||||||
events: z.boolean().optional(),
|
events: z.boolean().optional(),
|
||||||
moderation: z.boolean().optional(),
|
moderation: z.boolean().optional(),
|
||||||
channels: z.boolean().optional(),
|
|
||||||
})
|
})
|
||||||
.optional(),
|
.optional(),
|
||||||
replyToMode: ReplyToModeSchema.optional(),
|
replyToMode: ReplyToModeSchema.optional(),
|
||||||
|
|||||||
@@ -326,21 +326,6 @@ export const ClawdbotSchema = z
|
|||||||
.passthrough(),
|
.passthrough(),
|
||||||
)
|
)
|
||||||
.optional(),
|
.optional(),
|
||||||
installs: z
|
|
||||||
.record(
|
|
||||||
z.string(),
|
|
||||||
z
|
|
||||||
.object({
|
|
||||||
source: z.union([z.literal("npm"), z.literal("archive"), z.literal("path")]),
|
|
||||||
spec: z.string().optional(),
|
|
||||||
sourcePath: z.string().optional(),
|
|
||||||
installPath: z.string().optional(),
|
|
||||||
version: z.string().optional(),
|
|
||||||
installedAt: z.string().optional(),
|
|
||||||
})
|
|
||||||
.passthrough(),
|
|
||||||
)
|
|
||||||
.optional(),
|
|
||||||
})
|
})
|
||||||
.optional(),
|
.optional(),
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -25,14 +25,14 @@ describe("parseSystemdExecStart", () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("parses path arguments", () => {
|
it("preserves backslashes in arguments", () => {
|
||||||
const execStart = "/usr/bin/clawdbot gateway start --path /tmp/clawdbot";
|
const execStart = String.raw`/usr/bin/clawdbot gateway start --path \/tmp\/clawdbot`;
|
||||||
expect(parseSystemdExecStart(execStart)).toEqual([
|
expect(parseSystemdExecStart(execStart)).toEqual([
|
||||||
"/usr/bin/clawdbot",
|
"/usr/bin/clawdbot",
|
||||||
"gateway",
|
"gateway",
|
||||||
"start",
|
"start",
|
||||||
"--path",
|
"--path",
|
||||||
"/tmp/clawdbot",
|
"\\/tmp\\/clawdbot",
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -93,34 +93,6 @@ describe("gateway auth", () => {
|
|||||||
expect(missingProxy.reason).toBe("tailscale_proxy_missing");
|
expect(missingProxy.reason).toBe("tailscale_proxy_missing");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("treats local tailscale serve hostnames as direct", async () => {
|
|
||||||
const res = await authorizeGatewayConnect({
|
|
||||||
auth: { mode: "none", allowTailscale: true },
|
|
||||||
connectAuth: null,
|
|
||||||
req: {
|
|
||||||
socket: { remoteAddress: "127.0.0.1" },
|
|
||||||
headers: { host: "gateway.tailnet-1234.ts.net:443" },
|
|
||||||
} as never,
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(res.ok).toBe(true);
|
|
||||||
expect(res.method).toBe("none");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not treat tailscale clients as direct", async () => {
|
|
||||||
const res = await authorizeGatewayConnect({
|
|
||||||
auth: { mode: "none", allowTailscale: true },
|
|
||||||
connectAuth: null,
|
|
||||||
req: {
|
|
||||||
socket: { remoteAddress: "100.64.0.42" },
|
|
||||||
headers: { host: "gateway.tailnet-1234.ts.net" },
|
|
||||||
} as never,
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(res.ok).toBe(false);
|
|
||||||
expect(res.reason).toBe("tailscale_user_missing");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("allows tailscale identity to satisfy token mode auth", async () => {
|
it("allows tailscale identity to satisfy token mode auth", async () => {
|
||||||
const res = await authorizeGatewayConnect({
|
const res = await authorizeGatewayConnect({
|
||||||
auth: { mode: "token", token: "secret", allowTailscale: true },
|
auth: { mode: "token", token: "secret", allowTailscale: true },
|
||||||
|
|||||||
+13
-43
@@ -1,9 +1,6 @@
|
|||||||
import { timingSafeEqual } from "node:crypto";
|
import { timingSafeEqual } from "node:crypto";
|
||||||
import type { IncomingMessage } from "node:http";
|
import type { IncomingMessage } from "node:http";
|
||||||
import type {
|
import type { GatewayAuthConfig, GatewayTailscaleMode } from "../config/config.js";
|
||||||
GatewayAuthConfig,
|
|
||||||
GatewayTailscaleMode,
|
|
||||||
} from "../config/config.js";
|
|
||||||
export type ResolvedGatewayAuthMode = "none" | "token" | "password";
|
export type ResolvedGatewayAuthMode = "none" | "token" | "password";
|
||||||
|
|
||||||
export type ResolvedGatewayAuth = {
|
export type ResolvedGatewayAuth = {
|
||||||
@@ -45,34 +42,20 @@ function isLoopbackAddress(ip: string | undefined): boolean {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getHostName(hostHeader?: string): string {
|
|
||||||
const host = (hostHeader ?? "").trim().toLowerCase();
|
|
||||||
if (!host) return "";
|
|
||||||
if (host.startsWith("[")) {
|
|
||||||
const end = host.indexOf("]");
|
|
||||||
if (end !== -1) return host.slice(1, end);
|
|
||||||
}
|
|
||||||
const [name] = host.split(":");
|
|
||||||
return name ?? "";
|
|
||||||
}
|
|
||||||
|
|
||||||
function isLocalDirectRequest(req?: IncomingMessage): boolean {
|
function isLocalDirectRequest(req?: IncomingMessage): boolean {
|
||||||
if (!req) return false;
|
if (!req) return false;
|
||||||
const clientIp = req.socket?.remoteAddress ?? "";
|
const clientIp = req.socket?.remoteAddress ?? "";
|
||||||
if (!isLoopbackAddress(clientIp)) return false;
|
if (!isLoopbackAddress(clientIp)) return false;
|
||||||
|
|
||||||
const host = getHostName(req.headers?.host);
|
const host = (req.headers.host ?? "").toLowerCase();
|
||||||
const hostIsLocal =
|
const hostIsLocal =
|
||||||
host === "localhost" || host === "127.0.0.1" || host === "::1";
|
host.startsWith("localhost") || host.startsWith("127.0.0.1") || host.startsWith("[::1]");
|
||||||
const hostIsTailscaleServe = host.endsWith(".ts.net");
|
|
||||||
|
|
||||||
const hasForwarded = Boolean(
|
const hasForwarded = Boolean(
|
||||||
req.headers?.["x-forwarded-for"] ||
|
req.headers["x-forwarded-for"] || req.headers["x-real-ip"] || req.headers["x-forwarded-host"],
|
||||||
req.headers?.["x-real-ip"] ||
|
|
||||||
req.headers?.["x-forwarded-host"],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return (hostIsLocal || hostIsTailscaleServe) && !hasForwarded;
|
return hostIsLocal && !hasForwarded;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getTailscaleUser(req?: IncomingMessage): TailscaleUser | null {
|
function getTailscaleUser(req?: IncomingMessage): TailscaleUser | null {
|
||||||
@@ -81,17 +64,11 @@ function getTailscaleUser(req?: IncomingMessage): TailscaleUser | null {
|
|||||||
if (typeof login !== "string" || !login.trim()) return null;
|
if (typeof login !== "string" || !login.trim()) return null;
|
||||||
const nameRaw = req.headers["tailscale-user-name"];
|
const nameRaw = req.headers["tailscale-user-name"];
|
||||||
const profilePic = req.headers["tailscale-user-profile-pic"];
|
const profilePic = req.headers["tailscale-user-profile-pic"];
|
||||||
const name =
|
const name = typeof nameRaw === "string" && nameRaw.trim() ? nameRaw.trim() : login.trim();
|
||||||
typeof nameRaw === "string" && nameRaw.trim()
|
|
||||||
? nameRaw.trim()
|
|
||||||
: login.trim();
|
|
||||||
return {
|
return {
|
||||||
login: login.trim(),
|
login: login.trim(),
|
||||||
name,
|
name,
|
||||||
profilePic:
|
profilePic: typeof profilePic === "string" && profilePic.trim() ? profilePic.trim() : undefined,
|
||||||
typeof profilePic === "string" && profilePic.trim()
|
|
||||||
? profilePic.trim()
|
|
||||||
: undefined,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,17 +76,14 @@ function hasTailscaleProxyHeaders(req?: IncomingMessage): boolean {
|
|||||||
if (!req) return false;
|
if (!req) return false;
|
||||||
return Boolean(
|
return Boolean(
|
||||||
req.headers["x-forwarded-for"] &&
|
req.headers["x-forwarded-for"] &&
|
||||||
req.headers["x-forwarded-proto"] &&
|
req.headers["x-forwarded-proto"] &&
|
||||||
req.headers["x-forwarded-host"],
|
req.headers["x-forwarded-host"],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function isTailscaleProxyRequest(req?: IncomingMessage): boolean {
|
function isTailscaleProxyRequest(req?: IncomingMessage): boolean {
|
||||||
if (!req) return false;
|
if (!req) return false;
|
||||||
return (
|
return isLoopbackAddress(req.socket?.remoteAddress) && hasTailscaleProxyHeaders(req);
|
||||||
isLoopbackAddress(req.socket?.remoteAddress) &&
|
|
||||||
hasTailscaleProxyHeaders(req)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function resolveGatewayAuth(params: {
|
export function resolveGatewayAuth(params: {
|
||||||
@@ -120,13 +94,11 @@ export function resolveGatewayAuth(params: {
|
|||||||
const authConfig = params.authConfig ?? {};
|
const authConfig = params.authConfig ?? {};
|
||||||
const env = params.env ?? process.env;
|
const env = params.env ?? process.env;
|
||||||
const token = authConfig.token ?? env.CLAWDBOT_GATEWAY_TOKEN ?? undefined;
|
const token = authConfig.token ?? env.CLAWDBOT_GATEWAY_TOKEN ?? undefined;
|
||||||
const password =
|
const password = authConfig.password ?? env.CLAWDBOT_GATEWAY_PASSWORD ?? undefined;
|
||||||
authConfig.password ?? env.CLAWDBOT_GATEWAY_PASSWORD ?? undefined;
|
|
||||||
const mode: ResolvedGatewayAuth["mode"] =
|
const mode: ResolvedGatewayAuth["mode"] =
|
||||||
authConfig.mode ?? (password ? "password" : token ? "token" : "none");
|
authConfig.mode ?? (password ? "password" : token ? "token" : "none");
|
||||||
const allowTailscale =
|
const allowTailscale =
|
||||||
authConfig.allowTailscale ??
|
authConfig.allowTailscale ?? (params.tailscaleMode === "serve" && mode !== "password");
|
||||||
(params.tailscaleMode === "serve" && mode !== "password");
|
|
||||||
return {
|
return {
|
||||||
mode,
|
mode,
|
||||||
token,
|
token,
|
||||||
@@ -142,9 +114,7 @@ export function assertGatewayAuthConfigured(auth: ResolvedGatewayAuth): void {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (auth.mode === "password" && !auth.password) {
|
if (auth.mode === "password" && !auth.password) {
|
||||||
throw new Error(
|
throw new Error("gateway auth mode is password, but no password was configured");
|
||||||
"gateway auth mode is password, but no password was configured",
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,10 +18,6 @@ const RESET_KEYS = [
|
|||||||
"resetAt",
|
"resetAt",
|
||||||
"reset_time",
|
"reset_time",
|
||||||
"resetTime",
|
"resetTime",
|
||||||
"next_reset_at",
|
|
||||||
"nextResetAt",
|
|
||||||
"next_reset_time",
|
|
||||||
"nextResetTime",
|
|
||||||
"expires_at",
|
"expires_at",
|
||||||
"expiresAt",
|
"expiresAt",
|
||||||
"expire_at",
|
"expire_at",
|
||||||
@@ -56,14 +52,6 @@ const USED_KEYS = [
|
|||||||
"usedQuota",
|
"usedQuota",
|
||||||
"used_times",
|
"used_times",
|
||||||
"usedTimes",
|
"usedTimes",
|
||||||
"prompt_used",
|
|
||||||
"promptUsed",
|
|
||||||
"used_prompt",
|
|
||||||
"usedPrompt",
|
|
||||||
"prompts_used",
|
|
||||||
"promptsUsed",
|
|
||||||
"current_interval_usage_count",
|
|
||||||
"currentIntervalUsageCount",
|
|
||||||
"consumed",
|
"consumed",
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
@@ -77,20 +65,6 @@ const TOTAL_KEYS = [
|
|||||||
"totalQuota",
|
"totalQuota",
|
||||||
"total_times",
|
"total_times",
|
||||||
"totalTimes",
|
"totalTimes",
|
||||||
"prompt_total",
|
|
||||||
"promptTotal",
|
|
||||||
"total_prompt",
|
|
||||||
"totalPrompt",
|
|
||||||
"prompt_limit",
|
|
||||||
"promptLimit",
|
|
||||||
"limit_prompt",
|
|
||||||
"limitPrompt",
|
|
||||||
"prompts_total",
|
|
||||||
"promptsTotal",
|
|
||||||
"total_prompts",
|
|
||||||
"totalPrompts",
|
|
||||||
"current_interval_total_count",
|
|
||||||
"currentIntervalTotalCount",
|
|
||||||
"limit",
|
"limit",
|
||||||
"quota",
|
"quota",
|
||||||
"quota_limit",
|
"quota_limit",
|
||||||
@@ -113,20 +87,6 @@ const REMAINING_KEYS = [
|
|||||||
"remain_times",
|
"remain_times",
|
||||||
"remainingTimes",
|
"remainingTimes",
|
||||||
"remaining_times",
|
"remaining_times",
|
||||||
"prompt_remain",
|
|
||||||
"promptRemain",
|
|
||||||
"remain_prompt",
|
|
||||||
"remainPrompt",
|
|
||||||
"prompt_remaining",
|
|
||||||
"promptRemaining",
|
|
||||||
"remaining_prompt",
|
|
||||||
"remainingPrompt",
|
|
||||||
"prompts_remaining",
|
|
||||||
"promptsRemaining",
|
|
||||||
"prompt_left",
|
|
||||||
"promptLeft",
|
|
||||||
"prompts_left",
|
|
||||||
"promptsLeft",
|
|
||||||
"left",
|
"left",
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
@@ -184,62 +144,6 @@ function parseEpoch(value: unknown): number | undefined {
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
function hasAny(record: Record<string, unknown>, keys: readonly string[]): boolean {
|
|
||||||
return keys.some((key) => key in record);
|
|
||||||
}
|
|
||||||
|
|
||||||
function scoreUsageRecord(record: Record<string, unknown>): number {
|
|
||||||
let score = 0;
|
|
||||||
if (hasAny(record, PERCENT_KEYS)) score += 4;
|
|
||||||
if (hasAny(record, TOTAL_KEYS)) score += 3;
|
|
||||||
if (hasAny(record, USED_KEYS) || hasAny(record, REMAINING_KEYS)) score += 2;
|
|
||||||
if (hasAny(record, RESET_KEYS)) score += 1;
|
|
||||||
if (hasAny(record, PLAN_KEYS)) score += 1;
|
|
||||||
return score;
|
|
||||||
}
|
|
||||||
|
|
||||||
function collectUsageCandidates(root: Record<string, unknown>): Record<string, unknown>[] {
|
|
||||||
const MAX_SCAN_DEPTH = 4;
|
|
||||||
const MAX_SCAN_NODES = 60;
|
|
||||||
const queue: Array<{ value: unknown; depth: number }> = [{ value: root, depth: 0 }];
|
|
||||||
const seen = new Set<object>();
|
|
||||||
const candidates: Array<{ record: Record<string, unknown>; score: number; depth: number }> = [];
|
|
||||||
let scanned = 0;
|
|
||||||
|
|
||||||
while (queue.length && scanned < MAX_SCAN_NODES) {
|
|
||||||
const next = queue.shift();
|
|
||||||
if (!next) break;
|
|
||||||
scanned += 1;
|
|
||||||
const { value, depth } = next;
|
|
||||||
|
|
||||||
if (isRecord(value)) {
|
|
||||||
if (seen.has(value)) continue;
|
|
||||||
seen.add(value);
|
|
||||||
const score = scoreUsageRecord(value);
|
|
||||||
if (score > 0) candidates.push({ record: value, score, depth });
|
|
||||||
if (depth < MAX_SCAN_DEPTH) {
|
|
||||||
for (const nested of Object.values(value)) {
|
|
||||||
if (isRecord(nested) || Array.isArray(nested)) {
|
|
||||||
queue.push({ value: nested, depth: depth + 1 });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Array.isArray(value) && depth < MAX_SCAN_DEPTH) {
|
|
||||||
for (const nested of value) {
|
|
||||||
if (isRecord(nested) || Array.isArray(nested)) {
|
|
||||||
queue.push({ value: nested, depth: depth + 1 });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
candidates.sort((a, b) => b.score - a.score || a.depth - b.depth);
|
|
||||||
return candidates.map((candidate) => candidate.record);
|
|
||||||
}
|
|
||||||
|
|
||||||
function deriveWindowLabel(payload: Record<string, unknown>): string {
|
function deriveWindowLabel(payload: Record<string, unknown>): string {
|
||||||
const hours = pickNumber(payload, WINDOW_HOUR_KEYS);
|
const hours = pickNumber(payload, WINDOW_HOUR_KEYS);
|
||||||
if (hours && Number.isFinite(hours)) return `${hours}h`;
|
if (hours && Number.isFinite(hours)) return `${hours}h`;
|
||||||
@@ -315,20 +219,7 @@ export async function fetchMinimaxUsage(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const payload = isRecord(data.data) ? data.data : data;
|
const payload = isRecord(data.data) ? data.data : data;
|
||||||
const candidates = collectUsageCandidates(payload);
|
const usedPercent = deriveUsedPercent(payload);
|
||||||
let usageRecord: Record<string, unknown> = payload;
|
|
||||||
let usedPercent: number | null = null;
|
|
||||||
for (const candidate of candidates) {
|
|
||||||
const candidatePercent = deriveUsedPercent(candidate);
|
|
||||||
if (candidatePercent !== null) {
|
|
||||||
usageRecord = candidate;
|
|
||||||
usedPercent = candidatePercent;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (usedPercent === null) {
|
|
||||||
usedPercent = deriveUsedPercent(payload);
|
|
||||||
}
|
|
||||||
if (usedPercent === null) {
|
if (usedPercent === null) {
|
||||||
return {
|
return {
|
||||||
provider: "minimax",
|
provider: "minimax",
|
||||||
@@ -339,13 +230,10 @@ export async function fetchMinimaxUsage(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const resetAt =
|
const resetAt =
|
||||||
parseEpoch(pickString(usageRecord, RESET_KEYS)) ??
|
parseEpoch(pickString(payload, RESET_KEYS)) ?? parseEpoch(pickNumber(payload, RESET_KEYS));
|
||||||
parseEpoch(pickNumber(usageRecord, RESET_KEYS)) ??
|
|
||||||
parseEpoch(pickString(payload, RESET_KEYS)) ??
|
|
||||||
parseEpoch(pickNumber(payload, RESET_KEYS));
|
|
||||||
const windows: UsageWindow[] = [
|
const windows: UsageWindow[] = [
|
||||||
{
|
{
|
||||||
label: deriveWindowLabel(usageRecord),
|
label: deriveWindowLabel(payload),
|
||||||
usedPercent,
|
usedPercent,
|
||||||
resetAt,
|
resetAt,
|
||||||
},
|
},
|
||||||
@@ -355,6 +243,6 @@ export async function fetchMinimaxUsage(
|
|||||||
provider: "minimax",
|
provider: "minimax",
|
||||||
displayName: PROVIDER_LABELS.minimax,
|
displayName: PROVIDER_LABELS.minimax,
|
||||||
windows,
|
windows,
|
||||||
plan: pickString(usageRecord, PLAN_KEYS) ?? pickString(payload, PLAN_KEYS),
|
plan: pickString(payload, PLAN_KEYS),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -137,83 +137,6 @@ describe("provider usage loading", () => {
|
|||||||
expect(mockFetch).toHaveBeenCalled();
|
expect(mockFetch).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("handles nested MiniMax usage payloads", async () => {
|
|
||||||
const makeResponse = (status: number, body: unknown): Response => {
|
|
||||||
const payload = typeof body === "string" ? body : JSON.stringify(body);
|
|
||||||
const headers = typeof body === "string" ? undefined : { "Content-Type": "application/json" };
|
|
||||||
return new Response(payload, { status, headers });
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockFetch = vi.fn<Parameters<typeof fetch>, ReturnType<typeof fetch>>(async (input) => {
|
|
||||||
const url =
|
|
||||||
typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
|
|
||||||
if (url.includes("api.minimax.io/v1/coding_plan/remains")) {
|
|
||||||
return makeResponse(200, {
|
|
||||||
base_resp: { status_code: 0, status_msg: "ok" },
|
|
||||||
data: {
|
|
||||||
plan_name: "Coding Plan",
|
|
||||||
usage: {
|
|
||||||
prompt_limit: 200,
|
|
||||||
prompt_remain: 50,
|
|
||||||
next_reset_time: "2026-01-07T05:00:00Z",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return makeResponse(404, "not found");
|
|
||||||
});
|
|
||||||
|
|
||||||
const summary = await loadProviderUsageSummary({
|
|
||||||
now: Date.UTC(2026, 0, 7, 0, 0, 0),
|
|
||||||
auth: [{ provider: "minimax", token: "token-1b" }],
|
|
||||||
fetch: mockFetch,
|
|
||||||
});
|
|
||||||
|
|
||||||
const minimax = summary.providers.find((p) => p.provider === "minimax");
|
|
||||||
expect(minimax?.windows[0]?.usedPercent).toBe(75);
|
|
||||||
expect(minimax?.plan).toBe("Coding Plan");
|
|
||||||
expect(mockFetch).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("handles MiniMax model_remains usage payloads", async () => {
|
|
||||||
const makeResponse = (status: number, body: unknown): Response => {
|
|
||||||
const payload = typeof body === "string" ? body : JSON.stringify(body);
|
|
||||||
const headers = typeof body === "string" ? undefined : { "Content-Type": "application/json" };
|
|
||||||
return new Response(payload, { status, headers });
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockFetch = vi.fn<Parameters<typeof fetch>, ReturnType<typeof fetch>>(async (input) => {
|
|
||||||
const url =
|
|
||||||
typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
|
|
||||||
if (url.includes("api.minimax.io/v1/coding_plan/remains")) {
|
|
||||||
return makeResponse(200, {
|
|
||||||
base_resp: { status_code: 0, status_msg: "ok" },
|
|
||||||
model_remains: [
|
|
||||||
{
|
|
||||||
start_time: 1736217600,
|
|
||||||
end_time: 1736235600,
|
|
||||||
remains_time: 600,
|
|
||||||
current_interval_total_count: 120,
|
|
||||||
current_interval_usage_count: 30,
|
|
||||||
model_name: "MiniMax-M2.1",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return makeResponse(404, "not found");
|
|
||||||
});
|
|
||||||
|
|
||||||
const summary = await loadProviderUsageSummary({
|
|
||||||
now: Date.UTC(2026, 0, 7, 0, 0, 0),
|
|
||||||
auth: [{ provider: "minimax", token: "token-1b" }],
|
|
||||||
fetch: mockFetch,
|
|
||||||
});
|
|
||||||
|
|
||||||
const minimax = summary.providers.find((p) => p.provider === "minimax");
|
|
||||||
expect(minimax?.windows[0]?.usedPercent).toBe(25);
|
|
||||||
expect(mockFetch).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("discovers Claude usage from token auth profiles", async () => {
|
it("discovers Claude usage from token auth profiles", async () => {
|
||||||
await withTempHome(
|
await withTempHome(
|
||||||
async (tempHome) => {
|
async (tempHome) => {
|
||||||
|
|||||||
+21
-47
@@ -37,10 +37,6 @@ function supportsSystemRun(commands?: string[]): boolean {
|
|||||||
return Array.isArray(commands) && commands.includes("system.run");
|
return Array.isArray(commands) && commands.includes("system.run");
|
||||||
}
|
}
|
||||||
|
|
||||||
function supportsSystemWhich(commands?: string[]): boolean {
|
|
||||||
return Array.isArray(commands) && commands.includes("system.which");
|
|
||||||
}
|
|
||||||
|
|
||||||
function upsertNode(record: {
|
function upsertNode(record: {
|
||||||
nodeId: string;
|
nodeId: string;
|
||||||
displayName?: string;
|
displayName?: string;
|
||||||
@@ -140,27 +136,6 @@ function buildBinProbeScript(bins: string[]): string {
|
|||||||
return `for b in ${escaped}; do if command -v "$b" >/dev/null 2>&1; then echo "$b"; fi; done`;
|
return `for b in ${escaped}; do if command -v "$b" >/dev/null 2>&1; then echo "$b"; fi; done`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseBinProbePayload(payloadJSON: string | null | undefined): string[] {
|
|
||||||
if (!payloadJSON) return [];
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(payloadJSON) as { stdout?: unknown; bins?: unknown };
|
|
||||||
if (Array.isArray(parsed.bins)) {
|
|
||||||
return parsed.bins
|
|
||||||
.map((bin) => String(bin).trim())
|
|
||||||
.filter(Boolean);
|
|
||||||
}
|
|
||||||
if (typeof parsed.stdout === "string") {
|
|
||||||
return parsed.stdout
|
|
||||||
.split(/\r?\n/)
|
|
||||||
.map((line) => line.trim())
|
|
||||||
.filter(Boolean);
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function refreshRemoteNodeBins(params: {
|
export async function refreshRemoteNodeBins(params: {
|
||||||
nodeId: string;
|
nodeId: string;
|
||||||
platform?: string;
|
platform?: string;
|
||||||
@@ -171,9 +146,7 @@ export async function refreshRemoteNodeBins(params: {
|
|||||||
}) {
|
}) {
|
||||||
if (!remoteBridge) return;
|
if (!remoteBridge) return;
|
||||||
if (!isMacPlatform(params.platform, params.deviceFamily)) return;
|
if (!isMacPlatform(params.platform, params.deviceFamily)) return;
|
||||||
const canWhich = supportsSystemWhich(params.commands);
|
if (!supportsSystemRun(params.commands)) return;
|
||||||
const canRun = supportsSystemRun(params.commands);
|
|
||||||
if (!canWhich && !canRun) return;
|
|
||||||
|
|
||||||
const workspaceDirs = listWorkspaceDirs(params.cfg);
|
const workspaceDirs = listWorkspaceDirs(params.cfg);
|
||||||
const requiredBins = new Set<string>();
|
const requiredBins = new Set<string>();
|
||||||
@@ -185,30 +158,31 @@ export async function refreshRemoteNodeBins(params: {
|
|||||||
}
|
}
|
||||||
if (requiredBins.size === 0) return;
|
if (requiredBins.size === 0) return;
|
||||||
|
|
||||||
|
const script = buildBinProbeScript([...requiredBins]);
|
||||||
|
const payload = {
|
||||||
|
command: ["/bin/sh", "-lc", script],
|
||||||
|
};
|
||||||
try {
|
try {
|
||||||
const binsList = [...requiredBins];
|
const res = await remoteBridge.invoke({
|
||||||
const res = await remoteBridge.invoke(
|
nodeId: params.nodeId,
|
||||||
canWhich
|
command: "system.run",
|
||||||
? {
|
paramsJSON: JSON.stringify(payload),
|
||||||
nodeId: params.nodeId,
|
timeoutMs: params.timeoutMs ?? 15_000,
|
||||||
command: "system.which",
|
});
|
||||||
paramsJSON: JSON.stringify({ bins: binsList }),
|
|
||||||
timeoutMs: params.timeoutMs ?? 15_000,
|
|
||||||
}
|
|
||||||
: {
|
|
||||||
nodeId: params.nodeId,
|
|
||||||
command: "system.run",
|
|
||||||
paramsJSON: JSON.stringify({
|
|
||||||
command: ["/bin/sh", "-lc", buildBinProbeScript(binsList)],
|
|
||||||
}),
|
|
||||||
timeoutMs: params.timeoutMs ?? 15_000,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
log.warn(`remote bin probe failed (${params.nodeId}): ${res.error?.message ?? "unknown"}`);
|
log.warn(`remote bin probe failed (${params.nodeId}): ${res.error?.message ?? "unknown"}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const bins = parseBinProbePayload(res.payloadJSON);
|
const raw = typeof res.payloadJSON === "string" ? res.payloadJSON : "";
|
||||||
|
const parsed =
|
||||||
|
raw && raw.trim().length > 0
|
||||||
|
? (JSON.parse(raw) as { stdout?: string })
|
||||||
|
: ({ stdout: "" } as { stdout?: string });
|
||||||
|
const stdout = typeof parsed.stdout === "string" ? parsed.stdout : "";
|
||||||
|
const bins = stdout
|
||||||
|
.split(/\r?\n/)
|
||||||
|
.map((line) => line.trim())
|
||||||
|
.filter(Boolean);
|
||||||
recordRemoteNodeBins(params.nodeId, bins);
|
recordRemoteNodeBins(params.nodeId, bins);
|
||||||
await updatePairedNodeMetadata(params.nodeId, { bins });
|
await updatePairedNodeMetadata(params.nodeId, { bins });
|
||||||
bumpSkillsSnapshotVersion({ reason: "remote-node" });
|
bumpSkillsSnapshotVersion({ reason: "remote-node" });
|
||||||
|
|||||||
Loaded 100 of 109 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user