Compare commits
39
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
206071be69 | ||
|
|
98f399b7fd | ||
|
|
38cc2a3288 | ||
|
|
28c49db494 | ||
|
|
026e6c4df4 | ||
|
|
841dfc693e | ||
|
|
f38278d919 | ||
|
|
9545edcb49 | ||
|
|
f3554a3ad8 | ||
|
|
b30359e9cd | ||
|
|
d3898ee8df | ||
|
|
d1c2fc4bc8 | ||
|
|
a5a3ab958f | ||
|
|
165861e78d | ||
|
|
e7c355ee85 | ||
|
|
052a58f2f7 | ||
|
|
5ff56ffb4e | ||
|
|
9a3dd626a1 | ||
|
|
aae4b2952f | ||
|
|
aec622fe63 | ||
|
|
e6287270d9 | ||
|
|
caf9dec89c | ||
|
|
438a41f91f | ||
|
|
a0cd295c0f | ||
|
|
14d3d72bcc | ||
|
|
03916ed10e | ||
|
|
5bd55037e4 | ||
|
|
ec51bb700c | ||
|
|
051d518078 | ||
|
|
294886b54f | ||
|
|
6629e31789 | ||
|
|
9d7087168f | ||
|
|
daceeaa24c | ||
|
|
778800be70 | ||
|
|
1b973caf7a | ||
|
|
ea775025c0 | ||
|
|
0b2830470c | ||
|
|
7e59c15496 | ||
|
|
079af0d0b0 |
No files matched your search
+8
-1
@@ -9,6 +9,7 @@ Docs: https://docs.clawd.bot
|
|||||||
- Repo: remove the Peekaboo git submodule now that the SPM release is used.
|
- Repo: remove the Peekaboo git submodule now that the SPM release is used.
|
||||||
- Update: sync plugin sources on channel switches and update npm-installed plugins during `clawdbot update`.
|
- Update: sync plugin sources on channel switches and update npm-installed plugins during `clawdbot update`.
|
||||||
- Plugins: share npm plugin update logic between `clawdbot update` and `clawdbot plugins update`.
|
- Plugins: share npm plugin update logic between `clawdbot update` and `clawdbot plugins update`.
|
||||||
|
- Browser: allow config defaults for efficient snapshots in the tool/CLI. (#1336) — thanks @sebslight.
|
||||||
- Channels: add the Nostr plugin channel with profile management + onboarding install defaults. (#1323) — thanks @joelklabo.
|
- Channels: add the Nostr plugin channel with profile management + onboarding install defaults. (#1323) — thanks @joelklabo.
|
||||||
- Plugins: require manifest-embedded config schemas, validate configs without loading plugin code, and surface plugin config warnings. (#1272) — thanks @thewilloftheshadow.
|
- Plugins: require manifest-embedded config schemas, validate configs without loading plugin code, and surface plugin config warnings. (#1272) — thanks @thewilloftheshadow.
|
||||||
- Plugins: move channel catalog metadata into plugin manifests; align Nextcloud Talk policy helpers with core patterns. (#1290) — thanks @NicholaiVogel.
|
- Plugins: move channel catalog metadata into plugin manifests; align Nextcloud Talk policy helpers with core patterns. (#1290) — thanks @NicholaiVogel.
|
||||||
@@ -20,26 +21,32 @@ Docs: https://docs.clawd.bot
|
|||||||
- Security: warn when <=300B models run without sandboxing and with web tools enabled.
|
- Security: warn when <=300B models run without sandboxing and with web tools enabled.
|
||||||
- Skills: add download installs with OS-filtered install options; add local sherpa-onnx-tts skill.
|
- Skills: add download installs with OS-filtered install options; add local sherpa-onnx-tts skill.
|
||||||
- Docs: clarify WhatsApp voice notes and Windows WSL portproxy LAN access notes.
|
- Docs: clarify WhatsApp voice notes and Windows WSL portproxy LAN access notes.
|
||||||
|
- UI: add copy-as-markdown with error feedback and drop legacy list view. (#1345) — thanks @bradleypriest.
|
||||||
### Fixes
|
### Fixes
|
||||||
- Discovery: shorten Bonjour DNS-SD service type to `_clawdbot-gw._tcp` and update discovery clients/docs.
|
- Discovery: shorten Bonjour DNS-SD service type to `_clawdbot-gw._tcp` and update discovery clients/docs.
|
||||||
|
- Telegram: answer callback queries immediately to prevent retries. (#1349) — thanks @siddhantjain.
|
||||||
- Agents: preserve subagent announce thread/topic routing + queued replies across channels. (#1241) — thanks @gnarco.
|
- Agents: preserve subagent announce thread/topic routing + queued replies across channels. (#1241) — thanks @gnarco.
|
||||||
- Agents: avoid treating timeout errors with "aborted" messages as user aborts, so model fallback still runs.
|
- Agents: avoid treating timeout errors with "aborted" messages as user aborts, so model fallback still runs.
|
||||||
- Diagnostics: export OTLP logs, correct queue depth tracking, and document message-flow telemetry.
|
- Diagnostics: export OTLP logs, correct queue depth tracking, and document message-flow telemetry.
|
||||||
- Diagnostics: emit message-flow diagnostics across channels via shared dispatch; gate heartbeat/webhook logging. (#1244) — thanks @oscargavin.
|
- Diagnostics: emit message-flow diagnostics across channels via shared dispatch; gate heartbeat/webhook logging. (#1244) — thanks @oscargavin.
|
||||||
|
- CLI: preserve cron delivery settings when editing message payloads. (#1322) — thanks @KrauseFx.
|
||||||
|
- CLI: keep `clawdbot logs` output resilient to broken pipes while preserving progress output.
|
||||||
- Model catalog: avoid caching import failures, log transient discovery errors, and keep partial results. (#1332) — thanks @dougvk.
|
- Model catalog: avoid caching import failures, log transient discovery errors, and keep partial results. (#1332) — thanks @dougvk.
|
||||||
- Doctor: clarify plugin auto-enable hint text in the startup banner.
|
- Doctor: clarify plugin auto-enable hint text in the startup banner.
|
||||||
- Gateway: clarify unauthorized handshake responses with token/password mismatch guidance.
|
- Gateway: clarify unauthorized handshake responses with token/password mismatch guidance.
|
||||||
|
- Gateway: clarify connect/validation errors for gateway params. (#1347) — thanks @vignesh07.
|
||||||
- Gateway: preserve restart wake routing + thread replies across restarts. (#1337) — thanks @John-Rood.
|
- Gateway: preserve restart wake routing + thread replies across restarts. (#1337) — thanks @John-Rood.
|
||||||
- Gateway: reschedule per-agent heartbeats on config hot reload without restarting the runner.
|
- Gateway: reschedule per-agent heartbeats on config hot reload without restarting the runner.
|
||||||
- Config: log invalid config issues once per run and keep invalid-config errors stackless.
|
- Config: log invalid config issues once per run and keep invalid-config errors stackless.
|
||||||
|
- Exec: default gateway/node exec security to allowlist when unset (sandbox stays deny).
|
||||||
- UI: keep config form enums typed, preserve empty strings, protect sensitive defaults, and deepen config search. (#1315) — thanks @MaudeBot.
|
- UI: keep config form enums typed, preserve empty strings, protect sensitive defaults, and deepen config search. (#1315) — thanks @MaudeBot.
|
||||||
- UI: preserve ordered list numbering in chat markdown. (#1341) — thanks @bradleypriest.
|
- UI: preserve ordered list numbering in chat markdown. (#1341) — thanks @bradleypriest.
|
||||||
- UI: allow Control UI to read gatewayUrl from URL params for remote WebSocket targets. (#1342) — thanks @ameno-.
|
- UI: allow Control UI to read gatewayUrl from URL params for remote WebSocket targets. (#1342) — thanks @ameno-.
|
||||||
- Web search: infer Perplexity base URL from API key source (direct vs OpenRouter).
|
- Web search: infer Perplexity base URL from API key source (direct vs OpenRouter).
|
||||||
|
- Web fetch: harden SSRF protection with shared hostname checks and redirect limits. (#1346) — thanks @fogboots.
|
||||||
- TUI: keep thinking blocks ordered before content during streaming and isolate per-run assembly. (#1202) — thanks @aaronveklabs.
|
- TUI: keep thinking blocks ordered before content during streaming and isolate per-run assembly. (#1202) — thanks @aaronveklabs.
|
||||||
- TUI: align custom editor initialization with the latest pi-tui API. (#1298) — thanks @sibbl.
|
- TUI: align custom editor initialization with the latest pi-tui API. (#1298) — thanks @sibbl.
|
||||||
- CLI: avoid duplicating --profile/--dev flags when formatting commands.
|
- CLI: avoid duplicating --profile/--dev flags when formatting commands.
|
||||||
- CLI: make `clawdbot logs --follow` output stable, keep spinners, and surface closed pipes. (#1318) — thanks @sebslight.
|
|
||||||
- Status: route native `/status` to the active agent so model selection reflects the correct profile. (#1301)
|
- Status: route native `/status` to the active agent so model selection reflects the correct profile. (#1301)
|
||||||
- Exec: prefer bash when fish is default shell, falling back to sh if bash is missing. (#1297) — thanks @ysqander.
|
- Exec: prefer bash when fish is default shell, falling back to sh if bash is missing. (#1297) — thanks @ysqander.
|
||||||
- Exec: merge login-shell PATH for host=gateway exec while keeping daemon PATH minimal. (#1304)
|
- Exec: merge login-shell PATH for host=gateway exec while keeping daemon PATH minimal. (#1304)
|
||||||
|
|||||||
@@ -479,27 +479,27 @@ Core contributors:
|
|||||||
Thanks to all clawtributors:
|
Thanks to all clawtributors:
|
||||||
|
|
||||||
<p align="left">
|
<p align="left">
|
||||||
<a href="https://github.com/steipete"><img src="https://avatars.githubusercontent.com/u/58493?v=4&s=48" width="48" height="48" alt="steipete" title="steipete"/></a> <a href="https://github.com/bohdanpodvirnyi"><img src="https://avatars.githubusercontent.com/u/31819391?v=4&s=48" width="48" height="48" alt="bohdanpodvirnyi" title="bohdanpodvirnyi"/></a> <a href="https://github.com/joaohlisboa"><img src="https://avatars.githubusercontent.com/u/8200873?v=4&s=48" width="48" height="48" alt="joaohlisboa" title="joaohlisboa"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/MatthieuBizien"><img src="https://avatars.githubusercontent.com/u/173090?v=4&s=48" width="48" height="48" alt="MatthieuBizien" title="MatthieuBizien"/></a> <a href="https://github.com/rahthakor"><img src="https://avatars.githubusercontent.com/u/8470553?v=4&s=48" width="48" height="48" alt="rahthakor" title="rahthakor"/></a> <a href="https://github.com/vrknetha"><img src="https://avatars.githubusercontent.com/u/20596261?v=4&s=48" width="48" height="48" alt="vrknetha" title="vrknetha"/></a> <a href="https://github.com/radek-paclt"><img src="https://avatars.githubusercontent.com/u/50451445?v=4&s=48" width="48" height="48" alt="radek-paclt" title="radek-paclt"/></a> <a href="https://github.com/joshp123"><img src="https://avatars.githubusercontent.com/u/1497361?v=4&s=48" width="48" height="48" alt="joshp123" title="joshp123"/></a> <a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a>
|
<a href="https://github.com/steipete"><img src="https://avatars.githubusercontent.com/u/58493?v=4&s=48" width="48" height="48" alt="steipete" title="steipete"/></a> <a href="https://github.com/bohdanpodvirnyi"><img src="https://avatars.githubusercontent.com/u/31819391?v=4&s=48" width="48" height="48" alt="bohdanpodvirnyi" title="bohdanpodvirnyi"/></a> <a href="https://github.com/joaohlisboa"><img src="https://avatars.githubusercontent.com/u/8200873?v=4&s=48" width="48" height="48" alt="joaohlisboa" title="joaohlisboa"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/MatthieuBizien"><img src="https://avatars.githubusercontent.com/u/173090?v=4&s=48" width="48" height="48" alt="MatthieuBizien" title="MatthieuBizien"/></a> <a href="https://github.com/MaudeBot"><img src="https://avatars.githubusercontent.com/u/255777700?v=4&s=48" width="48" height="48" alt="MaudeBot" title="MaudeBot"/></a> <a href="https://github.com/rahthakor"><img src="https://avatars.githubusercontent.com/u/8470553?v=4&s=48" width="48" height="48" alt="rahthakor" title="rahthakor"/></a> <a href="https://github.com/vrknetha"><img src="https://avatars.githubusercontent.com/u/20596261?v=4&s=48" width="48" height="48" alt="vrknetha" title="vrknetha"/></a> <a href="https://github.com/radek-paclt"><img src="https://avatars.githubusercontent.com/u/50451445?v=4&s=48" width="48" height="48" alt="radek-paclt" title="radek-paclt"/></a> <a href="https://github.com/joshp123"><img src="https://avatars.githubusercontent.com/u/1497361?v=4&s=48" width="48" height="48" alt="joshp123" title="joshp123"/></a>
|
||||||
<a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a> <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a> <a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a>
|
<a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a> <a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a> <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a>
|
||||||
<a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a> <a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a>
|
<a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a>
|
||||||
<a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a> <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a> <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a>
|
<a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a> <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a>
|
||||||
<a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a> <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a>
|
<a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a> <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a>
|
||||||
<a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a> <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a> <a href="https://github.com/joshrad-dev"><img src="https://avatars.githubusercontent.com/u/62785552?v=4&s=48" width="48" height="48" alt="joshrad-dev" title="joshrad-dev"/></a>
|
<a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a> <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a>
|
||||||
<a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a> <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a> <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a> <a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a>
|
<a href="https://github.com/joshrad-dev"><img src="https://avatars.githubusercontent.com/u/62785552?v=4&s=48" width="48" height="48" alt="joshrad-dev" title="joshrad-dev"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a> <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a> <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a>
|
||||||
<a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/John-Rood"><img src="https://avatars.githubusercontent.com/u/62669593?v=4&s=48" width="48" height="48" alt="John-Rood" title="John-Rood"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a> <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a> <a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a>
|
<a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a> <a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/John-Rood"><img src="https://avatars.githubusercontent.com/u/62669593?v=4&s=48" width="48" height="48" alt="John-Rood" title="John-Rood"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a> <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a>
|
||||||
<a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/cheeeee"><img src="https://avatars.githubusercontent.com/u/21245729?v=4&s=48" width="48" height="48" alt="cheeeee" title="cheeeee"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/Whoaa512"><img src="https://avatars.githubusercontent.com/u/1581943?v=4&s=48" width="48" height="48" alt="Whoaa512" title="Whoaa512"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/chriseidhof"><img src="https://avatars.githubusercontent.com/u/5382?v=4&s=48" width="48" height="48" alt="chriseidhof" title="chriseidhof"/></a> <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a> <a href="https://github.com/vignesh07"><img src="https://avatars.githubusercontent.com/u/1436853?v=4&s=48" width="48" height="48" alt="vignesh07" title="vignesh07"/></a> <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a>
|
<a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a> <a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/cheeeee"><img src="https://avatars.githubusercontent.com/u/21245729?v=4&s=48" width="48" height="48" alt="cheeeee" title="cheeeee"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/Whoaa512"><img src="https://avatars.githubusercontent.com/u/1581943?v=4&s=48" width="48" height="48" alt="Whoaa512" title="Whoaa512"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/chriseidhof"><img src="https://avatars.githubusercontent.com/u/5382?v=4&s=48" width="48" height="48" alt="chriseidhof" title="chriseidhof"/></a> <a href="https://github.com/vignesh07"><img src="https://avatars.githubusercontent.com/u/1436853?v=4&s=48" width="48" height="48" alt="vignesh07" title="vignesh07"/></a> <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a>
|
||||||
<a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a> <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a>
|
<a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a> <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a>
|
||||||
<a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a>
|
<a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a> <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a>
|
||||||
<a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a>
|
<a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a>
|
||||||
<a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a>
|
<a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a>
|
||||||
<a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a>
|
<a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a>
|
||||||
<a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a>
|
<a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a>
|
||||||
<a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a> <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a>
|
<a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a>
|
||||||
<a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a>
|
<a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a> <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a>
|
||||||
<a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a>
|
<a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a>
|
||||||
<a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a>
|
<a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a>
|
||||||
<a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a>
|
<a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a>
|
||||||
<a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a>
|
<a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a>
|
||||||
<a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a>
|
<a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a>
|
||||||
<a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
|
<a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
|
||||||
</p>
|
</p>
|
||||||
@@ -263,7 +263,8 @@ extension ConfigSettings {
|
|||||||
let subsections = self.resolveSubsections(for: section)
|
let subsections = self.resolveSubsections(for: section)
|
||||||
let resolved: (ConfigSchemaNode, ConfigPath) = {
|
let resolved: (ConfigSchemaNode, ConfigPath) = {
|
||||||
if case let .key(key) = subsection,
|
if case let .key(key) = subsection,
|
||||||
let match = subsections.first(where: { $0.key == key }) {
|
let match = subsections.first(where: { $0.key == key })
|
||||||
|
{
|
||||||
return (match.node, match.path)
|
return (match.node, match.path)
|
||||||
}
|
}
|
||||||
return (self.resolvedSchemaNode(section.node), defaultPath)
|
return (self.resolvedSchemaNode(section.node), defaultPath)
|
||||||
|
|||||||
@@ -319,7 +319,7 @@ private enum ExecHostExecutor {
|
|||||||
security: context.security,
|
security: context.security,
|
||||||
allowlistMatch: context.allowlistMatch,
|
allowlistMatch: context.allowlistMatch,
|
||||||
skillAllow: context.skillAllow),
|
skillAllow: context.skillAllow),
|
||||||
approvalDecision == nil
|
approvalDecision == nil
|
||||||
{
|
{
|
||||||
let decision = ExecApprovalsPromptPresenter.prompt(
|
let decision = ExecApprovalsPromptPresenter.prompt(
|
||||||
ExecApprovalPromptRequest(
|
ExecApprovalPromptRequest(
|
||||||
|
|||||||
@@ -172,6 +172,10 @@ actor GatewayEndpointStore {
|
|||||||
return configToken
|
return configToken
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if isRemote {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
if let token = launchdSnapshot?.token?.trimmingCharacters(in: .whitespacesAndNewlines),
|
if let token = launchdSnapshot?.token?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||||
!token.isEmpty
|
!token.isEmpty
|
||||||
{
|
{
|
||||||
@@ -554,13 +558,16 @@ actor GatewayEndpointStore {
|
|||||||
{
|
{
|
||||||
switch bindMode {
|
switch bindMode {
|
||||||
case "tailnet":
|
case "tailnet":
|
||||||
tailscaleIP ?? "127.0.0.1"
|
return tailscaleIP ?? "127.0.0.1"
|
||||||
case "auto":
|
case "auto":
|
||||||
"127.0.0.1"
|
if let tailscaleIP, !tailscaleIP.isEmpty {
|
||||||
|
return tailscaleIP
|
||||||
|
}
|
||||||
|
return "127.0.0.1"
|
||||||
case "custom":
|
case "custom":
|
||||||
customBindHost ?? "127.0.0.1"
|
return customBindHost ?? "127.0.0.1"
|
||||||
default:
|
default:
|
||||||
"127.0.0.1"
|
return "127.0.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -631,11 +638,12 @@ extension GatewayEndpointStore {
|
|||||||
|
|
||||||
static func _testResolveLocalGatewayHost(
|
static func _testResolveLocalGatewayHost(
|
||||||
bindMode: String?,
|
bindMode: String?,
|
||||||
tailscaleIP: String?) -> String
|
tailscaleIP: String?,
|
||||||
|
customBindHost: String? = nil) -> String
|
||||||
{
|
{
|
||||||
self.resolveLocalGatewayHost(
|
self.resolveLocalGatewayHost(
|
||||||
bindMode: bindMode,
|
bindMode: bindMode,
|
||||||
customBindHost: nil,
|
customBindHost: customBindHost,
|
||||||
tailscaleIP: tailscaleIP)
|
tailscaleIP: tailscaleIP)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ import AppKit
|
|||||||
import Foundation
|
import Foundation
|
||||||
import Observation
|
import Observation
|
||||||
import os
|
import os
|
||||||
|
#if canImport(Darwin)
|
||||||
|
import Darwin
|
||||||
|
#endif
|
||||||
|
|
||||||
/// Manages Tailscale integration and status checking.
|
/// Manages Tailscale integration and status checking.
|
||||||
@Observable
|
@Observable
|
||||||
@@ -101,15 +104,12 @@ final class TailscaleService {
|
|||||||
|
|
||||||
func checkTailscaleStatus() async {
|
func checkTailscaleStatus() async {
|
||||||
self.isInstalled = self.checkAppInstallation()
|
self.isInstalled = self.checkAppInstallation()
|
||||||
guard self.isInstalled else {
|
if !self.isInstalled {
|
||||||
self.isRunning = false
|
self.isRunning = false
|
||||||
self.tailscaleHostname = nil
|
self.tailscaleHostname = nil
|
||||||
self.tailscaleIP = nil
|
self.tailscaleIP = nil
|
||||||
self.statusError = "Tailscale is not installed"
|
self.statusError = "Tailscale is not installed"
|
||||||
return
|
} else if let apiResponse = await fetchTailscaleStatus() {
|
||||||
}
|
|
||||||
|
|
||||||
if let apiResponse = await fetchTailscaleStatus() {
|
|
||||||
self.isRunning = apiResponse.status.lowercased() == "running"
|
self.isRunning = apiResponse.status.lowercased() == "running"
|
||||||
|
|
||||||
if self.isRunning {
|
if self.isRunning {
|
||||||
@@ -138,6 +138,15 @@ final class TailscaleService {
|
|||||||
self.statusError = "Please start the Tailscale app"
|
self.statusError = "Please start the Tailscale app"
|
||||||
self.logger.info("Tailscale API not responding; app likely not running")
|
self.logger.info("Tailscale API not responding; app likely not running")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if self.tailscaleIP == nil, let fallback = Self.detectTailnetIPv4() {
|
||||||
|
self.tailscaleIP = fallback
|
||||||
|
if !self.isRunning {
|
||||||
|
self.isRunning = true
|
||||||
|
}
|
||||||
|
self.statusError = nil
|
||||||
|
self.logger.info("Tailscale interface IP detected (fallback) ip=\(fallback, privacy: .public)")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func openTailscaleApp() {
|
func openTailscaleApp() {
|
||||||
@@ -163,4 +172,46 @@ final class TailscaleService {
|
|||||||
NSWorkspace.shared.open(url)
|
NSWorkspace.shared.open(url)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static func isTailnetIPv4(_ address: String) -> Bool {
|
||||||
|
let parts = address.split(separator: ".")
|
||||||
|
guard parts.count == 4 else { return false }
|
||||||
|
let octets = parts.compactMap { Int($0) }
|
||||||
|
guard octets.count == 4 else { return false }
|
||||||
|
let a = octets[0]
|
||||||
|
let b = octets[1]
|
||||||
|
return a == 100 && b >= 64 && b <= 127
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func detectTailnetIPv4() -> String? {
|
||||||
|
var addrList: UnsafeMutablePointer<ifaddrs>?
|
||||||
|
guard getifaddrs(&addrList) == 0, let first = addrList else { return nil }
|
||||||
|
defer { freeifaddrs(addrList) }
|
||||||
|
|
||||||
|
for ptr in sequence(first: first, next: { $0.pointee.ifa_next }) {
|
||||||
|
let flags = Int32(ptr.pointee.ifa_flags)
|
||||||
|
let isUp = (flags & IFF_UP) != 0
|
||||||
|
let isLoopback = (flags & IFF_LOOPBACK) != 0
|
||||||
|
let family = ptr.pointee.ifa_addr.pointee.sa_family
|
||||||
|
if !isUp || isLoopback || family != UInt8(AF_INET) { continue }
|
||||||
|
|
||||||
|
var addr = ptr.pointee.ifa_addr.pointee
|
||||||
|
var buffer = [CChar](repeating: 0, count: Int(NI_MAXHOST))
|
||||||
|
let result = getnameinfo(
|
||||||
|
&addr,
|
||||||
|
socklen_t(ptr.pointee.ifa_addr.pointee.sa_len),
|
||||||
|
&buffer,
|
||||||
|
socklen_t(buffer.count),
|
||||||
|
nil,
|
||||||
|
0,
|
||||||
|
NI_NUMERICHOST)
|
||||||
|
guard result == 0 else { continue }
|
||||||
|
let len = buffer.prefix { $0 != 0 }
|
||||||
|
let bytes = len.map { UInt8(bitPattern: $0) }
|
||||||
|
guard let ip = String(bytes: bytes, encoding: .utf8) else { continue }
|
||||||
|
if Self.isTailnetIPv4(ip) { return ip }
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,13 +1,16 @@
|
|||||||
import ClawdbotKit
|
import ClawdbotKit
|
||||||
import ClawdbotProtocol
|
import ClawdbotProtocol
|
||||||
import Foundation
|
import Foundation
|
||||||
|
#if canImport(Darwin)
|
||||||
|
import Darwin
|
||||||
|
#endif
|
||||||
|
|
||||||
struct ConnectOptions {
|
struct ConnectOptions {
|
||||||
var url: String?
|
var url: String?
|
||||||
var token: String?
|
var token: String?
|
||||||
var password: String?
|
var password: String?
|
||||||
var mode: String?
|
var mode: String?
|
||||||
var timeoutMs: Int = 15_000
|
var timeoutMs: Int = 15000
|
||||||
var json: Bool = false
|
var json: Bool = false
|
||||||
var probe: Bool = false
|
var probe: Bool = false
|
||||||
var clientId: String = "clawdbot-macos"
|
var clientId: String = "clawdbot-macos"
|
||||||
@@ -19,53 +22,43 @@ struct ConnectOptions {
|
|||||||
|
|
||||||
static func parse(_ args: [String]) -> ConnectOptions {
|
static func parse(_ args: [String]) -> ConnectOptions {
|
||||||
var opts = ConnectOptions()
|
var opts = ConnectOptions()
|
||||||
|
let flagHandlers: [String: (inout ConnectOptions) -> Void] = [
|
||||||
|
"-h": { $0.help = true },
|
||||||
|
"--help": { $0.help = true },
|
||||||
|
"--json": { $0.json = true },
|
||||||
|
"--probe": { $0.probe = true },
|
||||||
|
]
|
||||||
|
let valueHandlers: [String: (inout ConnectOptions, String) -> Void] = [
|
||||||
|
"--url": { $0.url = $1 },
|
||||||
|
"--token": { $0.token = $1 },
|
||||||
|
"--password": { $0.password = $1 },
|
||||||
|
"--mode": { $0.mode = $1 },
|
||||||
|
"--timeout": { opts, raw in
|
||||||
|
if let parsed = Int(raw.trimmingCharacters(in: .whitespacesAndNewlines)) {
|
||||||
|
opts.timeoutMs = max(250, parsed)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"--client-id": { $0.clientId = $1 },
|
||||||
|
"--client-mode": { $0.clientMode = $1 },
|
||||||
|
"--display-name": { $0.displayName = $1 },
|
||||||
|
"--role": { $0.role = $1 },
|
||||||
|
"--scopes": { opts, raw in
|
||||||
|
opts.scopes = raw.split(separator: ",").map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
|
||||||
|
.filter { !$0.isEmpty }
|
||||||
|
},
|
||||||
|
]
|
||||||
var i = 0
|
var i = 0
|
||||||
while i < args.count {
|
while i < args.count {
|
||||||
let arg = args[i]
|
let arg = args[i]
|
||||||
switch arg {
|
if let handler = flagHandlers[arg] {
|
||||||
case "-h", "--help":
|
handler(&opts)
|
||||||
opts.help = true
|
i += 1
|
||||||
case "--json":
|
continue
|
||||||
opts.json = true
|
}
|
||||||
case "--probe":
|
if let handler = valueHandlers[arg], let value = self.nextValue(args, index: &i) {
|
||||||
opts.probe = true
|
handler(&opts, value)
|
||||||
case "--url":
|
i += 1
|
||||||
opts.url = self.nextValue(args, index: &i)
|
continue
|
||||||
case "--token":
|
|
||||||
opts.token = self.nextValue(args, index: &i)
|
|
||||||
case "--password":
|
|
||||||
opts.password = self.nextValue(args, index: &i)
|
|
||||||
case "--mode":
|
|
||||||
if let value = self.nextValue(args, index: &i) {
|
|
||||||
opts.mode = value
|
|
||||||
}
|
|
||||||
case "--timeout":
|
|
||||||
if let raw = self.nextValue(args, index: &i),
|
|
||||||
let parsed = Int(raw.trimmingCharacters(in: .whitespacesAndNewlines))
|
|
||||||
{
|
|
||||||
opts.timeoutMs = max(250, parsed)
|
|
||||||
}
|
|
||||||
case "--client-id":
|
|
||||||
if let value = self.nextValue(args, index: &i) {
|
|
||||||
opts.clientId = value
|
|
||||||
}
|
|
||||||
case "--client-mode":
|
|
||||||
if let value = self.nextValue(args, index: &i) {
|
|
||||||
opts.clientMode = value
|
|
||||||
}
|
|
||||||
case "--display-name":
|
|
||||||
opts.displayName = self.nextValue(args, index: &i)
|
|
||||||
case "--role":
|
|
||||||
if let value = self.nextValue(args, index: &i) {
|
|
||||||
opts.role = value
|
|
||||||
}
|
|
||||||
case "--scopes":
|
|
||||||
if let value = self.nextValue(args, index: &i) {
|
|
||||||
opts.scopes = value.split(separator: ",").map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
|
|
||||||
.filter { !$0.isEmpty }
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
i += 1
|
i += 1
|
||||||
}
|
}
|
||||||
@@ -254,8 +247,12 @@ private func resolveGatewayEndpoint(opts: ConnectOptions, config: GatewayConfig)
|
|||||||
|
|
||||||
if resolvedMode == "remote" {
|
if resolvedMode == "remote" {
|
||||||
guard let raw = config.remoteUrl?.trimmingCharacters(in: .whitespacesAndNewlines),
|
guard let raw = config.remoteUrl?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||||
!raw.isEmpty else {
|
!raw.isEmpty
|
||||||
throw NSError(domain: "Gateway", code: 1, userInfo: [NSLocalizedDescriptionKey: "gateway.remote.url is missing"])
|
else {
|
||||||
|
throw NSError(
|
||||||
|
domain: "Gateway",
|
||||||
|
code: 1,
|
||||||
|
userInfo: [NSLocalizedDescriptionKey: "gateway.remote.url is missing"])
|
||||||
}
|
}
|
||||||
guard let url = URL(string: raw) else {
|
guard let url = URL(string: raw) else {
|
||||||
throw NSError(domain: "Gateway", code: 1, userInfo: [NSLocalizedDescriptionKey: "invalid url: \(raw)"])
|
throw NSError(domain: "Gateway", code: 1, userInfo: [NSLocalizedDescriptionKey: "invalid url: \(raw)"])
|
||||||
@@ -268,9 +265,12 @@ private func resolveGatewayEndpoint(opts: ConnectOptions, config: GatewayConfig)
|
|||||||
}
|
}
|
||||||
|
|
||||||
let port = config.port ?? 18789
|
let port = config.port ?? 18789
|
||||||
let host = "127.0.0.1"
|
let host = resolveLocalHost(bind: config.bind)
|
||||||
guard let url = URL(string: "ws://\(host):\(port)") else {
|
guard let url = URL(string: "ws://\(host):\(port)") else {
|
||||||
throw NSError(domain: "Gateway", code: 1, userInfo: [NSLocalizedDescriptionKey: "invalid url: ws://\(host):\(port)"])
|
throw NSError(
|
||||||
|
domain: "Gateway",
|
||||||
|
code: 1,
|
||||||
|
userInfo: [NSLocalizedDescriptionKey: "invalid url: ws://\(host):\(port)"])
|
||||||
}
|
}
|
||||||
return GatewayEndpoint(
|
return GatewayEndpoint(
|
||||||
url: url,
|
url: url,
|
||||||
@@ -280,7 +280,7 @@ private func resolveGatewayEndpoint(opts: ConnectOptions, config: GatewayConfig)
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func bestEffortEndpoint(opts: ConnectOptions, config: GatewayConfig) -> GatewayEndpoint? {
|
private func bestEffortEndpoint(opts: ConnectOptions, config: GatewayConfig) -> GatewayEndpoint? {
|
||||||
return try? resolveGatewayEndpoint(opts: opts, config: config)
|
try? resolveGatewayEndpoint(opts: opts, config: config)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func resolvedToken(opts: ConnectOptions, mode: String, config: GatewayConfig) -> String? {
|
private func resolvedToken(opts: ConnectOptions, mode: String, config: GatewayConfig) -> String? {
|
||||||
@@ -304,3 +304,56 @@ private func resolvedPassword(opts: ConnectOptions, mode: String, config: Gatewa
|
|||||||
}
|
}
|
||||||
return config.password
|
return config.password
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func resolveLocalHost(bind: String?) -> String {
|
||||||
|
let normalized = (bind ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
|
||||||
|
let tailnetIP = detectTailnetIPv4()
|
||||||
|
switch normalized {
|
||||||
|
case "tailnet", "auto":
|
||||||
|
return tailnetIP ?? "127.0.0.1"
|
||||||
|
default:
|
||||||
|
return "127.0.0.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func detectTailnetIPv4() -> String? {
|
||||||
|
var addrList: UnsafeMutablePointer<ifaddrs>?
|
||||||
|
guard getifaddrs(&addrList) == 0, let first = addrList else { return nil }
|
||||||
|
defer { freeifaddrs(addrList) }
|
||||||
|
|
||||||
|
for ptr in sequence(first: first, next: { $0.pointee.ifa_next }) {
|
||||||
|
let flags = Int32(ptr.pointee.ifa_flags)
|
||||||
|
let isUp = (flags & IFF_UP) != 0
|
||||||
|
let isLoopback = (flags & IFF_LOOPBACK) != 0
|
||||||
|
let family = ptr.pointee.ifa_addr.pointee.sa_family
|
||||||
|
if !isUp || isLoopback || family != UInt8(AF_INET) { continue }
|
||||||
|
|
||||||
|
var addr = ptr.pointee.ifa_addr.pointee
|
||||||
|
var buffer = [CChar](repeating: 0, count: Int(NI_MAXHOST))
|
||||||
|
let result = getnameinfo(
|
||||||
|
&addr,
|
||||||
|
socklen_t(ptr.pointee.ifa_addr.pointee.sa_len),
|
||||||
|
&buffer,
|
||||||
|
socklen_t(buffer.count),
|
||||||
|
nil,
|
||||||
|
0,
|
||||||
|
NI_NUMERICHOST)
|
||||||
|
guard result == 0 else { continue }
|
||||||
|
let len = buffer.prefix { $0 != 0 }
|
||||||
|
let bytes = len.map { UInt8(bitPattern: $0) }
|
||||||
|
guard let ip = String(bytes: bytes, encoding: .utf8) else { continue }
|
||||||
|
if isTailnetIPv4(ip) { return ip }
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
private func isTailnetIPv4(_ address: String) -> Bool {
|
||||||
|
let parts = address.split(separator: ".")
|
||||||
|
guard parts.count == 4 else { return false }
|
||||||
|
let octets = parts.compactMap { Int($0) }
|
||||||
|
guard octets.count == 4 else { return false }
|
||||||
|
let a = octets[0]
|
||||||
|
let b = octets[1]
|
||||||
|
return a == 100 && b >= 64 && b <= 127
|
||||||
|
}
|
||||||
@@ -3,6 +3,8 @@ import SwiftUI
|
|||||||
import Testing
|
import Testing
|
||||||
@testable import Clawdbot
|
@testable import Clawdbot
|
||||||
|
|
||||||
|
private typealias SnapshotAnyCodable = Clawdbot.AnyCodable
|
||||||
|
|
||||||
@Suite(.serialized)
|
@Suite(.serialized)
|
||||||
@MainActor
|
@MainActor
|
||||||
struct ChannelsSettingsSmokeTests {
|
struct ChannelsSettingsSmokeTests {
|
||||||
@@ -17,8 +19,11 @@ struct ChannelsSettingsSmokeTests {
|
|||||||
"signal": "Signal",
|
"signal": "Signal",
|
||||||
"imessage": "iMessage",
|
"imessage": "iMessage",
|
||||||
],
|
],
|
||||||
|
channelDetailLabels: nil,
|
||||||
|
channelSystemImages: nil,
|
||||||
|
channelMeta: nil,
|
||||||
channels: [
|
channels: [
|
||||||
"whatsapp": AnyCodable([
|
"whatsapp": SnapshotAnyCodable([
|
||||||
"configured": true,
|
"configured": true,
|
||||||
"linked": true,
|
"linked": true,
|
||||||
"authAgeMs": 86_400_000,
|
"authAgeMs": 86_400_000,
|
||||||
@@ -37,7 +42,7 @@ struct ChannelsSettingsSmokeTests {
|
|||||||
"lastEventAt": 1_700_000_060_000,
|
"lastEventAt": 1_700_000_060_000,
|
||||||
"lastError": "needs login",
|
"lastError": "needs login",
|
||||||
]),
|
]),
|
||||||
"telegram": AnyCodable([
|
"telegram": SnapshotAnyCodable([
|
||||||
"configured": true,
|
"configured": true,
|
||||||
"tokenSource": "env",
|
"tokenSource": "env",
|
||||||
"running": true,
|
"running": true,
|
||||||
@@ -52,7 +57,7 @@ struct ChannelsSettingsSmokeTests {
|
|||||||
],
|
],
|
||||||
"lastProbeAt": 1_700_000_050_000,
|
"lastProbeAt": 1_700_000_050_000,
|
||||||
]),
|
]),
|
||||||
"signal": AnyCodable([
|
"signal": SnapshotAnyCodable([
|
||||||
"configured": true,
|
"configured": true,
|
||||||
"baseUrl": "http://127.0.0.1:8080",
|
"baseUrl": "http://127.0.0.1:8080",
|
||||||
"running": true,
|
"running": true,
|
||||||
@@ -65,7 +70,7 @@ struct ChannelsSettingsSmokeTests {
|
|||||||
],
|
],
|
||||||
"lastProbeAt": 1_700_000_050_000,
|
"lastProbeAt": 1_700_000_050_000,
|
||||||
]),
|
]),
|
||||||
"imessage": AnyCodable([
|
"imessage": SnapshotAnyCodable([
|
||||||
"configured": false,
|
"configured": false,
|
||||||
"running": false,
|
"running": false,
|
||||||
"lastError": "not configured",
|
"lastError": "not configured",
|
||||||
@@ -100,15 +105,18 @@ struct ChannelsSettingsSmokeTests {
|
|||||||
"signal": "Signal",
|
"signal": "Signal",
|
||||||
"imessage": "iMessage",
|
"imessage": "iMessage",
|
||||||
],
|
],
|
||||||
|
channelDetailLabels: nil,
|
||||||
|
channelSystemImages: nil,
|
||||||
|
channelMeta: nil,
|
||||||
channels: [
|
channels: [
|
||||||
"whatsapp": AnyCodable([
|
"whatsapp": SnapshotAnyCodable([
|
||||||
"configured": false,
|
"configured": false,
|
||||||
"linked": false,
|
"linked": false,
|
||||||
"running": false,
|
"running": false,
|
||||||
"connected": false,
|
"connected": false,
|
||||||
"reconnectAttempts": 0,
|
"reconnectAttempts": 0,
|
||||||
]),
|
]),
|
||||||
"telegram": AnyCodable([
|
"telegram": SnapshotAnyCodable([
|
||||||
"configured": false,
|
"configured": false,
|
||||||
"running": false,
|
"running": false,
|
||||||
"lastError": "bot missing",
|
"lastError": "bot missing",
|
||||||
@@ -120,7 +128,7 @@ struct ChannelsSettingsSmokeTests {
|
|||||||
],
|
],
|
||||||
"lastProbeAt": 1_700_000_100_000,
|
"lastProbeAt": 1_700_000_100_000,
|
||||||
]),
|
]),
|
||||||
"signal": AnyCodable([
|
"signal": SnapshotAnyCodable([
|
||||||
"configured": false,
|
"configured": false,
|
||||||
"baseUrl": "http://127.0.0.1:8080",
|
"baseUrl": "http://127.0.0.1:8080",
|
||||||
"running": false,
|
"running": false,
|
||||||
@@ -133,7 +141,7 @@ struct ChannelsSettingsSmokeTests {
|
|||||||
],
|
],
|
||||||
"lastProbeAt": 1_700_000_200_000,
|
"lastProbeAt": 1_700_000_200_000,
|
||||||
]),
|
]),
|
||||||
"imessage": AnyCodable([
|
"imessage": SnapshotAnyCodable([
|
||||||
"configured": false,
|
"configured": false,
|
||||||
"running": false,
|
"running": false,
|
||||||
"lastError": "not configured",
|
"lastError": "not configured",
|
||||||
|
|||||||
@@ -11,16 +11,19 @@ struct CronJobEditorSmokeTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test func cronJobEditorBuildsBodyForNewJob() {
|
@Test func cronJobEditorBuildsBodyForNewJob() {
|
||||||
|
let channelsStore = ChannelsStore(isPreview: true)
|
||||||
let view = CronJobEditor(
|
let view = CronJobEditor(
|
||||||
job: nil,
|
job: nil,
|
||||||
isSaving: .constant(false),
|
isSaving: .constant(false),
|
||||||
error: .constant(nil),
|
error: .constant(nil),
|
||||||
|
channelsStore: channelsStore,
|
||||||
onCancel: {},
|
onCancel: {},
|
||||||
onSave: { _ in })
|
onSave: { _ in })
|
||||||
_ = view.body
|
_ = view.body
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test func cronJobEditorBuildsBodyForExistingJob() {
|
@Test func cronJobEditorBuildsBodyForExistingJob() {
|
||||||
|
let channelsStore = ChannelsStore(isPreview: true)
|
||||||
let job = CronJob(
|
let job = CronJob(
|
||||||
id: "job-1",
|
id: "job-1",
|
||||||
agentId: "ops",
|
agentId: "ops",
|
||||||
@@ -54,31 +57,36 @@ struct CronJobEditorSmokeTests {
|
|||||||
job: job,
|
job: job,
|
||||||
isSaving: .constant(false),
|
isSaving: .constant(false),
|
||||||
error: .constant(nil),
|
error: .constant(nil),
|
||||||
|
channelsStore: channelsStore,
|
||||||
onCancel: {},
|
onCancel: {},
|
||||||
onSave: { _ in })
|
onSave: { _ in })
|
||||||
_ = view.body
|
_ = view.body
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test func cronJobEditorExercisesBuilders() {
|
@Test func cronJobEditorExercisesBuilders() {
|
||||||
|
let channelsStore = ChannelsStore(isPreview: true)
|
||||||
var view = CronJobEditor(
|
var view = CronJobEditor(
|
||||||
job: nil,
|
job: nil,
|
||||||
isSaving: .constant(false),
|
isSaving: .constant(false),
|
||||||
error: .constant(nil),
|
error: .constant(nil),
|
||||||
|
channelsStore: channelsStore,
|
||||||
onCancel: {},
|
onCancel: {},
|
||||||
onSave: { _ in })
|
onSave: { _ in })
|
||||||
view.exerciseForTesting()
|
view.exerciseForTesting()
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test func cronJobEditorIncludesDeleteAfterRunForAtSchedule() throws {
|
@Test func cronJobEditorIncludesDeleteAfterRunForAtSchedule() throws {
|
||||||
|
let channelsStore = ChannelsStore(isPreview: true)
|
||||||
let view = CronJobEditor(
|
let view = CronJobEditor(
|
||||||
job: nil,
|
job: nil,
|
||||||
isSaving: .constant(false),
|
isSaving: .constant(false),
|
||||||
error: .constant(nil),
|
error: .constant(nil),
|
||||||
|
channelsStore: channelsStore,
|
||||||
onCancel: {},
|
onCancel: {},
|
||||||
onSave: { _ in })
|
onSave: { _ in })
|
||||||
|
|
||||||
var root: [String: Any] = [:]
|
var root: [String: Any] = [:]
|
||||||
view.applyDeleteAfterRun(to: &root, scheduleKind: .at, deleteAfterRun: true)
|
view.applyDeleteAfterRun(to: &root, scheduleKind: CronJobEditor.ScheduleKind.at, deleteAfterRun: true)
|
||||||
let raw = root["deleteAfterRun"] as? Bool
|
let raw = root["deleteAfterRun"] as? Bool
|
||||||
#expect(raw == true)
|
#expect(raw == true)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import ClawdbotKit
|
||||||
import Foundation
|
import Foundation
|
||||||
import os
|
import os
|
||||||
import Testing
|
import Testing
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import ClawdbotKit
|
||||||
import Foundation
|
import Foundation
|
||||||
import os
|
import os
|
||||||
import Testing
|
import Testing
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import ClawdbotKit
|
||||||
import Foundation
|
import Foundation
|
||||||
import os
|
import os
|
||||||
import Testing
|
import Testing
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import ClawdbotKit
|
||||||
import Foundation
|
import Foundation
|
||||||
import os
|
import os
|
||||||
import Testing
|
import Testing
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import ClawdbotKit
|
||||||
import Foundation
|
import Foundation
|
||||||
import Testing
|
import Testing
|
||||||
@testable import Clawdbot
|
@testable import Clawdbot
|
||||||
|
|||||||
@@ -139,4 +139,40 @@ import Testing
|
|||||||
let resolved = ConnectionModeResolver.resolve(root: root, defaults: defaults)
|
let resolved = ConnectionModeResolver.resolve(root: root, defaults: defaults)
|
||||||
#expect(resolved.mode == .remote)
|
#expect(resolved.mode == .remote)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test func resolveLocalGatewayHostPrefersTailnetForAuto() {
|
||||||
|
let host = GatewayEndpointStore._testResolveLocalGatewayHost(
|
||||||
|
bindMode: "auto",
|
||||||
|
tailscaleIP: "100.64.1.2")
|
||||||
|
#expect(host == "100.64.1.2")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test func resolveLocalGatewayHostFallsBackToLoopbackForAuto() {
|
||||||
|
let host = GatewayEndpointStore._testResolveLocalGatewayHost(
|
||||||
|
bindMode: "auto",
|
||||||
|
tailscaleIP: nil)
|
||||||
|
#expect(host == "127.0.0.1")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test func resolveLocalGatewayHostPrefersTailnetForTailnetMode() {
|
||||||
|
let host = GatewayEndpointStore._testResolveLocalGatewayHost(
|
||||||
|
bindMode: "tailnet",
|
||||||
|
tailscaleIP: "100.64.1.5")
|
||||||
|
#expect(host == "100.64.1.5")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test func resolveLocalGatewayHostFallsBackToLoopbackForTailnetMode() {
|
||||||
|
let host = GatewayEndpointStore._testResolveLocalGatewayHost(
|
||||||
|
bindMode: "tailnet",
|
||||||
|
tailscaleIP: nil)
|
||||||
|
#expect(host == "127.0.0.1")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test func resolveLocalGatewayHostUsesCustomBindHost() {
|
||||||
|
let host = GatewayEndpointStore._testResolveLocalGatewayHost(
|
||||||
|
bindMode: "custom",
|
||||||
|
tailscaleIP: "100.64.1.9",
|
||||||
|
customBindHost: "192.168.1.10")
|
||||||
|
#expect(host == "192.168.1.10")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -7,15 +7,17 @@ import Testing
|
|||||||
|
|
||||||
@Suite(.serialized)
|
@Suite(.serialized)
|
||||||
struct LowCoverageHelperTests {
|
struct LowCoverageHelperTests {
|
||||||
|
private typealias ProtoAnyCodable = ClawdbotProtocol.AnyCodable
|
||||||
|
|
||||||
@Test func anyCodableHelperAccessors() throws {
|
@Test func anyCodableHelperAccessors() throws {
|
||||||
let payload: [String: AnyCodable] = [
|
let payload: [String: ProtoAnyCodable] = [
|
||||||
"title": AnyCodable("Hello"),
|
"title": ProtoAnyCodable("Hello"),
|
||||||
"flag": AnyCodable(true),
|
"flag": ProtoAnyCodable(true),
|
||||||
"count": AnyCodable(3),
|
"count": ProtoAnyCodable(3),
|
||||||
"ratio": AnyCodable(1.25),
|
"ratio": ProtoAnyCodable(1.25),
|
||||||
"list": AnyCodable([AnyCodable("a"), AnyCodable(2)]),
|
"list": ProtoAnyCodable([ProtoAnyCodable("a"), ProtoAnyCodable(2)]),
|
||||||
]
|
]
|
||||||
let any = AnyCodable(payload)
|
let any = ProtoAnyCodable(payload)
|
||||||
let dict = try #require(any.dictionaryValue)
|
let dict = try #require(any.dictionaryValue)
|
||||||
#expect(dict["title"]?.stringValue == "Hello")
|
#expect(dict["title"]?.stringValue == "Hello")
|
||||||
#expect(dict["flag"]?.boolValue == true)
|
#expect(dict["flag"]?.boolValue == true)
|
||||||
@@ -76,31 +78,27 @@ struct LowCoverageHelperTests {
|
|||||||
#expect(result.stderr.contains("stderr-1999"))
|
#expect(result.stderr.contains("stderr-1999"))
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test func pairedNodesStorePersists() async throws {
|
@Test func nodeInfoCodableRoundTrip() throws {
|
||||||
let dir = FileManager().temporaryDirectory
|
let info = NodeInfo(
|
||||||
.appendingPathComponent("paired-\(UUID().uuidString)", isDirectory: true)
|
|
||||||
try FileManager().createDirectory(at: dir, withIntermediateDirectories: true)
|
|
||||||
let url = dir.appendingPathComponent("nodes.json")
|
|
||||||
let store = PairedNodesStore(fileURL: url)
|
|
||||||
await store.load()
|
|
||||||
#expect(await store.all().isEmpty)
|
|
||||||
|
|
||||||
let node = PairedNode(
|
|
||||||
nodeId: "node-1",
|
nodeId: "node-1",
|
||||||
displayName: "Node One",
|
displayName: "Node One",
|
||||||
platform: "macOS",
|
platform: "macOS",
|
||||||
version: "1.0",
|
version: "1.0",
|
||||||
|
coreVersion: "1.0-core",
|
||||||
|
uiVersion: "1.0-ui",
|
||||||
deviceFamily: "Mac",
|
deviceFamily: "Mac",
|
||||||
modelIdentifier: "MacBookPro",
|
modelIdentifier: "MacBookPro",
|
||||||
token: "token",
|
remoteIp: "192.168.1.2",
|
||||||
createdAtMs: 1,
|
caps: ["chat"],
|
||||||
lastSeenAtMs: nil)
|
commands: ["send"],
|
||||||
try await store.upsert(node)
|
permissions: ["send": true],
|
||||||
#expect(await store.find(nodeId: "node-1")?.displayName == "Node One")
|
paired: true,
|
||||||
|
connected: false)
|
||||||
try await store.touchSeen(nodeId: "node-1")
|
let data = try JSONEncoder().encode(info)
|
||||||
let updated = await store.find(nodeId: "node-1")
|
let decoded = try JSONDecoder().decode(NodeInfo.self, from: data)
|
||||||
#expect(updated?.lastSeenAtMs != nil)
|
#expect(decoded.nodeId == "node-1")
|
||||||
|
#expect(decoded.isPaired == true)
|
||||||
|
#expect(decoded.isConnected == false)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test @MainActor func presenceReporterHelpers() {
|
@Test @MainActor func presenceReporterHelpers() {
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import Testing
|
|||||||
features: [:],
|
features: [:],
|
||||||
snapshot: snapshot,
|
snapshot: snapshot,
|
||||||
canvashosturl: nil,
|
canvashosturl: nil,
|
||||||
|
auth: nil,
|
||||||
policy: [:])
|
policy: [:])
|
||||||
|
|
||||||
let mapped = MacGatewayChatTransport.mapPushToTransportEvent(.snapshot(hello))
|
let mapped = MacGatewayChatTransport.mapPushToTransportEvent(.snapshot(hello))
|
||||||
|
|||||||
@@ -3,13 +3,15 @@ import SwiftUI
|
|||||||
import Testing
|
import Testing
|
||||||
@testable import Clawdbot
|
@testable import Clawdbot
|
||||||
|
|
||||||
|
private typealias ProtoAnyCodable = ClawdbotProtocol.AnyCodable
|
||||||
|
|
||||||
@Suite(.serialized)
|
@Suite(.serialized)
|
||||||
@MainActor
|
@MainActor
|
||||||
struct OnboardingWizardStepViewTests {
|
struct OnboardingWizardStepViewTests {
|
||||||
@Test func noteStepBuilds() {
|
@Test func noteStepBuilds() {
|
||||||
let step = WizardStep(
|
let step = WizardStep(
|
||||||
id: "step-1",
|
id: "step-1",
|
||||||
type: AnyCodable("note"),
|
type: ProtoAnyCodable("note"),
|
||||||
title: "Welcome",
|
title: "Welcome",
|
||||||
message: "Hello",
|
message: "Hello",
|
||||||
options: nil,
|
options: nil,
|
||||||
@@ -22,17 +24,17 @@ struct OnboardingWizardStepViewTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test func selectStepBuilds() {
|
@Test func selectStepBuilds() {
|
||||||
let options: [[String: AnyCodable]] = [
|
let options: [[String: ProtoAnyCodable]] = [
|
||||||
["value": AnyCodable("local"), "label": AnyCodable("Local"), "hint": AnyCodable("This Mac")],
|
["value": ProtoAnyCodable("local"), "label": ProtoAnyCodable("Local"), "hint": ProtoAnyCodable("This Mac")],
|
||||||
["value": AnyCodable("remote"), "label": AnyCodable("Remote")],
|
["value": ProtoAnyCodable("remote"), "label": ProtoAnyCodable("Remote")],
|
||||||
]
|
]
|
||||||
let step = WizardStep(
|
let step = WizardStep(
|
||||||
id: "step-2",
|
id: "step-2",
|
||||||
type: AnyCodable("select"),
|
type: ProtoAnyCodable("select"),
|
||||||
title: "Mode",
|
title: "Mode",
|
||||||
message: "Choose a mode",
|
message: "Choose a mode",
|
||||||
options: options,
|
options: options,
|
||||||
initialvalue: AnyCodable("local"),
|
initialvalue: ProtoAnyCodable("local"),
|
||||||
placeholder: nil,
|
placeholder: nil,
|
||||||
sensitive: nil,
|
sensitive: nil,
|
||||||
executor: nil)
|
executor: nil)
|
||||||
|
|||||||
@@ -15,6 +15,9 @@ extension URLSessionWebSocketTask: WebSocketTasking {}
|
|||||||
|
|
||||||
public struct WebSocketTaskBox: @unchecked Sendable {
|
public struct WebSocketTaskBox: @unchecked Sendable {
|
||||||
public let task: any WebSocketTasking
|
public let task: any WebSocketTasking
|
||||||
|
public init(task: any WebSocketTasking) {
|
||||||
|
self.task = task
|
||||||
|
}
|
||||||
|
|
||||||
public var state: URLSessionTask.State { self.task.state }
|
public var state: URLSessionTask.State { self.task.state }
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -23,10 +23,11 @@ clawdbot nodes approve <requestId>
|
|||||||
clawdbot nodes status
|
clawdbot nodes status
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`nodes list` prints pending/paired tables. Paired rows include the most recent connect age (Last Connect).
|
||||||
|
|
||||||
## Invoke / run
|
## Invoke / run
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
clawdbot nodes invoke --node <id|name|ip> --command <command> --params <json>
|
clawdbot nodes invoke --node <id|name|ip> --command <command> --params <json>
|
||||||
clawdbot nodes run --node <id|name|ip> <command...>
|
clawdbot nodes run --node <id|name|ip> <command...>
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -1774,6 +1774,7 @@ Note: `applyPatch` is only under `tools.exec`.
|
|||||||
- `tools.web.fetch.maxChars` (default 50000)
|
- `tools.web.fetch.maxChars` (default 50000)
|
||||||
- `tools.web.fetch.timeoutSeconds` (default 30)
|
- `tools.web.fetch.timeoutSeconds` (default 30)
|
||||||
- `tools.web.fetch.cacheTtlMinutes` (default 15)
|
- `tools.web.fetch.cacheTtlMinutes` (default 15)
|
||||||
|
- `tools.web.fetch.maxRedirects` (default 3)
|
||||||
- `tools.web.fetch.userAgent` (optional override)
|
- `tools.web.fetch.userAgent` (optional override)
|
||||||
- `tools.web.fetch.readability` (default true; disable to use basic HTML cleanup only)
|
- `tools.web.fetch.readability` (default true; disable to use basic HTML cleanup only)
|
||||||
- `tools.web.fetch.firecrawl.enabled` (default true when an API key is set)
|
- `tools.web.fetch.firecrawl.enabled` (default true when an API key is set)
|
||||||
@@ -2614,10 +2615,13 @@ Defaults:
|
|||||||
// noSandbox: false,
|
// noSandbox: false,
|
||||||
// executablePath: "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
|
// executablePath: "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
|
||||||
// attachOnly: false, // set true when tunneling a remote CDP to localhost
|
// attachOnly: false, // set true when tunneling a remote CDP to localhost
|
||||||
|
// snapshotDefaults: { mode: "efficient" }, // tool/CLI default snapshot preset
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Note: `browser.snapshotDefaults` only affects Clawdbot's browser tool + CLI. Direct HTTP clients must pass `mode` explicitly.
|
||||||
|
|
||||||
### `ui` (Appearance)
|
### `ui` (Appearance)
|
||||||
|
|
||||||
Optional accent color used by the native apps for UI chrome (e.g. Talk Mode bubble tint).
|
Optional accent color used by the native apps for UI chrome (e.g. Talk Mode bubble tint).
|
||||||
|
|||||||
@@ -500,6 +500,7 @@ Notes:
|
|||||||
- `--format ai` (default when Playwright is installed): returns an AI snapshot with numeric refs (`aria-ref="<n>"`).
|
- `--format ai` (default when Playwright is installed): returns an AI snapshot with numeric refs (`aria-ref="<n>"`).
|
||||||
- `--format aria`: returns the accessibility tree (no refs; inspection only).
|
- `--format aria`: returns the accessibility tree (no refs; inspection only).
|
||||||
- `--efficient` (or `--mode efficient`): compact role snapshot preset (interactive + compact + depth + lower maxChars).
|
- `--efficient` (or `--mode efficient`): compact role snapshot preset (interactive + compact + depth + lower maxChars).
|
||||||
|
- Config default (tool/CLI only): set `browser.snapshotDefaults.mode: "efficient"` to use efficient snapshots when the caller does not pass a mode (see [Gateway configuration](/gateway/configuration#browser-clawd-managed-browser)).
|
||||||
- Role snapshot options (`--interactive`, `--compact`, `--depth`, `--selector`) force a role-based snapshot with refs like `ref=e12`.
|
- Role snapshot options (`--interactive`, `--compact`, `--depth`, `--selector`) force a role-based snapshot with refs like `ref=e12`.
|
||||||
- `--frame "<iframe selector>"` scopes role snapshots to an iframe (pairs with role refs like `e12`).
|
- `--frame "<iframe selector>"` scopes role snapshots to an iframe (pairs with role refs like `e12`).
|
||||||
- `--interactive` outputs a flat, easy-to-pick list of interactive elements (best for driving actions).
|
- `--interactive` outputs a flat, easy-to-pick list of interactive elements (best for driving actions).
|
||||||
|
|||||||
+1
-1
@@ -39,7 +39,7 @@ Notes:
|
|||||||
|
|
||||||
- `tools.exec.notifyOnExit` (default: true): when true, backgrounded exec sessions enqueue a system event and request a heartbeat on exit.
|
- `tools.exec.notifyOnExit` (default: true): when true, backgrounded exec sessions enqueue a system event and request a heartbeat on exit.
|
||||||
- `tools.exec.host` (default: `sandbox`)
|
- `tools.exec.host` (default: `sandbox`)
|
||||||
- `tools.exec.security` (default: `deny`)
|
- `tools.exec.security` (default: `deny` for sandbox, `allowlist` for gateway + node when unset)
|
||||||
- `tools.exec.ask` (default: `on-miss`)
|
- `tools.exec.ask` (default: `on-miss`)
|
||||||
- `tools.exec.node` (default: unset)
|
- `tools.exec.node` (default: unset)
|
||||||
- `tools.exec.pathPrepend`: list of directories to prepend to `PATH` for exec runs.
|
- `tools.exec.pathPrepend`: list of directories to prepend to `PATH` for exec runs.
|
||||||
|
|||||||
@@ -215,6 +215,7 @@ Fetch a URL and extract readable content.
|
|||||||
maxChars: 50000,
|
maxChars: 50000,
|
||||||
timeoutSeconds: 30,
|
timeoutSeconds: 30,
|
||||||
cacheTtlMinutes: 15,
|
cacheTtlMinutes: 15,
|
||||||
|
maxRedirects: 3,
|
||||||
userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_7_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
|
userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_7_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
|
||||||
readability: true,
|
readability: true,
|
||||||
firecrawl: {
|
firecrawl: {
|
||||||
@@ -241,6 +242,7 @@ Notes:
|
|||||||
- `web_fetch` uses Readability (main-content extraction) first, then Firecrawl (if configured). If both fail, the tool returns an error.
|
- `web_fetch` uses Readability (main-content extraction) first, then Firecrawl (if configured). If both fail, the tool returns an error.
|
||||||
- Firecrawl requests use bot-circumvention mode and cache results by default.
|
- Firecrawl requests use bot-circumvention mode and cache results by default.
|
||||||
- `web_fetch` sends a Chrome-like User-Agent and `Accept-Language` by default; override `userAgent` if needed.
|
- `web_fetch` sends a Chrome-like User-Agent and `Accept-Language` by default; override `userAgent` if needed.
|
||||||
|
- `web_fetch` blocks private/internal hostnames and re-checks redirects (limit with `maxRedirects`).
|
||||||
- `web_fetch` is best-effort extraction; some sites will need the browser tool.
|
- `web_fetch` is best-effort extraction; some sites will need the browser tool.
|
||||||
- See [Firecrawl](/tools/firecrawl) for key setup and service details.
|
- See [Firecrawl](/tools/firecrawl) for key setup and service details.
|
||||||
- Responses are cached (default 15 minutes) to reduce repeated fetches.
|
- Responses are cached (default 15 minutes) to reduce repeated fetches.
|
||||||
|
|||||||
@@ -110,7 +110,6 @@ const writeBuildStamp = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (!shouldBuild()) {
|
if (!shouldBuild()) {
|
||||||
logRunner("Skipping build; dist is fresh.");
|
|
||||||
runNode();
|
runNode();
|
||||||
} else {
|
} else {
|
||||||
logRunner("Building TypeScript (dist is stale).");
|
logRunner("Building TypeScript (dist is stale).");
|
||||||
|
|||||||
@@ -400,7 +400,7 @@ export function createExecTool(
|
|||||||
host = "gateway";
|
host = "gateway";
|
||||||
}
|
}
|
||||||
|
|
||||||
const configuredSecurity = defaults?.security ?? "deny";
|
const configuredSecurity = defaults?.security ?? (host === "sandbox" ? "deny" : "allowlist");
|
||||||
const requestedSecurity = normalizeExecSecurity(params.security);
|
const requestedSecurity = normalizeExecSecurity(params.security);
|
||||||
let security = minSecurity(configuredSecurity, requestedSecurity ?? configuredSecurity);
|
let security = minSecurity(configuredSecurity, requestedSecurity ?? configuredSecurity);
|
||||||
if (elevatedRequested) {
|
if (elevatedRequested) {
|
||||||
@@ -447,7 +447,10 @@ export function createExecTool(
|
|||||||
applyPathPrepend(env, defaultPathPrepend);
|
applyPathPrepend(env, defaultPathPrepend);
|
||||||
|
|
||||||
if (host === "node") {
|
if (host === "node") {
|
||||||
const approvals = resolveExecApprovals(defaults?.agentId);
|
const approvals = resolveExecApprovals(
|
||||||
|
defaults?.agentId,
|
||||||
|
host === "node" ? { security: "allowlist" } : undefined,
|
||||||
|
);
|
||||||
const hostSecurity = minSecurity(security, approvals.agent.security);
|
const hostSecurity = minSecurity(security, approvals.agent.security);
|
||||||
const hostAsk = maxAsk(ask, approvals.agent.ask);
|
const hostAsk = maxAsk(ask, approvals.agent.ask);
|
||||||
const askFallback = approvals.agent.askFallback;
|
const askFallback = approvals.agent.askFallback;
|
||||||
@@ -616,7 +619,7 @@ export function createExecTool(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (host === "gateway") {
|
if (host === "gateway") {
|
||||||
const approvals = resolveExecApprovals(defaults?.agentId);
|
const approvals = resolveExecApprovals(defaults?.agentId, { security: "allowlist" });
|
||||||
const hostSecurity = minSecurity(security, approvals.agent.security);
|
const hostSecurity = minSecurity(security, approvals.agent.security);
|
||||||
const hostAsk = maxAsk(ask, approvals.agent.ask);
|
const hostAsk = maxAsk(ask, approvals.agent.ask);
|
||||||
const askFallback = approvals.agent.askFallback;
|
const askFallback = approvals.agent.askFallback;
|
||||||
|
|||||||
@@ -49,9 +49,10 @@ const browserConfigMocks = vi.hoisted(() => ({
|
|||||||
}));
|
}));
|
||||||
vi.mock("../../browser/config.js", () => browserConfigMocks);
|
vi.mock("../../browser/config.js", () => browserConfigMocks);
|
||||||
|
|
||||||
vi.mock("../../config/config.js", () => ({
|
const configMocks = vi.hoisted(() => ({
|
||||||
loadConfig: vi.fn(() => ({ browser: {} })),
|
loadConfig: vi.fn(() => ({ browser: {} })),
|
||||||
}));
|
}));
|
||||||
|
vi.mock("../../config/config.js", () => configMocks);
|
||||||
|
|
||||||
const toolCommonMocks = vi.hoisted(() => ({
|
const toolCommonMocks = vi.hoisted(() => ({
|
||||||
imageResultFromFile: vi.fn(),
|
imageResultFromFile: vi.fn(),
|
||||||
@@ -70,11 +71,12 @@ import { createBrowserTool } from "./browser-tool.js";
|
|||||||
describe("browser tool snapshot maxChars", () => {
|
describe("browser tool snapshot maxChars", () => {
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
|
configMocks.loadConfig.mockReturnValue({ browser: {} });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("applies the default ai snapshot limit", async () => {
|
it("applies the default ai snapshot limit", async () => {
|
||||||
const tool = createBrowserTool();
|
const tool = createBrowserTool();
|
||||||
await tool.execute?.(null, { action: "snapshot", format: "ai" });
|
await tool.execute?.(null, { action: "snapshot", snapshotFormat: "ai" });
|
||||||
|
|
||||||
expect(browserClientMocks.browserSnapshot).toHaveBeenCalledWith(
|
expect(browserClientMocks.browserSnapshot).toHaveBeenCalledWith(
|
||||||
"http://127.0.0.1:18791",
|
"http://127.0.0.1:18791",
|
||||||
@@ -90,7 +92,7 @@ describe("browser tool snapshot maxChars", () => {
|
|||||||
const override = 2_000;
|
const override = 2_000;
|
||||||
await tool.execute?.(null, {
|
await tool.execute?.(null, {
|
||||||
action: "snapshot",
|
action: "snapshot",
|
||||||
format: "ai",
|
snapshotFormat: "ai",
|
||||||
maxChars: override,
|
maxChars: override,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -106,7 +108,7 @@ describe("browser tool snapshot maxChars", () => {
|
|||||||
const tool = createBrowserTool();
|
const tool = createBrowserTool();
|
||||||
await tool.execute?.(null, {
|
await tool.execute?.(null, {
|
||||||
action: "snapshot",
|
action: "snapshot",
|
||||||
format: "ai",
|
snapshotFormat: "ai",
|
||||||
maxChars: 0,
|
maxChars: 0,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -124,7 +126,7 @@ describe("browser tool snapshot maxChars", () => {
|
|||||||
|
|
||||||
it("passes refs mode through to browser snapshot", async () => {
|
it("passes refs mode through to browser snapshot", async () => {
|
||||||
const tool = createBrowserTool();
|
const tool = createBrowserTool();
|
||||||
await tool.execute?.(null, { action: "snapshot", format: "ai", refs: "aria" });
|
await tool.execute?.(null, { action: "snapshot", snapshotFormat: "ai", refs: "aria" });
|
||||||
|
|
||||||
expect(browserClientMocks.browserSnapshot).toHaveBeenCalledWith(
|
expect(browserClientMocks.browserSnapshot).toHaveBeenCalledWith(
|
||||||
"http://127.0.0.1:18791",
|
"http://127.0.0.1:18791",
|
||||||
@@ -135,9 +137,36 @@ describe("browser tool snapshot maxChars", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("uses config snapshot defaults when mode is not provided", async () => {
|
||||||
|
configMocks.loadConfig.mockReturnValue({
|
||||||
|
browser: { snapshotDefaults: { mode: "efficient" } },
|
||||||
|
});
|
||||||
|
const tool = createBrowserTool();
|
||||||
|
await tool.execute?.(null, { action: "snapshot", snapshotFormat: "ai" });
|
||||||
|
|
||||||
|
expect(browserClientMocks.browserSnapshot).toHaveBeenCalledWith(
|
||||||
|
"http://127.0.0.1:18791",
|
||||||
|
expect.objectContaining({
|
||||||
|
mode: "efficient",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not apply config snapshot defaults to aria snapshots", async () => {
|
||||||
|
configMocks.loadConfig.mockReturnValue({
|
||||||
|
browser: { snapshotDefaults: { mode: "efficient" } },
|
||||||
|
});
|
||||||
|
const tool = createBrowserTool();
|
||||||
|
await tool.execute?.(null, { action: "snapshot", snapshotFormat: "aria" });
|
||||||
|
|
||||||
|
expect(browserClientMocks.browserSnapshot).toHaveBeenCalled();
|
||||||
|
const [, opts] = browserClientMocks.browserSnapshot.mock.calls.at(-1) ?? [];
|
||||||
|
expect(opts?.mode).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
it("defaults to host when using profile=chrome (even in sandboxed sessions)", async () => {
|
it("defaults to host when using profile=chrome (even in sandboxed sessions)", async () => {
|
||||||
const tool = createBrowserTool({ defaultControlUrl: "http://127.0.0.1:9999" });
|
const tool = createBrowserTool({ defaultControlUrl: "http://127.0.0.1:9999" });
|
||||||
await tool.execute?.(null, { action: "snapshot", profile: "chrome", format: "ai" });
|
await tool.execute?.(null, { action: "snapshot", profile: "chrome", snapshotFormat: "ai" });
|
||||||
|
|
||||||
expect(browserClientMocks.browserSnapshot).toHaveBeenCalledWith(
|
expect(browserClientMocks.browserSnapshot).toHaveBeenCalledWith(
|
||||||
"http://127.0.0.1:18791",
|
"http://127.0.0.1:18791",
|
||||||
@@ -151,6 +180,7 @@ describe("browser tool snapshot maxChars", () => {
|
|||||||
describe("browser tool snapshot labels", () => {
|
describe("browser tool snapshot labels", () => {
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
|
configMocks.loadConfig.mockReturnValue({ browser: {} });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("returns image + text when labels are requested", async () => {
|
it("returns image + text when labels are requested", async () => {
|
||||||
@@ -175,7 +205,7 @@ describe("browser tool snapshot labels", () => {
|
|||||||
|
|
||||||
const result = await tool.execute?.(null, {
|
const result = await tool.execute?.(null, {
|
||||||
action: "snapshot",
|
action: "snapshot",
|
||||||
format: "ai",
|
snapshotFormat: "ai",
|
||||||
labels: true,
|
labels: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -190,11 +190,17 @@ export function createBrowserTool(opts?: {
|
|||||||
return jsonResult({ ok: true });
|
return jsonResult({ ok: true });
|
||||||
}
|
}
|
||||||
case "snapshot": {
|
case "snapshot": {
|
||||||
|
const snapshotDefaults = loadConfig().browser?.snapshotDefaults;
|
||||||
const format =
|
const format =
|
||||||
params.snapshotFormat === "ai" || params.snapshotFormat === "aria"
|
params.snapshotFormat === "ai" || params.snapshotFormat === "aria"
|
||||||
? (params.snapshotFormat as "ai" | "aria")
|
? (params.snapshotFormat as "ai" | "aria")
|
||||||
: "ai";
|
: "ai";
|
||||||
const mode = params.mode === "efficient" ? "efficient" : undefined;
|
const mode =
|
||||||
|
params.mode === "efficient"
|
||||||
|
? "efficient"
|
||||||
|
: format === "ai" && snapshotDefaults?.mode === "efficient"
|
||||||
|
? "efficient"
|
||||||
|
: undefined;
|
||||||
const labels = typeof params.labels === "boolean" ? params.labels : undefined;
|
const labels = typeof params.labels === "boolean" ? params.labels : undefined;
|
||||||
const refs = params.refs === "aria" || params.refs === "role" ? params.refs : undefined;
|
const refs = params.refs === "aria" || params.refs === "role" ? params.refs : undefined;
|
||||||
const hasMaxChars = Object.hasOwn(params, "maxChars");
|
const hasMaxChars = Object.hasOwn(params, "maxChars");
|
||||||
|
|||||||
@@ -0,0 +1,160 @@
|
|||||||
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
const lookupMock = vi.fn();
|
||||||
|
|
||||||
|
vi.mock("node:dns/promises", () => ({
|
||||||
|
lookup: lookupMock,
|
||||||
|
}));
|
||||||
|
|
||||||
|
function makeHeaders(map: Record<string, string>): { get: (key: string) => string | null } {
|
||||||
|
return {
|
||||||
|
get: (key) => map[key.toLowerCase()] ?? null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function redirectResponse(location: string): Response {
|
||||||
|
return {
|
||||||
|
ok: false,
|
||||||
|
status: 302,
|
||||||
|
headers: makeHeaders({ location }),
|
||||||
|
body: { cancel: vi.fn() },
|
||||||
|
} as Response;
|
||||||
|
}
|
||||||
|
|
||||||
|
function textResponse(body: string): Response {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
headers: makeHeaders({ "content-type": "text/plain" }),
|
||||||
|
text: async () => body,
|
||||||
|
} as Response;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("web_fetch SSRF protection", () => {
|
||||||
|
const priorFetch = global.fetch;
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
// @ts-expect-error restore
|
||||||
|
global.fetch = priorFetch;
|
||||||
|
lookupMock.mockReset();
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("blocks localhost hostnames before fetch/firecrawl", async () => {
|
||||||
|
const fetchSpy = vi.fn();
|
||||||
|
// @ts-expect-error mock fetch
|
||||||
|
global.fetch = fetchSpy;
|
||||||
|
|
||||||
|
const { createWebFetchTool } = await import("./web-tools.js");
|
||||||
|
const tool = createWebFetchTool({
|
||||||
|
config: {
|
||||||
|
tools: {
|
||||||
|
web: {
|
||||||
|
fetch: {
|
||||||
|
cacheTtlMinutes: 0,
|
||||||
|
firecrawl: { apiKey: "firecrawl-test" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(tool?.execute?.("call", { url: "http://localhost/test" })).rejects.toThrow(
|
||||||
|
/Blocked hostname/i,
|
||||||
|
);
|
||||||
|
expect(fetchSpy).not.toHaveBeenCalled();
|
||||||
|
expect(lookupMock).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("blocks private IP literals without DNS", async () => {
|
||||||
|
const fetchSpy = vi.fn();
|
||||||
|
// @ts-expect-error mock fetch
|
||||||
|
global.fetch = fetchSpy;
|
||||||
|
|
||||||
|
const { createWebFetchTool } = await import("./web-tools.js");
|
||||||
|
const tool = createWebFetchTool({
|
||||||
|
config: {
|
||||||
|
tools: { web: { fetch: { cacheTtlMinutes: 0, firecrawl: { enabled: false } } } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(tool?.execute?.("call", { url: "http://127.0.0.1/test" })).rejects.toThrow(
|
||||||
|
/private|internal|blocked/i,
|
||||||
|
);
|
||||||
|
await expect(tool?.execute?.("call", { url: "http://[::ffff:127.0.0.1]/" })).rejects.toThrow(
|
||||||
|
/private|internal|blocked/i,
|
||||||
|
);
|
||||||
|
expect(fetchSpy).not.toHaveBeenCalled();
|
||||||
|
expect(lookupMock).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("blocks when DNS resolves to private addresses", async () => {
|
||||||
|
lookupMock.mockImplementation(async (hostname: string) => {
|
||||||
|
if (hostname === "public.test") {
|
||||||
|
return [{ address: "93.184.216.34", family: 4 }];
|
||||||
|
}
|
||||||
|
return [{ address: "10.0.0.5", family: 4 }];
|
||||||
|
});
|
||||||
|
|
||||||
|
const fetchSpy = vi.fn();
|
||||||
|
// @ts-expect-error mock fetch
|
||||||
|
global.fetch = fetchSpy;
|
||||||
|
|
||||||
|
const { createWebFetchTool } = await import("./web-tools.js");
|
||||||
|
const tool = createWebFetchTool({
|
||||||
|
config: {
|
||||||
|
tools: { web: { fetch: { cacheTtlMinutes: 0, firecrawl: { enabled: false } } } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(tool?.execute?.("call", { url: "https://private.test/resource" })).rejects.toThrow(
|
||||||
|
/private|internal|blocked/i,
|
||||||
|
);
|
||||||
|
expect(fetchSpy).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("blocks redirects to private hosts", async () => {
|
||||||
|
lookupMock.mockResolvedValue([{ address: "93.184.216.34", family: 4 }]);
|
||||||
|
|
||||||
|
const fetchSpy = vi.fn().mockResolvedValueOnce(redirectResponse("http://127.0.0.1/secret"));
|
||||||
|
// @ts-expect-error mock fetch
|
||||||
|
global.fetch = fetchSpy;
|
||||||
|
|
||||||
|
const { createWebFetchTool } = await import("./web-tools.js");
|
||||||
|
const tool = createWebFetchTool({
|
||||||
|
config: {
|
||||||
|
tools: {
|
||||||
|
web: {
|
||||||
|
fetch: { cacheTtlMinutes: 0, firecrawl: { apiKey: "firecrawl-test" } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(tool?.execute?.("call", { url: "https://example.com" })).rejects.toThrow(
|
||||||
|
/private|internal|blocked/i,
|
||||||
|
);
|
||||||
|
expect(fetchSpy).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("allows public hosts", async () => {
|
||||||
|
lookupMock.mockResolvedValue([{ address: "93.184.216.34", family: 4 }]);
|
||||||
|
|
||||||
|
const fetchSpy = vi.fn().mockResolvedValue(textResponse("ok"));
|
||||||
|
// @ts-expect-error mock fetch
|
||||||
|
global.fetch = fetchSpy;
|
||||||
|
|
||||||
|
const { createWebFetchTool } = await import("./web-tools.js");
|
||||||
|
const tool = createWebFetchTool({
|
||||||
|
config: {
|
||||||
|
tools: { web: { fetch: { cacheTtlMinutes: 0, firecrawl: { enabled: false } } } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await tool?.execute?.("call", { url: "https://example.com" });
|
||||||
|
expect(result?.details).toMatchObject({
|
||||||
|
status: 200,
|
||||||
|
extractor: "raw",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { Type } from "@sinclair/typebox";
|
import { Type } from "@sinclair/typebox";
|
||||||
|
|
||||||
import type { ClawdbotConfig } from "../../config/config.js";
|
import type { ClawdbotConfig } from "../../config/config.js";
|
||||||
|
import { assertPublicHostname, SsrFBlockedError } from "../../infra/net/ssrf.js";
|
||||||
import { stringEnum } from "../schema/typebox.js";
|
import { stringEnum } from "../schema/typebox.js";
|
||||||
import type { AnyAgentTool } from "./common.js";
|
import type { AnyAgentTool } from "./common.js";
|
||||||
import { jsonResult, readNumberParam, readStringParam } from "./common.js";
|
import { jsonResult, readNumberParam, readStringParam } from "./common.js";
|
||||||
@@ -29,6 +30,7 @@ export { extractReadableContent } from "./web-fetch-utils.js";
|
|||||||
const EXTRACT_MODES = ["markdown", "text"] as const;
|
const EXTRACT_MODES = ["markdown", "text"] as const;
|
||||||
|
|
||||||
const DEFAULT_FETCH_MAX_CHARS = 50_000;
|
const DEFAULT_FETCH_MAX_CHARS = 50_000;
|
||||||
|
const DEFAULT_FETCH_MAX_REDIRECTS = 3;
|
||||||
const DEFAULT_ERROR_MAX_CHARS = 4_000;
|
const DEFAULT_ERROR_MAX_CHARS = 4_000;
|
||||||
const DEFAULT_FIRECRAWL_BASE_URL = "https://api.firecrawl.dev";
|
const DEFAULT_FIRECRAWL_BASE_URL = "https://api.firecrawl.dev";
|
||||||
const DEFAULT_FIRECRAWL_MAX_AGE_MS = 172_800_000;
|
const DEFAULT_FIRECRAWL_MAX_AGE_MS = 172_800_000;
|
||||||
@@ -144,6 +146,11 @@ function resolveMaxChars(value: unknown, fallback: number): number {
|
|||||||
return Math.max(100, Math.floor(parsed));
|
return Math.max(100, Math.floor(parsed));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function resolveMaxRedirects(value: unknown, fallback: number): number {
|
||||||
|
const parsed = typeof value === "number" && Number.isFinite(value) ? value : fallback;
|
||||||
|
return Math.max(0, Math.floor(parsed));
|
||||||
|
}
|
||||||
|
|
||||||
function looksLikeHtml(value: string): boolean {
|
function looksLikeHtml(value: string): boolean {
|
||||||
const trimmed = value.trimStart();
|
const trimmed = value.trimStart();
|
||||||
if (!trimmed) return false;
|
if (!trimmed) return false;
|
||||||
@@ -151,6 +158,68 @@ function looksLikeHtml(value: string): boolean {
|
|||||||
return head.startsWith("<!doctype html") || head.startsWith("<html");
|
return head.startsWith("<!doctype html") || head.startsWith("<html");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isRedirectStatus(status: number): boolean {
|
||||||
|
return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchWithRedirects(params: {
|
||||||
|
url: string;
|
||||||
|
maxRedirects: number;
|
||||||
|
timeoutSeconds: number;
|
||||||
|
userAgent: string;
|
||||||
|
}): Promise<{ response: Response; finalUrl: string }> {
|
||||||
|
const signal = withTimeout(undefined, params.timeoutSeconds * 1000);
|
||||||
|
const visited = new Set<string>();
|
||||||
|
let currentUrl = params.url;
|
||||||
|
let redirectCount = 0;
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
let parsedUrl: URL;
|
||||||
|
try {
|
||||||
|
parsedUrl = new URL(currentUrl);
|
||||||
|
} catch {
|
||||||
|
throw new Error("Invalid URL: must be http or https");
|
||||||
|
}
|
||||||
|
if (!["http:", "https:"].includes(parsedUrl.protocol)) {
|
||||||
|
throw new Error("Invalid URL: must be http or https");
|
||||||
|
}
|
||||||
|
|
||||||
|
await assertPublicHostname(parsedUrl.hostname);
|
||||||
|
|
||||||
|
const res = await fetch(parsedUrl.toString(), {
|
||||||
|
method: "GET",
|
||||||
|
headers: {
|
||||||
|
Accept: "*/*",
|
||||||
|
"User-Agent": params.userAgent,
|
||||||
|
"Accept-Language": "en-US,en;q=0.9",
|
||||||
|
},
|
||||||
|
signal,
|
||||||
|
redirect: "manual",
|
||||||
|
});
|
||||||
|
|
||||||
|
if (isRedirectStatus(res.status)) {
|
||||||
|
const location = res.headers.get("location");
|
||||||
|
if (!location) {
|
||||||
|
throw new Error(`Redirect missing location header (${res.status})`);
|
||||||
|
}
|
||||||
|
redirectCount += 1;
|
||||||
|
if (redirectCount > params.maxRedirects) {
|
||||||
|
throw new Error(`Too many redirects (limit: ${params.maxRedirects})`);
|
||||||
|
}
|
||||||
|
const nextUrl = new URL(location, parsedUrl).toString();
|
||||||
|
if (visited.has(nextUrl)) {
|
||||||
|
throw new Error("Redirect loop detected");
|
||||||
|
}
|
||||||
|
visited.add(nextUrl);
|
||||||
|
void res.body?.cancel();
|
||||||
|
currentUrl = nextUrl;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { response: res, finalUrl: currentUrl };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function formatWebFetchErrorDetail(params: {
|
function formatWebFetchErrorDetail(params: {
|
||||||
detail: string;
|
detail: string;
|
||||||
contentType?: string | null;
|
contentType?: string | null;
|
||||||
@@ -247,6 +316,7 @@ async function runWebFetch(params: {
|
|||||||
url: string;
|
url: string;
|
||||||
extractMode: ExtractMode;
|
extractMode: ExtractMode;
|
||||||
maxChars: number;
|
maxChars: number;
|
||||||
|
maxRedirects: number;
|
||||||
timeoutSeconds: number;
|
timeoutSeconds: number;
|
||||||
cacheTtlMs: number;
|
cacheTtlMs: number;
|
||||||
userAgent: string;
|
userAgent: string;
|
||||||
@@ -278,20 +348,23 @@ async function runWebFetch(params: {
|
|||||||
|
|
||||||
const start = Date.now();
|
const start = Date.now();
|
||||||
let res: Response;
|
let res: Response;
|
||||||
|
let finalUrl = params.url;
|
||||||
try {
|
try {
|
||||||
res = await fetch(parsedUrl.toString(), {
|
const result = await fetchWithRedirects({
|
||||||
method: "GET",
|
url: params.url,
|
||||||
headers: {
|
maxRedirects: params.maxRedirects,
|
||||||
Accept: "*/*",
|
timeoutSeconds: params.timeoutSeconds,
|
||||||
"User-Agent": params.userAgent,
|
userAgent: params.userAgent,
|
||||||
"Accept-Language": "en-US,en;q=0.9",
|
|
||||||
},
|
|
||||||
signal: withTimeout(undefined, params.timeoutSeconds * 1000),
|
|
||||||
});
|
});
|
||||||
|
res = result.response;
|
||||||
|
finalUrl = result.finalUrl;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
if (error instanceof SsrFBlockedError) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
if (params.firecrawlEnabled && params.firecrawlApiKey) {
|
if (params.firecrawlEnabled && params.firecrawlApiKey) {
|
||||||
const firecrawl = await fetchFirecrawlContent({
|
const firecrawl = await fetchFirecrawlContent({
|
||||||
url: params.url,
|
url: finalUrl,
|
||||||
extractMode: params.extractMode,
|
extractMode: params.extractMode,
|
||||||
apiKey: params.firecrawlApiKey,
|
apiKey: params.firecrawlApiKey,
|
||||||
baseUrl: params.firecrawlBaseUrl,
|
baseUrl: params.firecrawlBaseUrl,
|
||||||
@@ -304,7 +377,7 @@ async function runWebFetch(params: {
|
|||||||
const truncated = truncateText(firecrawl.text, params.maxChars);
|
const truncated = truncateText(firecrawl.text, params.maxChars);
|
||||||
const payload = {
|
const payload = {
|
||||||
url: params.url,
|
url: params.url,
|
||||||
finalUrl: firecrawl.finalUrl || params.url,
|
finalUrl: firecrawl.finalUrl || finalUrl,
|
||||||
status: firecrawl.status ?? 200,
|
status: firecrawl.status ?? 200,
|
||||||
contentType: "text/markdown",
|
contentType: "text/markdown",
|
||||||
title: firecrawl.title,
|
title: firecrawl.title,
|
||||||
@@ -339,7 +412,7 @@ async function runWebFetch(params: {
|
|||||||
const truncated = truncateText(firecrawl.text, params.maxChars);
|
const truncated = truncateText(firecrawl.text, params.maxChars);
|
||||||
const payload = {
|
const payload = {
|
||||||
url: params.url,
|
url: params.url,
|
||||||
finalUrl: firecrawl.finalUrl || params.url,
|
finalUrl: firecrawl.finalUrl || finalUrl,
|
||||||
status: firecrawl.status ?? res.status,
|
status: firecrawl.status ?? res.status,
|
||||||
contentType: "text/markdown",
|
contentType: "text/markdown",
|
||||||
title: firecrawl.title,
|
title: firecrawl.title,
|
||||||
@@ -374,7 +447,7 @@ async function runWebFetch(params: {
|
|||||||
if (params.readabilityEnabled) {
|
if (params.readabilityEnabled) {
|
||||||
const readable = await extractReadableContent({
|
const readable = await extractReadableContent({
|
||||||
html: body,
|
html: body,
|
||||||
url: res.url || params.url,
|
url: finalUrl,
|
||||||
extractMode: params.extractMode,
|
extractMode: params.extractMode,
|
||||||
});
|
});
|
||||||
if (readable?.text) {
|
if (readable?.text) {
|
||||||
@@ -382,7 +455,7 @@ async function runWebFetch(params: {
|
|||||||
title = readable.title;
|
title = readable.title;
|
||||||
extractor = "readability";
|
extractor = "readability";
|
||||||
} else {
|
} else {
|
||||||
const firecrawl = await tryFirecrawlFallback(params);
|
const firecrawl = await tryFirecrawlFallback({ ...params, url: finalUrl });
|
||||||
if (firecrawl) {
|
if (firecrawl) {
|
||||||
text = firecrawl.text;
|
text = firecrawl.text;
|
||||||
title = firecrawl.title;
|
title = firecrawl.title;
|
||||||
@@ -411,7 +484,7 @@ async function runWebFetch(params: {
|
|||||||
const truncated = truncateText(text, params.maxChars);
|
const truncated = truncateText(text, params.maxChars);
|
||||||
const payload = {
|
const payload = {
|
||||||
url: params.url,
|
url: params.url,
|
||||||
finalUrl: res.url || params.url,
|
finalUrl,
|
||||||
status: res.status,
|
status: res.status,
|
||||||
contentType,
|
contentType,
|
||||||
title,
|
title,
|
||||||
@@ -508,6 +581,7 @@ export function createWebFetchTool(options?: {
|
|||||||
url,
|
url,
|
||||||
extractMode,
|
extractMode,
|
||||||
maxChars: resolveMaxChars(maxChars ?? fetch?.maxChars, DEFAULT_FETCH_MAX_CHARS),
|
maxChars: resolveMaxChars(maxChars ?? fetch?.maxChars, DEFAULT_FETCH_MAX_CHARS),
|
||||||
|
maxRedirects: resolveMaxRedirects(fetch?.maxRedirects, DEFAULT_FETCH_MAX_REDIRECTS),
|
||||||
timeoutSeconds: resolveTimeoutSeconds(fetch?.timeoutSeconds, DEFAULT_TIMEOUT_SECONDS),
|
timeoutSeconds: resolveTimeoutSeconds(fetch?.timeoutSeconds, DEFAULT_TIMEOUT_SECONDS),
|
||||||
cacheTtlMs: resolveCacheTtlMs(fetch?.cacheTtlMinutes, DEFAULT_CACHE_TTL_MINUTES),
|
cacheTtlMs: resolveCacheTtlMs(fetch?.cacheTtlMinutes, DEFAULT_CACHE_TTL_MINUTES),
|
||||||
userAgent,
|
userAgent,
|
||||||
|
|||||||
@@ -184,9 +184,7 @@ export async function buildStatusReply(params: {
|
|||||||
const requesterKey = resolveInternalSessionKey({ key: sessionKey, alias, mainKey });
|
const requesterKey = resolveInternalSessionKey({ key: sessionKey, alias, mainKey });
|
||||||
const runs = listSubagentRunsForRequester(requesterKey);
|
const runs = listSubagentRunsForRequester(requesterKey);
|
||||||
const verboseEnabled = resolvedVerboseLevel && resolvedVerboseLevel !== "off";
|
const verboseEnabled = resolvedVerboseLevel && resolvedVerboseLevel !== "off";
|
||||||
if (runs.length === 0) {
|
if (runs.length > 0) {
|
||||||
if (verboseEnabled) subagentsLine = "🤖 Subagents: none";
|
|
||||||
} else {
|
|
||||||
const active = runs.filter((entry) => !entry.endedAt);
|
const active = runs.filter((entry) => !entry.endedAt);
|
||||||
const done = runs.length - active.length;
|
const done = runs.length - active.length;
|
||||||
if (verboseEnabled) {
|
if (verboseEnabled) {
|
||||||
|
|||||||
@@ -215,6 +215,20 @@ describe("handleCommands subagents", () => {
|
|||||||
expect(result.reply?.text).toContain("Subagents: none");
|
expect(result.reply?.text).toContain("Subagents: none");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("omits subagent status line when none exist", async () => {
|
||||||
|
resetSubagentRegistryForTests();
|
||||||
|
const cfg = {
|
||||||
|
commands: { text: true },
|
||||||
|
channels: { whatsapp: { allowFrom: ["*"] } },
|
||||||
|
session: { mainKey: "main", scope: "per-sender" },
|
||||||
|
} as ClawdbotConfig;
|
||||||
|
const params = buildParams("/status", cfg);
|
||||||
|
params.resolvedVerboseLevel = "on";
|
||||||
|
const result = await handleCommands(params);
|
||||||
|
expect(result.shouldContinue).toBe(false);
|
||||||
|
expect(result.reply?.text).not.toContain("Subagents:");
|
||||||
|
});
|
||||||
|
|
||||||
it("returns help for unknown subagents action", async () => {
|
it("returns help for unknown subagents action", async () => {
|
||||||
resetSubagentRegistryForTests();
|
resetSubagentRegistryForTests();
|
||||||
const cfg = {
|
const cfg = {
|
||||||
|
|||||||
@@ -143,6 +143,22 @@ describe("buildStatusMessage", () => {
|
|||||||
expect(normalized).toContain("Media: image ok (openai/gpt-5.2) · audio skipped (maxBytes)");
|
expect(normalized).toContain("Media: image ok (openai/gpt-5.2) · audio skipped (maxBytes)");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("omits media line when all decisions are none", () => {
|
||||||
|
const text = buildStatusMessage({
|
||||||
|
agent: { model: "anthropic/claude-opus-4-5" },
|
||||||
|
sessionEntry: { sessionId: "media-none", updatedAt: 0 },
|
||||||
|
sessionKey: "agent:main:main",
|
||||||
|
queue: { mode: "none" },
|
||||||
|
mediaDecisions: [
|
||||||
|
{ capability: "image", outcome: "no-attachment", attachments: [] },
|
||||||
|
{ capability: "audio", outcome: "no-attachment", attachments: [] },
|
||||||
|
{ capability: "video", outcome: "no-attachment", attachments: [] },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(normalizeTestText(text)).not.toContain("Media:");
|
||||||
|
});
|
||||||
|
|
||||||
it("does not show elevated label when session explicitly disables it", () => {
|
it("does not show elevated label when session explicitly disables it", () => {
|
||||||
const text = buildStatusMessage({
|
const text = buildStatusMessage({
|
||||||
agent: { model: "anthropic/claude-opus-4-5", elevatedDefault: "on" },
|
agent: { model: "anthropic/claude-opus-4-5", elevatedDefault: "on" },
|
||||||
|
|||||||
@@ -201,8 +201,9 @@ const formatMediaUnderstandingLine = (decisions?: MediaUnderstandingDecision[])
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
})
|
})
|
||||||
.filter(Boolean);
|
.filter((part): part is string => part != null);
|
||||||
if (parts.length === 0) return null;
|
if (parts.length === 0) return null;
|
||||||
|
if (parts.every((part) => part.endsWith(" none"))) return null;
|
||||||
return `📎 Media: ${parts.join(" · ")}`;
|
return `📎 Media: ${parts.join(" · ")}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { Command } from "commander";
|
||||||
|
|
||||||
|
const clientMocks = vi.hoisted(() => ({
|
||||||
|
browserSnapshot: vi.fn(async () => ({
|
||||||
|
ok: true,
|
||||||
|
format: "ai",
|
||||||
|
targetId: "t1",
|
||||||
|
url: "https://example.com",
|
||||||
|
snapshot: "ok",
|
||||||
|
})),
|
||||||
|
resolveBrowserControlUrl: vi.fn(() => "http://127.0.0.1:18791"),
|
||||||
|
}));
|
||||||
|
vi.mock("../browser/client.js", () => clientMocks);
|
||||||
|
|
||||||
|
const configMocks = vi.hoisted(() => ({
|
||||||
|
loadConfig: vi.fn(() => ({ browser: {} })),
|
||||||
|
}));
|
||||||
|
vi.mock("../config/config.js", () => configMocks);
|
||||||
|
|
||||||
|
const runtime = {
|
||||||
|
log: vi.fn(),
|
||||||
|
error: vi.fn(),
|
||||||
|
exit: vi.fn(),
|
||||||
|
};
|
||||||
|
vi.mock("../runtime.js", () => ({
|
||||||
|
defaultRuntime: runtime,
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe("browser cli snapshot defaults", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
configMocks.loadConfig.mockReturnValue({ browser: {} });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses config snapshot defaults when mode is not provided", async () => {
|
||||||
|
configMocks.loadConfig.mockReturnValue({
|
||||||
|
browser: { snapshotDefaults: { mode: "efficient" } },
|
||||||
|
});
|
||||||
|
const { registerBrowserInspectCommands } = await import("./browser-cli-inspect.js");
|
||||||
|
const program = new Command();
|
||||||
|
const browser = program.command("browser").option("--json", false);
|
||||||
|
registerBrowserInspectCommands(browser, () => ({}));
|
||||||
|
|
||||||
|
await program.parseAsync(["browser", "snapshot"], { from: "user" });
|
||||||
|
|
||||||
|
expect(clientMocks.browserSnapshot).toHaveBeenCalledWith(
|
||||||
|
"http://127.0.0.1:18791",
|
||||||
|
expect.objectContaining({
|
||||||
|
format: "ai",
|
||||||
|
mode: "efficient",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not apply config snapshot defaults to aria snapshots", async () => {
|
||||||
|
configMocks.loadConfig.mockReturnValue({
|
||||||
|
browser: { snapshotDefaults: { mode: "efficient" } },
|
||||||
|
});
|
||||||
|
clientMocks.browserSnapshot.mockResolvedValueOnce({
|
||||||
|
ok: true,
|
||||||
|
format: "aria",
|
||||||
|
targetId: "t1",
|
||||||
|
url: "https://example.com",
|
||||||
|
nodes: [],
|
||||||
|
});
|
||||||
|
const { registerBrowserInspectCommands } = await import("./browser-cli-inspect.js");
|
||||||
|
const program = new Command();
|
||||||
|
const browser = program.command("browser").option("--json", false);
|
||||||
|
registerBrowserInspectCommands(browser, () => ({}));
|
||||||
|
|
||||||
|
await program.parseAsync(["browser", "snapshot", "--format", "aria"], { from: "user" });
|
||||||
|
|
||||||
|
expect(clientMocks.browserSnapshot).toHaveBeenCalled();
|
||||||
|
const [, opts] = clientMocks.browserSnapshot.mock.calls.at(-1) ?? [];
|
||||||
|
expect(opts?.mode).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -2,6 +2,7 @@ import type { Command } from "commander";
|
|||||||
|
|
||||||
import { browserSnapshot, resolveBrowserControlUrl } from "../browser/client.js";
|
import { browserSnapshot, resolveBrowserControlUrl } from "../browser/client.js";
|
||||||
import { browserScreenshotAction } from "../browser/client-actions.js";
|
import { browserScreenshotAction } from "../browser/client-actions.js";
|
||||||
|
import { loadConfig } from "../config/config.js";
|
||||||
import { danger } from "../globals.js";
|
import { danger } from "../globals.js";
|
||||||
import { defaultRuntime } from "../runtime.js";
|
import { defaultRuntime } from "../runtime.js";
|
||||||
import type { BrowserParentOpts } from "./browser-cli-shared.js";
|
import type { BrowserParentOpts } from "./browser-cli-shared.js";
|
||||||
@@ -62,7 +63,11 @@ export function registerBrowserInspectCommands(
|
|||||||
const baseUrl = resolveBrowserControlUrl(parent?.url);
|
const baseUrl = resolveBrowserControlUrl(parent?.url);
|
||||||
const profile = parent?.browserProfile;
|
const profile = parent?.browserProfile;
|
||||||
const format = opts.format === "aria" ? "aria" : "ai";
|
const format = opts.format === "aria" ? "aria" : "ai";
|
||||||
const mode = opts.efficient === true || opts.mode === "efficient" ? "efficient" : undefined;
|
const configMode =
|
||||||
|
format === "ai" && loadConfig().browser?.snapshotDefaults?.mode === "efficient"
|
||||||
|
? "efficient"
|
||||||
|
: undefined;
|
||||||
|
const mode = opts.efficient === true || opts.mode === "efficient" ? "efficient" : configMode;
|
||||||
try {
|
try {
|
||||||
const result = await browserSnapshot(baseUrl, {
|
const result = await browserSnapshot(baseUrl, {
|
||||||
format,
|
format,
|
||||||
|
|||||||
@@ -246,4 +246,128 @@ describe("cron cli", () => {
|
|||||||
expect(patch?.patch?.payload?.kind).toBe("agentTurn");
|
expect(patch?.patch?.payload?.kind).toBe("agentTurn");
|
||||||
expect(patch?.patch?.payload?.deliver).toBe(false);
|
expect(patch?.patch?.payload?.deliver).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("does not include undefined delivery fields when updating message", async () => {
|
||||||
|
callGatewayFromCli.mockClear();
|
||||||
|
|
||||||
|
const { registerCronCli } = await import("./cron-cli.js");
|
||||||
|
const program = new Command();
|
||||||
|
program.exitOverride();
|
||||||
|
registerCronCli(program);
|
||||||
|
|
||||||
|
// Update message without delivery flags - should NOT include undefined delivery fields
|
||||||
|
await program.parseAsync(["cron", "edit", "job-1", "--message", "Updated message"], {
|
||||||
|
from: "user",
|
||||||
|
});
|
||||||
|
|
||||||
|
const updateCall = callGatewayFromCli.mock.calls.find((call) => call[0] === "cron.update");
|
||||||
|
const patch = updateCall?.[2] as {
|
||||||
|
patch?: {
|
||||||
|
payload?: {
|
||||||
|
message?: string;
|
||||||
|
deliver?: boolean;
|
||||||
|
channel?: string;
|
||||||
|
to?: string;
|
||||||
|
bestEffortDeliver?: boolean;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
// Should include the new message
|
||||||
|
expect(patch?.patch?.payload?.message).toBe("Updated message");
|
||||||
|
|
||||||
|
// Should NOT include delivery fields at all (to preserve existing values)
|
||||||
|
expect(patch?.patch?.payload).not.toHaveProperty("deliver");
|
||||||
|
expect(patch?.patch?.payload).not.toHaveProperty("channel");
|
||||||
|
expect(patch?.patch?.payload).not.toHaveProperty("to");
|
||||||
|
expect(patch?.patch?.payload).not.toHaveProperty("bestEffortDeliver");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("includes delivery fields when explicitly provided with message", async () => {
|
||||||
|
callGatewayFromCli.mockClear();
|
||||||
|
|
||||||
|
const { registerCronCli } = await import("./cron-cli.js");
|
||||||
|
const program = new Command();
|
||||||
|
program.exitOverride();
|
||||||
|
registerCronCli(program);
|
||||||
|
|
||||||
|
// Update message AND delivery - should include both
|
||||||
|
await program.parseAsync(
|
||||||
|
[
|
||||||
|
"cron",
|
||||||
|
"edit",
|
||||||
|
"job-1",
|
||||||
|
"--message",
|
||||||
|
"Updated message",
|
||||||
|
"--deliver",
|
||||||
|
"--channel",
|
||||||
|
"telegram",
|
||||||
|
"--to",
|
||||||
|
"19098680",
|
||||||
|
],
|
||||||
|
{ from: "user" },
|
||||||
|
);
|
||||||
|
|
||||||
|
const updateCall = callGatewayFromCli.mock.calls.find((call) => call[0] === "cron.update");
|
||||||
|
const patch = updateCall?.[2] as {
|
||||||
|
patch?: {
|
||||||
|
payload?: {
|
||||||
|
message?: string;
|
||||||
|
deliver?: boolean;
|
||||||
|
channel?: string;
|
||||||
|
to?: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
// Should include everything
|
||||||
|
expect(patch?.patch?.payload?.message).toBe("Updated message");
|
||||||
|
expect(patch?.patch?.payload?.deliver).toBe(true);
|
||||||
|
expect(patch?.patch?.payload?.channel).toBe("telegram");
|
||||||
|
expect(patch?.patch?.payload?.to).toBe("19098680");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("includes best-effort delivery when provided with message", async () => {
|
||||||
|
callGatewayFromCli.mockClear();
|
||||||
|
|
||||||
|
const { registerCronCli } = await import("./cron-cli.js");
|
||||||
|
const program = new Command();
|
||||||
|
program.exitOverride();
|
||||||
|
registerCronCli(program);
|
||||||
|
|
||||||
|
await program.parseAsync(
|
||||||
|
["cron", "edit", "job-1", "--message", "Updated message", "--best-effort-deliver"],
|
||||||
|
{ from: "user" },
|
||||||
|
);
|
||||||
|
|
||||||
|
const updateCall = callGatewayFromCli.mock.calls.find((call) => call[0] === "cron.update");
|
||||||
|
const patch = updateCall?.[2] as {
|
||||||
|
patch?: { payload?: { message?: string; bestEffortDeliver?: boolean } };
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(patch?.patch?.payload?.message).toBe("Updated message");
|
||||||
|
expect(patch?.patch?.payload?.bestEffortDeliver).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("includes no-best-effort delivery when provided with message", async () => {
|
||||||
|
callGatewayFromCli.mockClear();
|
||||||
|
|
||||||
|
const { registerCronCli } = await import("./cron-cli.js");
|
||||||
|
const program = new Command();
|
||||||
|
program.exitOverride();
|
||||||
|
registerCronCli(program);
|
||||||
|
|
||||||
|
await program.parseAsync(
|
||||||
|
["cron", "edit", "job-1", "--message", "Updated message", "--no-best-effort-deliver"],
|
||||||
|
{ from: "user" },
|
||||||
|
);
|
||||||
|
|
||||||
|
const updateCall = callGatewayFromCli.mock.calls.find((call) => call[0] === "cron.update");
|
||||||
|
const patch = updateCall?.[2] as {
|
||||||
|
patch?: { payload?: { message?: string; bestEffortDeliver?: boolean } };
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(patch?.patch?.payload?.message).toBe("Updated message");
|
||||||
|
expect(patch?.patch?.payload?.bestEffortDeliver).toBe(false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -10,6 +10,15 @@ import {
|
|||||||
warnIfCronSchedulerDisabled,
|
warnIfCronSchedulerDisabled,
|
||||||
} from "./shared.js";
|
} from "./shared.js";
|
||||||
|
|
||||||
|
const assignIf = (
|
||||||
|
target: Record<string, unknown>,
|
||||||
|
key: string,
|
||||||
|
value: unknown,
|
||||||
|
shouldAssign: boolean,
|
||||||
|
) => {
|
||||||
|
if (shouldAssign) target[key] = value;
|
||||||
|
};
|
||||||
|
|
||||||
export function registerCronEditCommand(cron: Command) {
|
export function registerCronEditCommand(cron: Command) {
|
||||||
addGatewayClientOptions(
|
addGatewayClientOptions(
|
||||||
cron
|
cron
|
||||||
@@ -136,18 +145,19 @@ export function registerCronEditCommand(cron: Command) {
|
|||||||
};
|
};
|
||||||
} else if (hasAgentTurnPatch) {
|
} else if (hasAgentTurnPatch) {
|
||||||
const payload: Record<string, unknown> = { kind: "agentTurn" };
|
const payload: Record<string, unknown> = { kind: "agentTurn" };
|
||||||
if (typeof opts.message === "string") payload.message = String(opts.message);
|
assignIf(payload, "message", String(opts.message), typeof opts.message === "string");
|
||||||
if (model) payload.model = model;
|
assignIf(payload, "model", model, Boolean(model));
|
||||||
if (thinking) payload.thinking = thinking;
|
assignIf(payload, "thinking", thinking, Boolean(thinking));
|
||||||
if (hasTimeoutSeconds) {
|
assignIf(payload, "timeoutSeconds", timeoutSeconds, hasTimeoutSeconds);
|
||||||
payload.timeoutSeconds = timeoutSeconds;
|
assignIf(payload, "deliver", opts.deliver, typeof opts.deliver === "boolean");
|
||||||
}
|
assignIf(payload, "channel", opts.channel, typeof opts.channel === "string");
|
||||||
if (typeof opts.deliver === "boolean") payload.deliver = opts.deliver;
|
assignIf(payload, "to", opts.to, typeof opts.to === "string");
|
||||||
if (typeof opts.channel === "string") payload.channel = opts.channel;
|
assignIf(
|
||||||
if (typeof opts.to === "string") payload.to = opts.to;
|
payload,
|
||||||
if (typeof opts.bestEffortDeliver === "boolean") {
|
"bestEffortDeliver",
|
||||||
payload.bestEffortDeliver = opts.bestEffortDeliver;
|
opts.bestEffortDeliver,
|
||||||
}
|
typeof opts.bestEffortDeliver === "boolean",
|
||||||
|
);
|
||||||
patch.payload = payload;
|
patch.payload = payload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ import type { Command } from "commander";
|
|||||||
import type { ExecApprovalsAgent, ExecApprovalsFile } from "../infra/exec-approvals.js";
|
import type { ExecApprovalsAgent, ExecApprovalsFile } from "../infra/exec-approvals.js";
|
||||||
import { defaultRuntime } from "../runtime.js";
|
import { defaultRuntime } from "../runtime.js";
|
||||||
import { formatDocsLink } from "../terminal/links.js";
|
import { formatDocsLink } from "../terminal/links.js";
|
||||||
import { theme } from "../terminal/theme.js";
|
import { isRich, theme } from "../terminal/theme.js";
|
||||||
|
import { renderTable } from "../terminal/table.js";
|
||||||
import { callGatewayFromCli } from "./gateway-rpc.js";
|
import { callGatewayFromCli } from "./gateway-rpc.js";
|
||||||
import { nodesCallOpts, resolveNodeId } from "./nodes-cli/rpc.js";
|
import { nodesCallOpts, resolveNodeId } from "./nodes-cli/rpc.js";
|
||||||
import type { NodesRpcOpts } from "./nodes-cli/types.js";
|
import type { NodesRpcOpts } from "./nodes-cli/types.js";
|
||||||
@@ -24,6 +25,17 @@ type ExecApprovalsCliOpts = NodesRpcOpts & {
|
|||||||
agent?: string;
|
agent?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function formatAge(msAgo: number) {
|
||||||
|
const s = Math.max(0, Math.floor(msAgo / 1000));
|
||||||
|
if (s < 60) return `${s}s`;
|
||||||
|
const m = Math.floor(s / 60);
|
||||||
|
if (m < 60) return `${m}m`;
|
||||||
|
const h = Math.floor(m / 60);
|
||||||
|
if (h < 24) return `${h}h`;
|
||||||
|
const d = Math.floor(h / 24);
|
||||||
|
return `${d}d`;
|
||||||
|
}
|
||||||
|
|
||||||
async function readStdin(): Promise<string> {
|
async function readStdin(): Promise<string> {
|
||||||
const chunks: Buffer[] = [];
|
const chunks: Buffer[] = [];
|
||||||
for await (const chunk of process.stdin) {
|
for await (const chunk of process.stdin) {
|
||||||
@@ -89,6 +101,9 @@ function isEmptyAgent(agent: ExecApprovalsAgent): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function registerExecApprovalsCli(program: Command) {
|
export function registerExecApprovalsCli(program: Command) {
|
||||||
|
const formatExample = (cmd: string, desc: string) =>
|
||||||
|
` ${theme.command(cmd)}\n ${theme.muted(desc)}`;
|
||||||
|
|
||||||
const approvals = program
|
const approvals = program
|
||||||
.command("approvals")
|
.command("approvals")
|
||||||
.alias("exec-approvals")
|
.alias("exec-approvals")
|
||||||
@@ -106,8 +121,87 @@ export function registerExecApprovalsCli(program: Command) {
|
|||||||
.action(async (opts: ExecApprovalsCliOpts) => {
|
.action(async (opts: ExecApprovalsCliOpts) => {
|
||||||
const nodeId = await resolveTargetNodeId(opts);
|
const nodeId = await resolveTargetNodeId(opts);
|
||||||
const snapshot = await loadSnapshot(opts, nodeId);
|
const snapshot = await loadSnapshot(opts, nodeId);
|
||||||
const payload = opts.json ? JSON.stringify(snapshot) : JSON.stringify(snapshot, null, 2);
|
if (opts.json) {
|
||||||
defaultRuntime.log(payload);
|
defaultRuntime.log(JSON.stringify(snapshot));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rich = isRich();
|
||||||
|
const heading = (text: string) => (rich ? theme.heading(text) : text);
|
||||||
|
const muted = (text: string) => (rich ? theme.muted(text) : text);
|
||||||
|
const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
|
||||||
|
|
||||||
|
const file = snapshot.file ?? { version: 1 };
|
||||||
|
const defaults = file.defaults ?? {};
|
||||||
|
const defaultsParts = [
|
||||||
|
defaults.security ? `security=${defaults.security}` : null,
|
||||||
|
defaults.ask ? `ask=${defaults.ask}` : null,
|
||||||
|
defaults.askFallback ? `askFallback=${defaults.askFallback}` : null,
|
||||||
|
typeof defaults.autoAllowSkills === "boolean"
|
||||||
|
? `autoAllowSkills=${defaults.autoAllowSkills ? "on" : "off"}`
|
||||||
|
: null,
|
||||||
|
].filter(Boolean) as string[];
|
||||||
|
const agents = file.agents ?? {};
|
||||||
|
const allowlistRows: Array<{ Agent: string; Pattern: string; LastUsed: string }> = [];
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [agentId, agent] of Object.entries(agents)) {
|
||||||
|
const allowlist = Array.isArray(agent.allowlist) ? agent.allowlist : [];
|
||||||
|
for (const entry of allowlist) {
|
||||||
|
const pattern = entry?.pattern?.trim() ?? "";
|
||||||
|
if (!pattern) continue;
|
||||||
|
const lastUsedAt = typeof entry.lastUsedAt === "number" ? entry.lastUsedAt : null;
|
||||||
|
allowlistRows.push({
|
||||||
|
Agent: agentId,
|
||||||
|
Pattern: pattern,
|
||||||
|
LastUsed: lastUsedAt
|
||||||
|
? `${formatAge(Math.max(0, now - lastUsedAt))} ago`
|
||||||
|
: muted("unknown"),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const summaryRows = [
|
||||||
|
{ Field: "Path", Value: snapshot.path },
|
||||||
|
{ Field: "Exists", Value: snapshot.exists ? "yes" : "no" },
|
||||||
|
{ Field: "Hash", Value: snapshot.hash },
|
||||||
|
{ Field: "Version", Value: String(file.version ?? 1) },
|
||||||
|
{ Field: "Socket", Value: file.socket?.path ?? "default" },
|
||||||
|
{ Field: "Defaults", Value: defaultsParts.length > 0 ? defaultsParts.join(", ") : "none" },
|
||||||
|
{ Field: "Agents", Value: String(Object.keys(agents).length) },
|
||||||
|
{ Field: "Allowlist", Value: String(allowlistRows.length) },
|
||||||
|
];
|
||||||
|
|
||||||
|
defaultRuntime.log(heading("Approvals"));
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Field", header: "Field", minWidth: 8 },
|
||||||
|
{ key: "Value", header: "Value", minWidth: 24, flex: true },
|
||||||
|
],
|
||||||
|
rows: summaryRows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (allowlistRows.length === 0) {
|
||||||
|
defaultRuntime.log("");
|
||||||
|
defaultRuntime.log(muted("No allowlist entries."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
defaultRuntime.log("");
|
||||||
|
defaultRuntime.log(heading("Allowlist"));
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Agent", header: "Agent", minWidth: 8 },
|
||||||
|
{ key: "Pattern", header: "Pattern", minWidth: 20, flex: true },
|
||||||
|
{ key: "LastUsed", header: "Last Used", minWidth: 10 },
|
||||||
|
],
|
||||||
|
rows: allowlistRows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
nodesCallOpts(getCmd);
|
nodesCallOpts(getCmd);
|
||||||
|
|
||||||
@@ -151,7 +245,23 @@ export function registerExecApprovalsCli(program: Command) {
|
|||||||
});
|
});
|
||||||
nodesCallOpts(setCmd);
|
nodesCallOpts(setCmd);
|
||||||
|
|
||||||
const allowlist = approvals.command("allowlist").description("Edit the per-agent allowlist");
|
const allowlist = approvals
|
||||||
|
.command("allowlist")
|
||||||
|
.description("Edit the per-agent allowlist")
|
||||||
|
.addHelpText(
|
||||||
|
"after",
|
||||||
|
() =>
|
||||||
|
`\n${theme.heading("Examples:")}\n${formatExample(
|
||||||
|
'clawdbot approvals allowlist add "~/Projects/**/bin/rg"',
|
||||||
|
"Allowlist a local binary pattern for the default agent.",
|
||||||
|
)}\n${formatExample(
|
||||||
|
'clawdbot approvals allowlist add --agent main --node <id|name|ip> "/usr/bin/uptime"',
|
||||||
|
"Allowlist on a specific node/agent.",
|
||||||
|
)}\n${formatExample(
|
||||||
|
'clawdbot approvals allowlist remove "~/Projects/**/bin/rg"',
|
||||||
|
"Remove an allowlist pattern.",
|
||||||
|
)}\n\n${theme.muted("Docs:")} ${formatDocsLink("/cli/approvals", "docs.clawd.bot/cli/approvals")}\n`,
|
||||||
|
);
|
||||||
|
|
||||||
const allowlistAdd = allowlist
|
const allowlistAdd = allowlist
|
||||||
.command("add <pattern>")
|
.command("add <pattern>")
|
||||||
|
|||||||
+26
-64
@@ -4,6 +4,7 @@ import { buildGatewayConnectionDetails } from "../gateway/call.js";
|
|||||||
import { parseLogLine } from "../logging/parse-log-line.js";
|
import { parseLogLine } from "../logging/parse-log-line.js";
|
||||||
import { formatDocsLink } from "../terminal/links.js";
|
import { formatDocsLink } from "../terminal/links.js";
|
||||||
import { clearActiveProgressLine } from "../terminal/progress-line.js";
|
import { clearActiveProgressLine } from "../terminal/progress-line.js";
|
||||||
|
import { createSafeStreamWriter } from "../terminal/stream-writer.js";
|
||||||
import { colorize, isRich, theme } from "../terminal/theme.js";
|
import { colorize, isRich, theme } from "../terminal/theme.js";
|
||||||
import { formatCliCommand } from "./command-format.js";
|
import { formatCliCommand } from "./command-format.js";
|
||||||
import { addGatewayClientOptions, callGatewayFromCli } from "./gateway-rpc.js";
|
import { addGatewayClientOptions, callGatewayFromCli } from "./gateway-rpc.js";
|
||||||
@@ -104,68 +105,28 @@ function formatLogLine(
|
|||||||
return [head, messageValue].filter(Boolean).join(" ").trim();
|
return [head, messageValue].filter(Boolean).join(" ").trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
let outputClosed = false;
|
function createLogWriters() {
|
||||||
let outputClosedNotice = false;
|
const writer = createSafeStreamWriter({
|
||||||
|
beforeWrite: () => clearActiveProgressLine(),
|
||||||
|
onBrokenPipe: (err, stream) => {
|
||||||
|
const code = err.code ?? "EPIPE";
|
||||||
|
const target = stream === process.stdout ? "stdout" : "stderr";
|
||||||
|
const message = `clawdbot logs: output ${target} closed (${code}). Stopping tail.`;
|
||||||
|
try {
|
||||||
|
clearActiveProgressLine();
|
||||||
|
process.stderr.write(`${message}\n`);
|
||||||
|
} catch {
|
||||||
|
// ignore secondary failures while reporting the broken pipe
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
function isBrokenPipeError(err: unknown): err is NodeJS.ErrnoException {
|
return {
|
||||||
const code = (err as NodeJS.ErrnoException)?.code;
|
logLine: (text: string) => writer.writeLine(process.stdout, text),
|
||||||
return code === "EPIPE" || code === "EIO";
|
errorLine: (text: string) => writer.writeLine(process.stderr, text),
|
||||||
}
|
emitJsonLine: (payload: Record<string, unknown>, toStdErr = false) =>
|
||||||
|
writer.write(toStdErr ? process.stderr : process.stdout, `${JSON.stringify(payload)}\n`),
|
||||||
function noteOutputClosed(err: NodeJS.ErrnoException, stream: NodeJS.WriteStream) {
|
};
|
||||||
if (outputClosedNotice) return;
|
|
||||||
outputClosedNotice = true;
|
|
||||||
const code = err.code ?? "EPIPE";
|
|
||||||
const target = stream === process.stdout ? "stdout" : "stderr";
|
|
||||||
const message = `clawdbot logs: output ${target} closed (${code}). Stopping tail.`;
|
|
||||||
try {
|
|
||||||
clearActiveProgressLine();
|
|
||||||
process.stderr.write(`${message}\n`);
|
|
||||||
} catch {
|
|
||||||
// ignore secondary failures while reporting the broken pipe
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleWriteError(err: unknown, stream: NodeJS.WriteStream): boolean {
|
|
||||||
if (!isBrokenPipeError(err)) {
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
outputClosed = true;
|
|
||||||
noteOutputClosed(err, stream);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function writeText(text: string, stream: NodeJS.WriteStream): boolean {
|
|
||||||
if (outputClosed) return false;
|
|
||||||
try {
|
|
||||||
clearActiveProgressLine();
|
|
||||||
} catch (err) {
|
|
||||||
if (!handleWriteError(err, process.stderr)) return false;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
stream.write(text);
|
|
||||||
return true;
|
|
||||||
} catch (err) {
|
|
||||||
return handleWriteError(err, stream);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function writeLine(text: string, stream: NodeJS.WriteStream): boolean {
|
|
||||||
// Avoid feeding CLI output back into the log file via console capture.
|
|
||||||
return writeText(`${text}\n`, stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
function logLine(text: string): boolean {
|
|
||||||
return writeLine(text, process.stdout);
|
|
||||||
}
|
|
||||||
|
|
||||||
function errorLine(text: string): boolean {
|
|
||||||
return writeLine(text, process.stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
function emitJsonLine(payload: Record<string, unknown>, toStdErr = false): boolean {
|
|
||||||
const text = `${JSON.stringify(payload)}\n`;
|
|
||||||
return writeText(text, toStdErr ? process.stderr : process.stdout);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function emitGatewayError(
|
function emitGatewayError(
|
||||||
@@ -173,6 +134,8 @@ function emitGatewayError(
|
|||||||
opts: LogsCliOptions,
|
opts: LogsCliOptions,
|
||||||
mode: "json" | "text",
|
mode: "json" | "text",
|
||||||
rich: boolean,
|
rich: boolean,
|
||||||
|
emitJsonLine: (payload: Record<string, unknown>, toStdErr?: boolean) => boolean,
|
||||||
|
errorLine: (text: string) => boolean,
|
||||||
) {
|
) {
|
||||||
const details = buildGatewayConnectionDetails({ url: opts.url });
|
const details = buildGatewayConnectionDetails({ url: opts.url });
|
||||||
const message = "Gateway not reachable. Is it running and accessible?";
|
const message = "Gateway not reachable. Is it running and accessible?";
|
||||||
@@ -221,8 +184,7 @@ export function registerLogsCli(program: Command) {
|
|||||||
addGatewayClientOptions(logs);
|
addGatewayClientOptions(logs);
|
||||||
|
|
||||||
logs.action(async (opts: LogsCliOptions) => {
|
logs.action(async (opts: LogsCliOptions) => {
|
||||||
outputClosed = false;
|
const { logLine, errorLine, emitJsonLine } = createLogWriters();
|
||||||
outputClosedNotice = false;
|
|
||||||
const interval = parsePositiveInt(opts.interval, 1000);
|
const interval = parsePositiveInt(opts.interval, 1000);
|
||||||
let cursor: number | undefined;
|
let cursor: number | undefined;
|
||||||
let first = true;
|
let first = true;
|
||||||
@@ -235,7 +197,7 @@ export function registerLogsCli(program: Command) {
|
|||||||
try {
|
try {
|
||||||
payload = await fetchLogs(opts, cursor);
|
payload = await fetchLogs(opts, cursor);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
emitGatewayError(err, opts, jsonMode ? "json" : "text", rich);
|
emitGatewayError(err, opts, jsonMode ? "json" : "text", rich, emitJsonLine, errorLine);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,28 @@
|
|||||||
import { defaultRuntime } from "../../runtime.js";
|
import { defaultRuntime } from "../../runtime.js";
|
||||||
|
import { isRich, theme } from "../../terminal/theme.js";
|
||||||
import { runCommandWithRuntime } from "../cli-utils.js";
|
import { runCommandWithRuntime } from "../cli-utils.js";
|
||||||
import { unauthorizedHintForMessage } from "./rpc.js";
|
import { unauthorizedHintForMessage } from "./rpc.js";
|
||||||
|
|
||||||
|
export function getNodesTheme() {
|
||||||
|
const rich = isRich();
|
||||||
|
const color = (fn: (value: string) => string) => (value: string) => (rich ? fn(value) : value);
|
||||||
|
return {
|
||||||
|
rich,
|
||||||
|
heading: color(theme.heading),
|
||||||
|
ok: color(theme.success),
|
||||||
|
warn: color(theme.warn),
|
||||||
|
muted: color(theme.muted),
|
||||||
|
error: color(theme.error),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
export function runNodesCommand(label: string, action: () => Promise<void>) {
|
export function runNodesCommand(label: string, action: () => Promise<void>) {
|
||||||
return runCommandWithRuntime(defaultRuntime, action, (err) => {
|
return runCommandWithRuntime(defaultRuntime, action, (err) => {
|
||||||
const message = String(err);
|
const message = String(err);
|
||||||
defaultRuntime.error(`nodes ${label} failed: ${message}`);
|
const { error, warn } = getNodesTheme();
|
||||||
|
defaultRuntime.error(error(`nodes ${label} failed: ${message}`));
|
||||||
const hint = unauthorizedHintForMessage(message);
|
const hint = unauthorizedHintForMessage(message);
|
||||||
if (hint) defaultRuntime.error(hint);
|
if (hint) defaultRuntime.error(warn(hint));
|
||||||
defaultRuntime.exit(1);
|
defaultRuntime.exit(1);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -9,9 +9,10 @@ import {
|
|||||||
writeBase64ToFile,
|
writeBase64ToFile,
|
||||||
} from "../nodes-camera.js";
|
} from "../nodes-camera.js";
|
||||||
import { parseDurationMs } from "../parse-duration.js";
|
import { parseDurationMs } from "../parse-duration.js";
|
||||||
import { runNodesCommand } from "./cli-utils.js";
|
import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
|
||||||
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
||||||
import type { NodesRpcOpts } from "./types.js";
|
import type { NodesRpcOpts } from "./types.js";
|
||||||
|
import { renderTable } from "../../terminal/table.js";
|
||||||
|
|
||||||
const parseFacing = (value: string): CameraFacing => {
|
const parseFacing = (value: string): CameraFacing => {
|
||||||
const v = String(value ?? "")
|
const v = String(value ?? "")
|
||||||
@@ -52,16 +53,30 @@ export function registerNodesCameraCommands(nodes: Command) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (devices.length === 0) {
|
if (devices.length === 0) {
|
||||||
defaultRuntime.log("No cameras reported.");
|
const { muted } = getNodesTheme();
|
||||||
|
defaultRuntime.log(muted("No cameras reported."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const device of devices) {
|
const { heading, muted } = getNodesTheme();
|
||||||
const id = typeof device.id === "string" ? device.id : "";
|
const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
|
||||||
const name = typeof device.name === "string" ? device.name : "Unknown Camera";
|
const rows = devices.map((device) => ({
|
||||||
const position = typeof device.position === "string" ? device.position : "unspecified";
|
Name: typeof device.name === "string" ? device.name : "Unknown Camera",
|
||||||
defaultRuntime.log(`${name} (${position})${id ? ` — ${id}` : ""}`);
|
Position: typeof device.position === "string" ? device.position : muted("unspecified"),
|
||||||
}
|
ID: typeof device.id === "string" ? device.id : "",
|
||||||
|
}));
|
||||||
|
defaultRuntime.log(heading("Cameras"));
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Name", header: "Name", minWidth: 14, flex: true },
|
||||||
|
{ key: "Position", header: "Position", minWidth: 10 },
|
||||||
|
{ key: "ID", header: "ID", minWidth: 10, flex: true },
|
||||||
|
],
|
||||||
|
rows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
{ timeoutMs: 60_000 },
|
{ timeoutMs: 60_000 },
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { writeBase64ToFile } from "../nodes-camera.js";
|
|||||||
import { canvasSnapshotTempPath, parseCanvasSnapshotPayload } from "../nodes-canvas.js";
|
import { canvasSnapshotTempPath, parseCanvasSnapshotPayload } from "../nodes-canvas.js";
|
||||||
import { parseTimeoutMs } from "../nodes-run.js";
|
import { parseTimeoutMs } from "../nodes-run.js";
|
||||||
import { buildA2UITextJsonl, validateA2UIJsonl } from "./a2ui-jsonl.js";
|
import { buildA2UITextJsonl, validateA2UIJsonl } from "./a2ui-jsonl.js";
|
||||||
import { runNodesCommand } from "./cli-utils.js";
|
import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
|
||||||
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
||||||
import type { NodesRpcOpts } from "./types.js";
|
import type { NodesRpcOpts } from "./types.js";
|
||||||
|
|
||||||
@@ -121,7 +121,10 @@ export function registerNodesCanvasCommands(nodes: Command) {
|
|||||||
params.placement = placement;
|
params.placement = placement;
|
||||||
}
|
}
|
||||||
await invokeCanvas(opts, "canvas.present", params);
|
await invokeCanvas(opts, "canvas.present", params);
|
||||||
if (!opts.json) defaultRuntime.log("canvas present ok");
|
if (!opts.json) {
|
||||||
|
const { ok } = getNodesTheme();
|
||||||
|
defaultRuntime.log(ok("canvas present ok"));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -135,7 +138,10 @@ export function registerNodesCanvasCommands(nodes: Command) {
|
|||||||
.action(async (opts: NodesRpcOpts) => {
|
.action(async (opts: NodesRpcOpts) => {
|
||||||
await runNodesCommand("canvas hide", async () => {
|
await runNodesCommand("canvas hide", async () => {
|
||||||
await invokeCanvas(opts, "canvas.hide", undefined);
|
await invokeCanvas(opts, "canvas.hide", undefined);
|
||||||
if (!opts.json) defaultRuntime.log("canvas hide ok");
|
if (!opts.json) {
|
||||||
|
const { ok } = getNodesTheme();
|
||||||
|
defaultRuntime.log(ok("canvas hide ok"));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -150,7 +156,10 @@ export function registerNodesCanvasCommands(nodes: Command) {
|
|||||||
.action(async (url: string, opts: NodesRpcOpts) => {
|
.action(async (url: string, opts: NodesRpcOpts) => {
|
||||||
await runNodesCommand("canvas navigate", async () => {
|
await runNodesCommand("canvas navigate", async () => {
|
||||||
await invokeCanvas(opts, "canvas.navigate", { url });
|
await invokeCanvas(opts, "canvas.navigate", { url });
|
||||||
if (!opts.json) defaultRuntime.log("canvas navigate ok");
|
if (!opts.json) {
|
||||||
|
const { ok } = getNodesTheme();
|
||||||
|
defaultRuntime.log(ok("canvas navigate ok"));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -179,7 +188,10 @@ export function registerNodesCanvasCommands(nodes: Command) {
|
|||||||
? (raw as { payload?: { result?: string } }).payload
|
? (raw as { payload?: { result?: string } }).payload
|
||||||
: undefined;
|
: undefined;
|
||||||
if (payload?.result) defaultRuntime.log(payload.result);
|
if (payload?.result) defaultRuntime.log(payload.result);
|
||||||
else defaultRuntime.log("canvas eval ok");
|
else {
|
||||||
|
const { ok } = getNodesTheme();
|
||||||
|
defaultRuntime.log(ok("canvas eval ok"));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -213,8 +225,11 @@ export function registerNodesCanvasCommands(nodes: Command) {
|
|||||||
}
|
}
|
||||||
await invokeCanvas(opts, "canvas.a2ui.pushJSONL", { jsonl });
|
await invokeCanvas(opts, "canvas.a2ui.pushJSONL", { jsonl });
|
||||||
if (!opts.json) {
|
if (!opts.json) {
|
||||||
|
const { ok } = getNodesTheme();
|
||||||
defaultRuntime.log(
|
defaultRuntime.log(
|
||||||
`canvas a2ui push ok (v0.8, ${messageCount} message${messageCount === 1 ? "" : "s"})`,
|
ok(
|
||||||
|
`canvas a2ui push ok (v0.8, ${messageCount} message${messageCount === 1 ? "" : "s"})`,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -230,7 +245,10 @@ export function registerNodesCanvasCommands(nodes: Command) {
|
|||||||
.action(async (opts: NodesRpcOpts) => {
|
.action(async (opts: NodesRpcOpts) => {
|
||||||
await runNodesCommand("canvas a2ui reset", async () => {
|
await runNodesCommand("canvas a2ui reset", async () => {
|
||||||
await invokeCanvas(opts, "canvas.a2ui.reset", undefined);
|
await invokeCanvas(opts, "canvas.a2ui.reset", undefined);
|
||||||
if (!opts.json) defaultRuntime.log("canvas a2ui reset ok");
|
if (!opts.json) {
|
||||||
|
const { ok } = getNodesTheme();
|
||||||
|
defaultRuntime.log(ok("canvas a2ui reset ok"));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import type { Command } from "commander";
|
|||||||
import { randomIdempotencyKey } from "../../gateway/call.js";
|
import { randomIdempotencyKey } from "../../gateway/call.js";
|
||||||
import { defaultRuntime } from "../../runtime.js";
|
import { defaultRuntime } from "../../runtime.js";
|
||||||
import { parseEnvPairs, parseTimeoutMs } from "../nodes-run.js";
|
import { parseEnvPairs, parseTimeoutMs } from "../nodes-run.js";
|
||||||
import { runNodesCommand } from "./cli-utils.js";
|
import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
|
||||||
import { callGatewayCli, nodesCallOpts, resolveNodeId, unauthorizedHintForMessage } from "./rpc.js";
|
import { callGatewayCli, nodesCallOpts, resolveNodeId, unauthorizedHintForMessage } from "./rpc.js";
|
||||||
import type { NodesRpcOpts } from "./types.js";
|
import type { NodesRpcOpts } from "./types.js";
|
||||||
|
|
||||||
@@ -21,7 +21,8 @@ export function registerNodesInvokeCommands(nodes: Command) {
|
|||||||
const nodeId = await resolveNodeId(opts, String(opts.node ?? ""));
|
const nodeId = await resolveNodeId(opts, String(opts.node ?? ""));
|
||||||
const command = String(opts.command ?? "").trim();
|
const command = String(opts.command ?? "").trim();
|
||||||
if (!nodeId || !command) {
|
if (!nodeId || !command) {
|
||||||
defaultRuntime.error("--node and --command required");
|
const { error } = getNodesTheme();
|
||||||
|
defaultRuntime.error(error("--node and --command required"));
|
||||||
defaultRuntime.exit(1);
|
defaultRuntime.exit(1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -108,16 +109,21 @@ export function registerNodesInvokeCommands(nodes: Command) {
|
|||||||
if (stdout) process.stdout.write(stdout);
|
if (stdout) process.stdout.write(stdout);
|
||||||
if (stderr) process.stderr.write(stderr);
|
if (stderr) process.stderr.write(stderr);
|
||||||
if (timedOut) {
|
if (timedOut) {
|
||||||
defaultRuntime.error("run timed out");
|
const { error } = getNodesTheme();
|
||||||
|
defaultRuntime.error(error("run timed out"));
|
||||||
defaultRuntime.exit(1);
|
defaultRuntime.exit(1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (exitCode !== null && exitCode !== 0) {
|
if (exitCode !== null && exitCode !== 0) {
|
||||||
const hint = unauthorizedHintForMessage(`${stderr}\n${stdout}`);
|
const hint = unauthorizedHintForMessage(`${stderr}\n${stdout}`);
|
||||||
if (hint) defaultRuntime.error(hint);
|
if (hint) {
|
||||||
|
const { warn } = getNodesTheme();
|
||||||
|
defaultRuntime.error(warn(hint));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (exitCode !== null && exitCode !== 0 && !success) {
|
if (exitCode !== null && exitCode !== 0 && !success) {
|
||||||
defaultRuntime.error(`run exit ${exitCode}`);
|
const { error } = getNodesTheme();
|
||||||
|
defaultRuntime.error(error(`run exit ${exitCode}`));
|
||||||
defaultRuntime.exit(1);
|
defaultRuntime.exit(1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { Command } from "commander";
|
import type { Command } from "commander";
|
||||||
import { randomIdempotencyKey } from "../../gateway/call.js";
|
import { randomIdempotencyKey } from "../../gateway/call.js";
|
||||||
import { defaultRuntime } from "../../runtime.js";
|
import { defaultRuntime } from "../../runtime.js";
|
||||||
import { runNodesCommand } from "./cli-utils.js";
|
import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
|
||||||
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
||||||
import type { NodesRpcOpts } from "./types.js";
|
import type { NodesRpcOpts } from "./types.js";
|
||||||
|
|
||||||
@@ -49,7 +49,8 @@ export function registerNodesNotifyCommand(nodes: Command) {
|
|||||||
defaultRuntime.log(JSON.stringify(result, null, 2));
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
defaultRuntime.log("notify ok");
|
const { ok } = getNodesTheme();
|
||||||
|
defaultRuntime.log(ok("notify ok"));
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import type { Command } from "commander";
|
import type { Command } from "commander";
|
||||||
import { defaultRuntime } from "../../runtime.js";
|
import { defaultRuntime } from "../../runtime.js";
|
||||||
import { formatAge, parsePairingList } from "./format.js";
|
import { formatAge, parsePairingList } from "./format.js";
|
||||||
import { runNodesCommand } from "./cli-utils.js";
|
import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
|
||||||
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
||||||
import type { NodesRpcOpts } from "./types.js";
|
import type { NodesRpcOpts } from "./types.js";
|
||||||
|
import { renderTable } from "../../terminal/table.js";
|
||||||
|
|
||||||
export function registerNodesPairingCommands(nodes: Command) {
|
export function registerNodesPairingCommands(nodes: Command) {
|
||||||
nodesCallOpts(
|
nodesCallOpts(
|
||||||
@@ -19,16 +20,37 @@ export function registerNodesPairingCommands(nodes: Command) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (pending.length === 0) {
|
if (pending.length === 0) {
|
||||||
defaultRuntime.log("No pending pairing requests.");
|
const { muted } = getNodesTheme();
|
||||||
|
defaultRuntime.log(muted("No pending pairing requests."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (const r of pending) {
|
const { heading, warn, muted } = getNodesTheme();
|
||||||
const name = r.displayName || r.nodeId;
|
const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
|
||||||
const repair = r.isRepair ? " (repair)" : "";
|
const now = Date.now();
|
||||||
const ip = r.remoteIp ? ` · ${r.remoteIp}` : "";
|
const rows = pending.map((r) => ({
|
||||||
const age = typeof r.ts === "number" ? ` · ${formatAge(Date.now() - r.ts)} ago` : "";
|
Request: r.requestId,
|
||||||
defaultRuntime.log(`- ${r.requestId}: ${name}${repair}${ip}${age}`);
|
Node: r.displayName?.trim() ? r.displayName.trim() : r.nodeId,
|
||||||
}
|
IP: r.remoteIp ?? "",
|
||||||
|
Requested:
|
||||||
|
typeof r.ts === "number"
|
||||||
|
? `${formatAge(Math.max(0, now - r.ts))} ago`
|
||||||
|
: muted("unknown"),
|
||||||
|
Repair: r.isRepair ? warn("yes") : "",
|
||||||
|
}));
|
||||||
|
defaultRuntime.log(heading("Pending"));
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Request", header: "Request", minWidth: 8 },
|
||||||
|
{ key: "Node", header: "Node", minWidth: 14, flex: true },
|
||||||
|
{ key: "IP", header: "IP", minWidth: 10 },
|
||||||
|
{ key: "Requested", header: "Requested", minWidth: 12 },
|
||||||
|
{ key: "Repair", header: "Repair", minWidth: 6 },
|
||||||
|
],
|
||||||
|
rows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -86,7 +108,8 @@ export function registerNodesPairingCommands(nodes: Command) {
|
|||||||
defaultRuntime.log(JSON.stringify(result, null, 2));
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
defaultRuntime.log(`node rename ok: ${nodeId} -> ${name}`);
|
const { ok } = getNodesTheme();
|
||||||
|
defaultRuntime.log(ok(`node rename ok: ${nodeId} -> ${name}`));
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import type { Command } from "commander";
|
import type { Command } from "commander";
|
||||||
import { defaultRuntime } from "../../runtime.js";
|
import { defaultRuntime } from "../../runtime.js";
|
||||||
import { formatAge, formatPermissions, parseNodeList, parsePairingList } from "./format.js";
|
import { formatAge, formatPermissions, parseNodeList, parsePairingList } from "./format.js";
|
||||||
import { runNodesCommand } from "./cli-utils.js";
|
import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
|
||||||
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";
|
||||||
import type { NodesRpcOpts } from "./types.js";
|
import type { NodesRpcOpts } from "./types.js";
|
||||||
|
import { renderTable } from "../../terminal/table.js";
|
||||||
|
|
||||||
function formatVersionLabel(raw: string) {
|
function formatVersionLabel(raw: string) {
|
||||||
const trimmed = raw.trim();
|
const trimmed = raw.trim();
|
||||||
@@ -54,32 +55,61 @@ export function registerNodesStatusCommands(nodes: Command) {
|
|||||||
defaultRuntime.log(JSON.stringify(result, null, 2));
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const { ok, warn, muted } = getNodesTheme();
|
||||||
|
const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
|
||||||
|
const now = Date.now();
|
||||||
const nodes = parseNodeList(result);
|
const nodes = parseNodeList(result);
|
||||||
const pairedCount = nodes.filter((n) => Boolean(n.paired)).length;
|
const pairedCount = nodes.filter((n) => Boolean(n.paired)).length;
|
||||||
const connectedCount = nodes.filter((n) => Boolean(n.connected)).length;
|
const connectedCount = nodes.filter((n) => Boolean(n.connected)).length;
|
||||||
defaultRuntime.log(
|
defaultRuntime.log(
|
||||||
`Known: ${nodes.length} · Paired: ${pairedCount} · Connected: ${connectedCount}`,
|
`Known: ${nodes.length} · Paired: ${pairedCount} · Connected: ${connectedCount}`,
|
||||||
);
|
);
|
||||||
for (const n of nodes) {
|
if (nodes.length === 0) return;
|
||||||
const name = n.displayName || n.nodeId;
|
|
||||||
const ip = n.remoteIp ? ` · ${n.remoteIp}` : "";
|
const rows = nodes.map((n) => {
|
||||||
const device = n.deviceFamily ? ` · device: ${n.deviceFamily}` : "";
|
const name = n.displayName?.trim() ? n.displayName.trim() : n.nodeId;
|
||||||
const hw = n.modelIdentifier ? ` · hw: ${n.modelIdentifier}` : "";
|
|
||||||
const perms = formatPermissions(n.permissions);
|
const perms = formatPermissions(n.permissions);
|
||||||
const permsText = perms ? ` · perms: ${perms}` : "";
|
|
||||||
const versions = formatNodeVersions(n);
|
const versions = formatNodeVersions(n);
|
||||||
const versionText = versions ? ` · ${versions}` : "";
|
const detailParts = [
|
||||||
const caps =
|
n.deviceFamily ? `device: ${n.deviceFamily}` : null,
|
||||||
Array.isArray(n.caps) && n.caps.length > 0
|
n.modelIdentifier ? `hw: ${n.modelIdentifier}` : null,
|
||||||
? `[${n.caps.map(String).filter(Boolean).sort().join(",")}]`
|
perms ? `perms: ${perms}` : null,
|
||||||
: Array.isArray(n.caps)
|
versions,
|
||||||
? "[]"
|
].filter(Boolean) as string[];
|
||||||
: "?";
|
const caps = Array.isArray(n.caps)
|
||||||
const pairing = n.paired ? "paired" : "unpaired";
|
? n.caps.map(String).filter(Boolean).sort().join(", ")
|
||||||
defaultRuntime.log(
|
: "?";
|
||||||
`- ${name} · ${n.nodeId}${ip}${device}${hw}${permsText}${versionText} · ${pairing} · ${n.connected ? "connected" : "disconnected"} · caps: ${caps}`,
|
const paired = n.paired ? ok("paired") : warn("unpaired");
|
||||||
);
|
const connected = n.connected ? ok("connected") : muted("disconnected");
|
||||||
}
|
const since =
|
||||||
|
typeof n.connectedAtMs === "number"
|
||||||
|
? ` (${formatAge(Math.max(0, now - n.connectedAtMs))} ago)`
|
||||||
|
: "";
|
||||||
|
|
||||||
|
return {
|
||||||
|
Node: name,
|
||||||
|
ID: n.nodeId,
|
||||||
|
IP: n.remoteIp ?? "",
|
||||||
|
Detail: detailParts.join(" · "),
|
||||||
|
Status: `${paired} · ${connected}${since}`,
|
||||||
|
Caps: caps,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Node", header: "Node", minWidth: 14, flex: true },
|
||||||
|
{ key: "ID", header: "ID", minWidth: 10 },
|
||||||
|
{ key: "IP", header: "IP", minWidth: 10 },
|
||||||
|
{ key: "Detail", header: "Detail", minWidth: 18, flex: true },
|
||||||
|
{ key: "Status", header: "Status", minWidth: 18 },
|
||||||
|
{ key: "Caps", header: "Caps", minWidth: 12, flex: true },
|
||||||
|
],
|
||||||
|
rows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -106,6 +136,7 @@ export function registerNodesStatusCommands(nodes: Command) {
|
|||||||
: {};
|
: {};
|
||||||
const displayName = typeof obj.displayName === "string" ? obj.displayName : nodeId;
|
const displayName = typeof obj.displayName === "string" ? obj.displayName : nodeId;
|
||||||
const connected = Boolean(obj.connected);
|
const connected = Boolean(obj.connected);
|
||||||
|
const paired = Boolean(obj.paired);
|
||||||
const caps = Array.isArray(obj.caps) ? obj.caps.map(String).filter(Boolean).sort() : null;
|
const caps = Array.isArray(obj.caps) ? obj.caps.map(String).filter(Boolean).sort() : null;
|
||||||
const commands = Array.isArray(obj.commands)
|
const commands = Array.isArray(obj.commands)
|
||||||
? obj.commands.map(String).filter(Boolean).sort()
|
? obj.commands.map(String).filter(Boolean).sort()
|
||||||
@@ -123,18 +154,38 @@ export function registerNodesStatusCommands(nodes: Command) {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
const parts: string[] = ["Node:", displayName, nodeId];
|
const { heading, ok, warn, muted } = getNodesTheme();
|
||||||
if (ip) parts.push(ip);
|
const status = `${paired ? ok("paired") : warn("unpaired")} · ${
|
||||||
if (family) parts.push(`device: ${family}`);
|
connected ? ok("connected") : muted("disconnected")
|
||||||
if (model) parts.push(`hw: ${model}`);
|
}`;
|
||||||
if (perms) parts.push(`perms: ${perms}`);
|
const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
|
||||||
if (versions) parts.push(versions);
|
const rows = [
|
||||||
parts.push(connected ? "connected" : "disconnected");
|
{ Field: "ID", Value: nodeId },
|
||||||
parts.push(`caps: ${caps ? `[${caps.join(",")}]` : "?"}`);
|
displayName ? { Field: "Name", Value: displayName } : null,
|
||||||
defaultRuntime.log(parts.join(" · "));
|
ip ? { Field: "IP", Value: ip } : null,
|
||||||
defaultRuntime.log("Commands:");
|
family ? { Field: "Device", Value: family } : null,
|
||||||
|
model ? { Field: "Model", Value: model } : null,
|
||||||
|
perms ? { Field: "Perms", Value: perms } : null,
|
||||||
|
versions ? { Field: "Version", Value: versions } : null,
|
||||||
|
{ Field: "Status", Value: status },
|
||||||
|
{ Field: "Caps", Value: caps ? caps.join(", ") : "?" },
|
||||||
|
].filter(Boolean) as Array<{ Field: string; Value: string }>;
|
||||||
|
|
||||||
|
defaultRuntime.log(heading("Node"));
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Field", header: "Field", minWidth: 8 },
|
||||||
|
{ key: "Value", header: "Value", minWidth: 24, flex: true },
|
||||||
|
],
|
||||||
|
rows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
|
defaultRuntime.log("");
|
||||||
|
defaultRuntime.log(heading("Commands"));
|
||||||
if (commands.length === 0) {
|
if (commands.length === 0) {
|
||||||
defaultRuntime.log("- (none reported)");
|
defaultRuntime.log(muted("- (none reported)"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (const c of commands) defaultRuntime.log(`- ${c}`);
|
for (const c of commands) defaultRuntime.log(`- ${c}`);
|
||||||
@@ -155,23 +206,62 @@ export function registerNodesStatusCommands(nodes: Command) {
|
|||||||
}
|
}
|
||||||
const { pending, paired } = parsePairingList(result);
|
const { pending, paired } = parsePairingList(result);
|
||||||
defaultRuntime.log(`Pending: ${pending.length} · Paired: ${paired.length}`);
|
defaultRuntime.log(`Pending: ${pending.length} · Paired: ${paired.length}`);
|
||||||
|
const { heading, muted, warn } = getNodesTheme();
|
||||||
|
const tableWidth = Math.max(60, (process.stdout.columns ?? 120) - 1);
|
||||||
|
const now = Date.now();
|
||||||
|
|
||||||
if (pending.length > 0) {
|
if (pending.length > 0) {
|
||||||
defaultRuntime.log("\nPending:");
|
const pendingRows = pending.map((r) => ({
|
||||||
for (const r of pending) {
|
Request: r.requestId,
|
||||||
const name = r.displayName || r.nodeId;
|
Node: r.displayName?.trim() ? r.displayName.trim() : r.nodeId,
|
||||||
const repair = r.isRepair ? " (repair)" : "";
|
IP: r.remoteIp ?? "",
|
||||||
const ip = r.remoteIp ? ` · ${r.remoteIp}` : "";
|
Requested:
|
||||||
const age = typeof r.ts === "number" ? ` · ${formatAge(Date.now() - r.ts)} ago` : "";
|
typeof r.ts === "number"
|
||||||
defaultRuntime.log(`- ${r.requestId}: ${name}${repair}${ip}${age}`);
|
? `${formatAge(Math.max(0, now - r.ts))} ago`
|
||||||
}
|
: muted("unknown"),
|
||||||
|
Repair: r.isRepair ? warn("yes") : "",
|
||||||
|
}));
|
||||||
|
defaultRuntime.log("");
|
||||||
|
defaultRuntime.log(heading("Pending"));
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Request", header: "Request", minWidth: 8 },
|
||||||
|
{ key: "Node", header: "Node", minWidth: 14, flex: true },
|
||||||
|
{ key: "IP", header: "IP", minWidth: 10 },
|
||||||
|
{ key: "Requested", header: "Requested", minWidth: 12 },
|
||||||
|
{ key: "Repair", header: "Repair", minWidth: 6 },
|
||||||
|
],
|
||||||
|
rows: pendingRows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (paired.length > 0) {
|
if (paired.length > 0) {
|
||||||
defaultRuntime.log("\nPaired:");
|
const pairedRows = paired.map((n) => ({
|
||||||
for (const n of paired) {
|
Node: n.displayName?.trim() ? n.displayName.trim() : n.nodeId,
|
||||||
const name = n.displayName || n.nodeId;
|
Id: n.nodeId,
|
||||||
const ip = n.remoteIp ? ` · ${n.remoteIp}` : "";
|
IP: n.remoteIp ?? "",
|
||||||
defaultRuntime.log(`- ${n.nodeId}: ${name}${ip}`);
|
LastConnect:
|
||||||
}
|
typeof n.lastConnectedAtMs === "number"
|
||||||
|
? `${formatAge(Math.max(0, now - n.lastConnectedAtMs))} ago`
|
||||||
|
: muted("unknown"),
|
||||||
|
}));
|
||||||
|
defaultRuntime.log("");
|
||||||
|
defaultRuntime.log(heading("Paired"));
|
||||||
|
defaultRuntime.log(
|
||||||
|
renderTable({
|
||||||
|
width: tableWidth,
|
||||||
|
columns: [
|
||||||
|
{ key: "Node", header: "Node", minWidth: 14, flex: true },
|
||||||
|
{ key: "Id", header: "ID", minWidth: 10 },
|
||||||
|
{ key: "IP", header: "IP", minWidth: 10 },
|
||||||
|
{ key: "LastConnect", header: "Last Connect", minWidth: 14 },
|
||||||
|
],
|
||||||
|
rows: pairedRows,
|
||||||
|
}).trimEnd(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ export type NodeListNode = {
|
|||||||
permissions?: Record<string, boolean>;
|
permissions?: Record<string, boolean>;
|
||||||
paired?: boolean;
|
paired?: boolean;
|
||||||
connected?: boolean;
|
connected?: boolean;
|
||||||
|
connectedAtMs?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PendingRequest = {
|
export type PendingRequest = {
|
||||||
@@ -83,6 +84,7 @@ export type PairedNode = {
|
|||||||
permissions?: Record<string, boolean>;
|
permissions?: Record<string, boolean>;
|
||||||
createdAtMs?: number;
|
createdAtMs?: number;
|
||||||
approvedAtMs?: number;
|
approvedAtMs?: number;
|
||||||
|
lastConnectedAtMs?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PairingList = {
|
export type PairingList = {
|
||||||
|
|||||||
@@ -95,10 +95,14 @@ describe("cli program (nodes basics)", () => {
|
|||||||
const output = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
|
const output = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
|
||||||
expect(output).toContain("Known: 1 · Paired: 1 · Connected: 1");
|
expect(output).toContain("Known: 1 · Paired: 1 · Connected: 1");
|
||||||
expect(output).toContain("iOS Node");
|
expect(output).toContain("iOS Node");
|
||||||
|
expect(output).toContain("Detail");
|
||||||
expect(output).toContain("device: iPad");
|
expect(output).toContain("device: iPad");
|
||||||
expect(output).toContain("hw: iPad16,6");
|
expect(output).toContain("hw: iPad16,6");
|
||||||
|
expect(output).toContain("Status");
|
||||||
expect(output).toContain("paired");
|
expect(output).toContain("paired");
|
||||||
expect(output).toContain("caps: [camera,canvas]");
|
expect(output).toContain("Caps");
|
||||||
|
expect(output).toContain("camera");
|
||||||
|
expect(output).toContain("canvas");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("runs nodes status and shows unpaired nodes", async () => {
|
it("runs nodes status and shows unpaired nodes", async () => {
|
||||||
@@ -123,12 +127,18 @@ describe("cli program (nodes basics)", () => {
|
|||||||
|
|
||||||
const output = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
|
const output = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
|
||||||
expect(output).toContain("Known: 1 · Paired: 0 · Connected: 1");
|
expect(output).toContain("Known: 1 · Paired: 0 · Connected: 1");
|
||||||
expect(output).toContain("Peter's Tab S10 Ultra");
|
expect(output).toContain("Peter's Tab");
|
||||||
|
expect(output).toContain("S10 Ultra");
|
||||||
|
expect(output).toContain("Detail");
|
||||||
expect(output).toContain("device: Android");
|
expect(output).toContain("device: Android");
|
||||||
expect(output).toContain("hw: samsung SM-X926B");
|
expect(output).toContain("hw: samsung");
|
||||||
|
expect(output).toContain("SM-X926B");
|
||||||
|
expect(output).toContain("Status");
|
||||||
expect(output).toContain("unpaired");
|
expect(output).toContain("unpaired");
|
||||||
expect(output).toContain("connected");
|
expect(output).toContain("connected");
|
||||||
expect(output).toContain("caps: [camera,canvas]");
|
expect(output).toContain("Caps");
|
||||||
|
expect(output).toContain("camera");
|
||||||
|
expect(output).toContain("canvas");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("runs nodes describe and calls node.describe", async () => {
|
it("runs nodes describe and calls node.describe", async () => {
|
||||||
@@ -176,7 +186,7 @@ describe("cli program (nodes basics)", () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const out = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
|
const out = runtime.log.mock.calls.map((c) => String(c[0] ?? "")).join("\n");
|
||||||
expect(out).toContain("Commands:");
|
expect(out).toContain("Commands");
|
||||||
expect(out).toContain("canvas.eval");
|
expect(out).toContain("canvas.eval");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,8 @@ export function configureProgramHelp(program: Command, ctx: ProgramContext) {
|
|||||||
([cmd, desc]) => ` ${theme.command(cmd)}\n ${theme.muted(desc)}`,
|
([cmd, desc]) => ` ${theme.command(cmd)}\n ${theme.muted(desc)}`,
|
||||||
).join("\n");
|
).join("\n");
|
||||||
|
|
||||||
program.addHelpText("afterAll", () => {
|
program.addHelpText("afterAll", ({ command }) => {
|
||||||
|
if (command !== program) return "";
|
||||||
const docs = formatDocsLink("/cli", "docs.clawd.bot/cli");
|
const docs = formatDocsLink("/cli", "docs.clawd.bot/cli");
|
||||||
return `\n${theme.heading("Examples:")}\n${fmtExamples}\n\n${theme.muted("Docs:")} ${docs}\n`;
|
return `\n${theme.heading("Examples:")}\n${fmtExamples}\n\n${theme.muted("Docs:")} ${docs}\n`;
|
||||||
});
|
});
|
||||||
|
|||||||
+28
-1
@@ -20,13 +20,40 @@ import {
|
|||||||
} from "./node-cli/daemon.js";
|
} from "./node-cli/daemon.js";
|
||||||
|
|
||||||
export function registerServiceCli(program: Command) {
|
export function registerServiceCli(program: Command) {
|
||||||
|
const formatExample = (cmd: string, desc: string) =>
|
||||||
|
` ${theme.command(cmd)}\n ${theme.muted(desc)}`;
|
||||||
|
|
||||||
|
const formatGroup = (label: string, examples: Array<[string, string]>) =>
|
||||||
|
`${theme.muted(label)}\n${examples.map(([cmd, desc]) => formatExample(cmd, desc)).join("\n")}`;
|
||||||
|
|
||||||
|
const gatewayExamples: Array<[string, string]> = [
|
||||||
|
["clawdbot service gateway status", "Show gateway service status + probe."],
|
||||||
|
[
|
||||||
|
"clawdbot service gateway install --port 18789 --token <token>",
|
||||||
|
"Install the Gateway service on port 18789.",
|
||||||
|
],
|
||||||
|
["clawdbot service gateway restart", "Restart the Gateway service."],
|
||||||
|
];
|
||||||
|
|
||||||
|
const nodeExamples: Array<[string, string]> = [
|
||||||
|
["clawdbot service node status", "Show node host service status."],
|
||||||
|
[
|
||||||
|
"clawdbot service node install --host gateway.local --port 18789 --tls",
|
||||||
|
"Install the node host service with TLS.",
|
||||||
|
],
|
||||||
|
["clawdbot service node restart", "Restart the node host service."],
|
||||||
|
];
|
||||||
|
|
||||||
const service = program
|
const service = program
|
||||||
.command("service")
|
.command("service")
|
||||||
.description("Manage Gateway and node host services (launchd/systemd/schtasks)")
|
.description("Manage Gateway and node host services (launchd/systemd/schtasks)")
|
||||||
.addHelpText(
|
.addHelpText(
|
||||||
"after",
|
"after",
|
||||||
() =>
|
() =>
|
||||||
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/service", "docs.clawd.bot/cli/service")}\n`,
|
`\n${theme.heading("Examples:")}\n${formatGroup("Gateway:", gatewayExamples)}\n\n${formatGroup(
|
||||||
|
"Node:",
|
||||||
|
nodeExamples,
|
||||||
|
)}\n\n${theme.muted("Docs:")} ${formatDocsLink("/cli/service", "docs.clawd.bot/cli/service")}\n`,
|
||||||
);
|
);
|
||||||
|
|
||||||
const gateway = service.command("gateway").description("Manage the Gateway service");
|
const gateway = service.command("gateway").description("Manage the Gateway service");
|
||||||
|
|||||||
@@ -178,6 +178,7 @@ const FIELD_LABELS: Record<string, string> = {
|
|||||||
"tools.web.fetch.maxChars": "Web Fetch Max Chars",
|
"tools.web.fetch.maxChars": "Web Fetch Max Chars",
|
||||||
"tools.web.fetch.timeoutSeconds": "Web Fetch Timeout (sec)",
|
"tools.web.fetch.timeoutSeconds": "Web Fetch Timeout (sec)",
|
||||||
"tools.web.fetch.cacheTtlMinutes": "Web Fetch Cache TTL (min)",
|
"tools.web.fetch.cacheTtlMinutes": "Web Fetch Cache TTL (min)",
|
||||||
|
"tools.web.fetch.maxRedirects": "Web Fetch Max Redirects",
|
||||||
"tools.web.fetch.userAgent": "Web Fetch User-Agent",
|
"tools.web.fetch.userAgent": "Web Fetch User-Agent",
|
||||||
"gateway.controlUi.basePath": "Control UI Base Path",
|
"gateway.controlUi.basePath": "Control UI Base Path",
|
||||||
"gateway.http.endpoints.chatCompletions.enabled": "OpenAI Chat Completions Endpoint",
|
"gateway.http.endpoints.chatCompletions.enabled": "OpenAI Chat Completions Endpoint",
|
||||||
@@ -249,6 +250,8 @@ const FIELD_LABELS: Record<string, string> = {
|
|||||||
"commands.useAccessGroups": "Use Access Groups",
|
"commands.useAccessGroups": "Use Access Groups",
|
||||||
"ui.seamColor": "Accent Color",
|
"ui.seamColor": "Accent Color",
|
||||||
"browser.controlUrl": "Browser Control URL",
|
"browser.controlUrl": "Browser Control URL",
|
||||||
|
"browser.snapshotDefaults": "Browser Snapshot Defaults",
|
||||||
|
"browser.snapshotDefaults.mode": "Browser Snapshot Mode",
|
||||||
"browser.remoteCdpTimeoutMs": "Remote CDP Timeout (ms)",
|
"browser.remoteCdpTimeoutMs": "Remote CDP Timeout (ms)",
|
||||||
"browser.remoteCdpHandshakeTimeoutMs": "Remote CDP Handshake Timeout (ms)",
|
"browser.remoteCdpHandshakeTimeoutMs": "Remote CDP Handshake Timeout (ms)",
|
||||||
"session.dmScope": "DM Session Scope",
|
"session.dmScope": "DM Session Scope",
|
||||||
@@ -378,6 +381,7 @@ const FIELD_HELP: Record<string, string> = {
|
|||||||
"tools.web.fetch.maxChars": "Max characters returned by web_fetch (truncated).",
|
"tools.web.fetch.maxChars": "Max characters returned by web_fetch (truncated).",
|
||||||
"tools.web.fetch.timeoutSeconds": "Timeout in seconds for web_fetch requests.",
|
"tools.web.fetch.timeoutSeconds": "Timeout in seconds for web_fetch requests.",
|
||||||
"tools.web.fetch.cacheTtlMinutes": "Cache TTL in minutes for web_fetch results.",
|
"tools.web.fetch.cacheTtlMinutes": "Cache TTL in minutes for web_fetch results.",
|
||||||
|
"tools.web.fetch.maxRedirects": "Maximum redirects allowed for web_fetch (default: 3).",
|
||||||
"tools.web.fetch.userAgent": "Override User-Agent header for web_fetch requests.",
|
"tools.web.fetch.userAgent": "Override User-Agent header for web_fetch requests.",
|
||||||
"tools.web.fetch.readability":
|
"tools.web.fetch.readability":
|
||||||
"Use Readability to extract main content from HTML (fallbacks to basic HTML cleanup).",
|
"Use Readability to extract main content from HTML (fallbacks to basic HTML cleanup).",
|
||||||
|
|||||||
@@ -8,6 +8,10 @@ export type BrowserProfileConfig = {
|
|||||||
/** Profile color (hex). Auto-assigned at creation. */
|
/** Profile color (hex). Auto-assigned at creation. */
|
||||||
color: string;
|
color: string;
|
||||||
};
|
};
|
||||||
|
export type BrowserSnapshotDefaults = {
|
||||||
|
/** Default snapshot mode (applies when mode is not provided). */
|
||||||
|
mode?: "efficient";
|
||||||
|
};
|
||||||
export type BrowserConfig = {
|
export type BrowserConfig = {
|
||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
/** Base URL of the clawd browser control server. Default: http://127.0.0.1:18791 */
|
/** Base URL of the clawd browser control server. Default: http://127.0.0.1:18791 */
|
||||||
@@ -39,4 +43,6 @@ export type BrowserConfig = {
|
|||||||
defaultProfile?: string;
|
defaultProfile?: string;
|
||||||
/** Named browser profiles with explicit CDP ports or URLs. */
|
/** Named browser profiles with explicit CDP ports or URLs. */
|
||||||
profiles?: Record<string, BrowserProfileConfig>;
|
profiles?: Record<string, BrowserProfileConfig>;
|
||||||
|
/** Default snapshot options (applied by the browser tool/CLI when unset). */
|
||||||
|
snapshotDefaults?: BrowserSnapshotDefaults;
|
||||||
};
|
};
|
||||||
@@ -309,6 +309,8 @@ export type ToolsConfig = {
|
|||||||
timeoutSeconds?: number;
|
timeoutSeconds?: number;
|
||||||
/** Cache TTL in minutes for fetched content. */
|
/** Cache TTL in minutes for fetched content. */
|
||||||
cacheTtlMinutes?: number;
|
cacheTtlMinutes?: number;
|
||||||
|
/** Maximum number of redirects to follow (default: 3). */
|
||||||
|
maxRedirects?: number;
|
||||||
/** Override User-Agent header for fetch requests. */
|
/** Override User-Agent header for fetch requests. */
|
||||||
userAgent?: string;
|
userAgent?: string;
|
||||||
/** Use Readability to extract main content (default: true). */
|
/** Use Readability to extract main content (default: true). */
|
||||||
|
|||||||
@@ -147,6 +147,7 @@ export const ToolsWebFetchSchema = z
|
|||||||
maxChars: z.number().int().positive().optional(),
|
maxChars: z.number().int().positive().optional(),
|
||||||
timeoutSeconds: z.number().int().positive().optional(),
|
timeoutSeconds: z.number().int().positive().optional(),
|
||||||
cacheTtlMinutes: z.number().nonnegative().optional(),
|
cacheTtlMinutes: z.number().nonnegative().optional(),
|
||||||
|
maxRedirects: z.number().int().nonnegative().optional(),
|
||||||
userAgent: z.string().optional(),
|
userAgent: z.string().optional(),
|
||||||
})
|
})
|
||||||
.strict()
|
.strict()
|
||||||
|
|||||||
@@ -6,6 +6,13 @@ import { HookMappingSchema, HooksGmailSchema, InternalHooksSchema } from "./zod-
|
|||||||
import { ChannelsSchema } from "./zod-schema.providers.js";
|
import { ChannelsSchema } from "./zod-schema.providers.js";
|
||||||
import { CommandsSchema, MessagesSchema, SessionSchema } from "./zod-schema.session.js";
|
import { CommandsSchema, MessagesSchema, SessionSchema } from "./zod-schema.session.js";
|
||||||
|
|
||||||
|
const BrowserSnapshotDefaultsSchema = z
|
||||||
|
.object({
|
||||||
|
mode: z.literal("efficient").optional(),
|
||||||
|
})
|
||||||
|
.strict()
|
||||||
|
.optional();
|
||||||
|
|
||||||
export const ClawdbotSchema = z
|
export const ClawdbotSchema = z
|
||||||
.object({
|
.object({
|
||||||
meta: z
|
meta: z
|
||||||
@@ -113,6 +120,7 @@ export const ClawdbotSchema = z
|
|||||||
noSandbox: z.boolean().optional(),
|
noSandbox: z.boolean().optional(),
|
||||||
attachOnly: z.boolean().optional(),
|
attachOnly: z.boolean().optional(),
|
||||||
defaultProfile: z.string().optional(),
|
defaultProfile: z.string().optional(),
|
||||||
|
snapshotDefaults: BrowserSnapshotDefaultsSchema,
|
||||||
profiles: z
|
profiles: z
|
||||||
.record(
|
.record(
|
||||||
z
|
z
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
import type { ErrorObject } from "ajv";
|
||||||
|
|
||||||
|
import { formatValidationErrors } from "./index.js";
|
||||||
|
|
||||||
|
const makeError = (overrides: Partial<ErrorObject>): ErrorObject => ({
|
||||||
|
keyword: "type",
|
||||||
|
instancePath: "",
|
||||||
|
schemaPath: "#/",
|
||||||
|
params: {},
|
||||||
|
message: "validation error",
|
||||||
|
...overrides,
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("formatValidationErrors", () => {
|
||||||
|
it("returns unknown validation error when missing errors", () => {
|
||||||
|
expect(formatValidationErrors(undefined)).toBe("unknown validation error");
|
||||||
|
expect(formatValidationErrors(null)).toBe("unknown validation error");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns unknown validation error when errors list is empty", () => {
|
||||||
|
expect(formatValidationErrors([])).toBe("unknown validation error");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("formats additionalProperties at root", () => {
|
||||||
|
const err = makeError({
|
||||||
|
keyword: "additionalProperties",
|
||||||
|
params: { additionalProperty: "token" },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(formatValidationErrors([err])).toBe("at root: unexpected property 'token'");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("formats additionalProperties with instancePath", () => {
|
||||||
|
const err = makeError({
|
||||||
|
keyword: "additionalProperties",
|
||||||
|
instancePath: "/auth",
|
||||||
|
params: { additionalProperty: "token" },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(formatValidationErrors([err])).toBe("at /auth: unexpected property 'token'");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("formats message with path for other errors", () => {
|
||||||
|
const err = makeError({
|
||||||
|
keyword: "required",
|
||||||
|
instancePath: "/auth",
|
||||||
|
message: "must have required property 'token'",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(formatValidationErrors([err])).toBe("at /auth: must have required property 'token'");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("de-dupes repeated entries", () => {
|
||||||
|
const err = makeError({
|
||||||
|
keyword: "required",
|
||||||
|
instancePath: "/auth",
|
||||||
|
message: "must have required property 'token'",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(formatValidationErrors([err, err])).toBe(
|
||||||
|
"at /auth: must have required property 'token'",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -310,8 +310,37 @@ export const validateWebLoginStartParams =
|
|||||||
export const validateWebLoginWaitParams = ajv.compile<WebLoginWaitParams>(WebLoginWaitParamsSchema);
|
export const validateWebLoginWaitParams = ajv.compile<WebLoginWaitParams>(WebLoginWaitParamsSchema);
|
||||||
|
|
||||||
export function formatValidationErrors(errors: ErrorObject[] | null | undefined) {
|
export function formatValidationErrors(errors: ErrorObject[] | null | undefined) {
|
||||||
if (!errors) return "unknown validation error";
|
if (!errors?.length) return "unknown validation error";
|
||||||
return ajv.errorsText(errors, { separator: "; " });
|
|
||||||
|
const parts: string[] = [];
|
||||||
|
|
||||||
|
for (const err of errors) {
|
||||||
|
const keyword = typeof err?.keyword === "string" ? err.keyword : "";
|
||||||
|
const instancePath = typeof err?.instancePath === "string" ? err.instancePath : "";
|
||||||
|
|
||||||
|
if (keyword === "additionalProperties") {
|
||||||
|
const params = err?.params as { additionalProperty?: unknown } | undefined;
|
||||||
|
const additionalProperty = params?.additionalProperty;
|
||||||
|
if (typeof additionalProperty === "string" && additionalProperty.trim()) {
|
||||||
|
const where = instancePath ? `at ${instancePath}` : "at root";
|
||||||
|
parts.push(`${where}: unexpected property '${additionalProperty}'`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const message =
|
||||||
|
typeof err?.message === "string" && err.message.trim() ? err.message : "validation error";
|
||||||
|
const where = instancePath ? `at ${instancePath}: ` : "";
|
||||||
|
parts.push(`${where}${message}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// De-dupe while preserving order.
|
||||||
|
const unique = Array.from(new Set(parts.filter((part) => part.trim())));
|
||||||
|
if (!unique.length) {
|
||||||
|
const fallback = ajv.errorsText(errors, { separator: "; " });
|
||||||
|
return fallback || "unknown validation error";
|
||||||
|
}
|
||||||
|
return unique.join("; ");
|
||||||
}
|
}
|
||||||
|
|
||||||
export {
|
export {
|
||||||
|
|||||||
@@ -258,6 +258,7 @@ export const nodeHandlers: GatewayRequestHandlers = {
|
|||||||
caps,
|
caps,
|
||||||
commands,
|
commands,
|
||||||
permissions: live?.permissions ?? paired?.permissions,
|
permissions: live?.permissions ?? paired?.permissions,
|
||||||
|
connectedAtMs: live?.connectedAtMs,
|
||||||
paired: Boolean(paired),
|
paired: Boolean(paired),
|
||||||
connected: Boolean(live),
|
connected: Boolean(live),
|
||||||
};
|
};
|
||||||
@@ -320,6 +321,7 @@ export const nodeHandlers: GatewayRequestHandlers = {
|
|||||||
caps,
|
caps,
|
||||||
commands,
|
commands,
|
||||||
permissions: live?.permissions,
|
permissions: live?.permissions,
|
||||||
|
connectedAtMs: live?.connectedAtMs,
|
||||||
paired: Boolean(paired),
|
paired: Boolean(paired),
|
||||||
connected: Boolean(live),
|
connected: Boolean(live),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import {
|
|||||||
updatePairedDeviceMetadata,
|
updatePairedDeviceMetadata,
|
||||||
verifyDeviceToken,
|
verifyDeviceToken,
|
||||||
} from "../../../infra/device-pairing.js";
|
} from "../../../infra/device-pairing.js";
|
||||||
|
import { updatePairedNodeMetadata } from "../../../infra/node-pairing.js";
|
||||||
import { recordRemoteNodeInfo, refreshRemoteNodeBins } from "../../../infra/skills-remote.js";
|
import { recordRemoteNodeInfo, refreshRemoteNodeBins } from "../../../infra/skills-remote.js";
|
||||||
import { loadVoiceWakeConfig } from "../../../infra/voicewake.js";
|
import { loadVoiceWakeConfig } from "../../../infra/voicewake.js";
|
||||||
import { upsertPresence } from "../../../infra/system-presence.js";
|
import { upsertPresence } from "../../../infra/system-presence.js";
|
||||||
@@ -292,7 +293,9 @@ export function attachGatewayWsMessageHandler(params: {
|
|||||||
|
|
||||||
const device = connectParams.device;
|
const device = connectParams.device;
|
||||||
let devicePublicKey: string | null = null;
|
let devicePublicKey: string | null = null;
|
||||||
if (!device) {
|
// Allow token-authenticated connections (e.g., control-ui) to skip device identity
|
||||||
|
const hasTokenAuth = !!connectParams.auth?.token;
|
||||||
|
if (!device && !hasTokenAuth) {
|
||||||
setHandshakeState("failed");
|
setHandshakeState("failed");
|
||||||
setCloseCause("device-required", {
|
setCloseCause("device-required", {
|
||||||
client: connectParams.client.id,
|
client: connectParams.client.id,
|
||||||
@@ -465,7 +468,7 @@ export function attachGatewayWsMessageHandler(params: {
|
|||||||
});
|
});
|
||||||
let authOk = authResult.ok;
|
let authOk = authResult.ok;
|
||||||
let authMethod = authResult.method ?? "none";
|
let authMethod = authResult.method ?? "none";
|
||||||
if (!authOk && connectParams.auth?.token) {
|
if (!authOk && connectParams.auth?.token && device) {
|
||||||
const tokenCheck = await verifyDeviceToken({
|
const tokenCheck = await verifyDeviceToken({
|
||||||
deviceId: device.id,
|
deviceId: device.id,
|
||||||
token: connectParams.auth.token,
|
token: connectParams.auth.token,
|
||||||
@@ -716,6 +719,13 @@ export function attachGatewayWsMessageHandler(params: {
|
|||||||
if (role === "node") {
|
if (role === "node") {
|
||||||
const context = buildRequestContext();
|
const context = buildRequestContext();
|
||||||
const nodeSession = context.nodeRegistry.register(nextClient, { remoteIp: remoteAddr });
|
const nodeSession = context.nodeRegistry.register(nextClient, { remoteIp: remoteAddr });
|
||||||
|
void updatePairedNodeMetadata(nodeSession.nodeId, {
|
||||||
|
lastConnectedAtMs: nodeSession.connectedAtMs,
|
||||||
|
}).catch((err) =>
|
||||||
|
logGateway.warn(
|
||||||
|
`failed to record last connect for ${nodeSession.nodeId}: ${formatForLog(err)}`,
|
||||||
|
),
|
||||||
|
);
|
||||||
recordRemoteNodeInfo({
|
recordRemoteNodeInfo({
|
||||||
nodeId: nodeSession.nodeId,
|
nodeId: nodeSession.nodeId,
|
||||||
displayName: nodeSession.displayName,
|
displayName: nodeSession.displayName,
|
||||||
|
|||||||
+35
-12
@@ -188,31 +188,54 @@ export function ensureExecApprovals(): ExecApprovalsFile {
|
|||||||
return updated;
|
return updated;
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeSecurity(value?: ExecSecurity): ExecSecurity {
|
function normalizeSecurity(value: ExecSecurity | undefined, fallback: ExecSecurity): ExecSecurity {
|
||||||
if (value === "allowlist" || value === "full" || value === "deny") return value;
|
if (value === "allowlist" || value === "full" || value === "deny") return value;
|
||||||
return DEFAULT_SECURITY;
|
return fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeAsk(value?: ExecAsk): ExecAsk {
|
function normalizeAsk(value: ExecAsk | undefined, fallback: ExecAsk): ExecAsk {
|
||||||
if (value === "always" || value === "off" || value === "on-miss") return value;
|
if (value === "always" || value === "off" || value === "on-miss") return value;
|
||||||
return DEFAULT_ASK;
|
return fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function resolveExecApprovals(agentId?: string): ExecApprovalsResolved {
|
export type ExecApprovalsDefaultOverrides = {
|
||||||
|
security?: ExecSecurity;
|
||||||
|
ask?: ExecAsk;
|
||||||
|
askFallback?: ExecSecurity;
|
||||||
|
autoAllowSkills?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function resolveExecApprovals(
|
||||||
|
agentId?: string,
|
||||||
|
overrides?: ExecApprovalsDefaultOverrides,
|
||||||
|
): ExecApprovalsResolved {
|
||||||
const file = ensureExecApprovals();
|
const file = ensureExecApprovals();
|
||||||
const defaults = file.defaults ?? {};
|
const defaults = file.defaults ?? {};
|
||||||
const agentKey = agentId ?? "default";
|
const agentKey = agentId ?? "default";
|
||||||
const agent = file.agents?.[agentKey] ?? {};
|
const agent = file.agents?.[agentKey] ?? {};
|
||||||
|
const fallbackSecurity = overrides?.security ?? DEFAULT_SECURITY;
|
||||||
|
const fallbackAsk = overrides?.ask ?? DEFAULT_ASK;
|
||||||
|
const fallbackAskFallback = overrides?.askFallback ?? DEFAULT_ASK_FALLBACK;
|
||||||
|
const fallbackAutoAllowSkills = overrides?.autoAllowSkills ?? DEFAULT_AUTO_ALLOW_SKILLS;
|
||||||
const resolvedDefaults: Required<ExecApprovalsDefaults> = {
|
const resolvedDefaults: Required<ExecApprovalsDefaults> = {
|
||||||
security: normalizeSecurity(defaults.security),
|
security: normalizeSecurity(defaults.security, fallbackSecurity),
|
||||||
ask: normalizeAsk(defaults.ask),
|
ask: normalizeAsk(defaults.ask, fallbackAsk),
|
||||||
askFallback: normalizeSecurity(defaults.askFallback ?? DEFAULT_ASK_FALLBACK),
|
askFallback: normalizeSecurity(
|
||||||
autoAllowSkills: Boolean(defaults.autoAllowSkills ?? DEFAULT_AUTO_ALLOW_SKILLS),
|
defaults.askFallback ?? fallbackAskFallback,
|
||||||
|
fallbackAskFallback,
|
||||||
|
),
|
||||||
|
autoAllowSkills: Boolean(defaults.autoAllowSkills ?? fallbackAutoAllowSkills),
|
||||||
};
|
};
|
||||||
const resolvedAgent: Required<ExecApprovalsDefaults> = {
|
const resolvedAgent: Required<ExecApprovalsDefaults> = {
|
||||||
security: normalizeSecurity(agent.security ?? resolvedDefaults.security),
|
security: normalizeSecurity(
|
||||||
ask: normalizeAsk(agent.ask ?? resolvedDefaults.ask),
|
agent.security ?? resolvedDefaults.security,
|
||||||
askFallback: normalizeSecurity(agent.askFallback ?? resolvedDefaults.askFallback),
|
resolvedDefaults.security,
|
||||||
|
),
|
||||||
|
ask: normalizeAsk(agent.ask ?? resolvedDefaults.ask, resolvedDefaults.ask),
|
||||||
|
askFallback: normalizeSecurity(
|
||||||
|
agent.askFallback ?? resolvedDefaults.askFallback,
|
||||||
|
resolvedDefaults.askFallback,
|
||||||
|
),
|
||||||
autoAllowSkills: Boolean(agent.autoAllowSkills ?? resolvedDefaults.autoAllowSkills),
|
autoAllowSkills: Boolean(agent.autoAllowSkills ?? resolvedDefaults.autoAllowSkills),
|
||||||
};
|
};
|
||||||
const allowlist = Array.isArray(agent.allowlist) ? agent.allowlist : [];
|
const allowlist = Array.isArray(agent.allowlist) ? agent.allowlist : [];
|
||||||
|
|||||||
@@ -0,0 +1,131 @@
|
|||||||
|
import { lookup as dnsLookup } from "node:dns/promises";
|
||||||
|
|
||||||
|
export class SsrFBlockedError extends Error {
|
||||||
|
constructor(message: string) {
|
||||||
|
super(message);
|
||||||
|
this.name = "SsrFBlockedError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type LookupFn = typeof dnsLookup;
|
||||||
|
|
||||||
|
const PRIVATE_IPV6_PREFIXES = ["fe80:", "fec0:", "fc", "fd"];
|
||||||
|
const BLOCKED_HOSTNAMES = new Set(["localhost", "metadata.google.internal"]);
|
||||||
|
|
||||||
|
function normalizeHostname(hostname: string): string {
|
||||||
|
const normalized = hostname.trim().toLowerCase().replace(/\.$/, "");
|
||||||
|
if (normalized.startsWith("[") && normalized.endsWith("]")) {
|
||||||
|
return normalized.slice(1, -1);
|
||||||
|
}
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseIpv4(address: string): number[] | null {
|
||||||
|
const parts = address.split(".");
|
||||||
|
if (parts.length !== 4) return null;
|
||||||
|
const numbers = parts.map((part) => Number.parseInt(part, 10));
|
||||||
|
if (numbers.some((value) => Number.isNaN(value) || value < 0 || value > 255)) return null;
|
||||||
|
return numbers;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseIpv4FromMappedIpv6(mapped: string): number[] | null {
|
||||||
|
if (mapped.includes(".")) {
|
||||||
|
return parseIpv4(mapped);
|
||||||
|
}
|
||||||
|
const parts = mapped.split(":").filter(Boolean);
|
||||||
|
if (parts.length === 1) {
|
||||||
|
const value = Number.parseInt(parts[0], 16);
|
||||||
|
if (Number.isNaN(value) || value < 0 || value > 0xffff_ffff) return null;
|
||||||
|
return [(value >>> 24) & 0xff, (value >>> 16) & 0xff, (value >>> 8) & 0xff, value & 0xff];
|
||||||
|
}
|
||||||
|
if (parts.length !== 2) return null;
|
||||||
|
const high = Number.parseInt(parts[0], 16);
|
||||||
|
const low = Number.parseInt(parts[1], 16);
|
||||||
|
if (
|
||||||
|
Number.isNaN(high) ||
|
||||||
|
Number.isNaN(low) ||
|
||||||
|
high < 0 ||
|
||||||
|
low < 0 ||
|
||||||
|
high > 0xffff ||
|
||||||
|
low > 0xffff
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const value = (high << 16) + low;
|
||||||
|
return [(value >>> 24) & 0xff, (value >>> 16) & 0xff, (value >>> 8) & 0xff, value & 0xff];
|
||||||
|
}
|
||||||
|
|
||||||
|
function isPrivateIpv4(parts: number[]): boolean {
|
||||||
|
const [octet1, octet2] = parts;
|
||||||
|
if (octet1 === 0) return true;
|
||||||
|
if (octet1 === 10) return true;
|
||||||
|
if (octet1 === 127) return true;
|
||||||
|
if (octet1 === 169 && octet2 === 254) return true;
|
||||||
|
if (octet1 === 172 && octet2 >= 16 && octet2 <= 31) return true;
|
||||||
|
if (octet1 === 192 && octet2 === 168) return true;
|
||||||
|
if (octet1 === 100 && octet2 >= 64 && octet2 <= 127) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isPrivateIpAddress(address: string): boolean {
|
||||||
|
let normalized = address.trim().toLowerCase();
|
||||||
|
if (normalized.startsWith("[") && normalized.endsWith("]")) {
|
||||||
|
normalized = normalized.slice(1, -1);
|
||||||
|
}
|
||||||
|
if (!normalized) return false;
|
||||||
|
|
||||||
|
if (normalized.startsWith("::ffff:")) {
|
||||||
|
const mapped = normalized.slice("::ffff:".length);
|
||||||
|
const ipv4 = parseIpv4FromMappedIpv6(mapped);
|
||||||
|
if (ipv4) return isPrivateIpv4(ipv4);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (normalized.includes(":")) {
|
||||||
|
if (normalized === "::" || normalized === "::1") return true;
|
||||||
|
return PRIVATE_IPV6_PREFIXES.some((prefix) => normalized.startsWith(prefix));
|
||||||
|
}
|
||||||
|
|
||||||
|
const ipv4 = parseIpv4(normalized);
|
||||||
|
if (!ipv4) return false;
|
||||||
|
return isPrivateIpv4(ipv4);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isBlockedHostname(hostname: string): boolean {
|
||||||
|
const normalized = normalizeHostname(hostname);
|
||||||
|
if (!normalized) return false;
|
||||||
|
if (BLOCKED_HOSTNAMES.has(normalized)) return true;
|
||||||
|
return (
|
||||||
|
normalized.endsWith(".localhost") ||
|
||||||
|
normalized.endsWith(".local") ||
|
||||||
|
normalized.endsWith(".internal")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function assertPublicHostname(
|
||||||
|
hostname: string,
|
||||||
|
lookupFn: LookupFn = dnsLookup,
|
||||||
|
): Promise<void> {
|
||||||
|
const normalized = normalizeHostname(hostname);
|
||||||
|
if (!normalized) {
|
||||||
|
throw new Error("Invalid hostname");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isBlockedHostname(normalized)) {
|
||||||
|
throw new SsrFBlockedError(`Blocked hostname: ${hostname}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isPrivateIpAddress(normalized)) {
|
||||||
|
throw new SsrFBlockedError("Blocked: private/internal IP address");
|
||||||
|
}
|
||||||
|
|
||||||
|
const results = await lookupFn(normalized, { all: true });
|
||||||
|
if (results.length === 0) {
|
||||||
|
throw new Error(`Unable to resolve hostname: ${hostname}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const entry of results) {
|
||||||
|
if (isPrivateIpAddress(entry.address)) {
|
||||||
|
throw new SsrFBlockedError("Blocked: resolves to private/internal IP address");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -39,6 +39,7 @@ export type NodePairingPairedNode = {
|
|||||||
remoteIp?: string;
|
remoteIp?: string;
|
||||||
createdAtMs: number;
|
createdAtMs: number;
|
||||||
approvedAtMs: number;
|
approvedAtMs: number;
|
||||||
|
lastConnectedAtMs?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type NodePairingList = {
|
export type NodePairingList = {
|
||||||
@@ -295,6 +296,7 @@ export async function updatePairedNodeMetadata(
|
|||||||
commands: patch.commands ?? existing.commands,
|
commands: patch.commands ?? existing.commands,
|
||||||
bins: patch.bins ?? existing.bins,
|
bins: patch.bins ?? existing.bins,
|
||||||
permissions: patch.permissions ?? existing.permissions,
|
permissions: patch.permissions ?? existing.permissions,
|
||||||
|
lastConnectedAtMs: patch.lastConnectedAtMs ?? existing.lastConnectedAtMs,
|
||||||
};
|
};
|
||||||
|
|
||||||
state.pairedByNodeId[normalized] = next;
|
state.pairedByNodeId[normalized] = next;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { lookup } from "node:dns/promises";
|
|
||||||
import { logWarn } from "../logger.js";
|
import { logWarn } from "../logger.js";
|
||||||
|
import { assertPublicHostname } from "../infra/net/ssrf.js";
|
||||||
|
|
||||||
type CanvasModule = typeof import("@napi-rs/canvas");
|
type CanvasModule = typeof import("@napi-rs/canvas");
|
||||||
type PdfJsModule = typeof import("pdfjs-dist/legacy/build/pdf.mjs");
|
type PdfJsModule = typeof import("pdfjs-dist/legacy/build/pdf.mjs");
|
||||||
@@ -107,50 +107,6 @@ export const DEFAULT_INPUT_PDF_MAX_PAGES = 4;
|
|||||||
export const DEFAULT_INPUT_PDF_MAX_PIXELS = 4_000_000;
|
export const DEFAULT_INPUT_PDF_MAX_PIXELS = 4_000_000;
|
||||||
export const DEFAULT_INPUT_PDF_MIN_TEXT_CHARS = 200;
|
export const DEFAULT_INPUT_PDF_MIN_TEXT_CHARS = 200;
|
||||||
|
|
||||||
const PRIVATE_IPV4_PATTERNS = [
|
|
||||||
/^127\./,
|
|
||||||
/^10\./,
|
|
||||||
/^192\.168\./,
|
|
||||||
/^172\.(1[6-9]|2[0-9]|3[0-1])\./,
|
|
||||||
/^0\./,
|
|
||||||
];
|
|
||||||
const PRIVATE_IPV6_PREFIXES = ["::1", "fe80:", "fec0:", "fc", "fd"];
|
|
||||||
|
|
||||||
function isPrivateIpAddress(address: string): boolean {
|
|
||||||
if (address.includes(":")) {
|
|
||||||
const lower = address.toLowerCase();
|
|
||||||
if (lower === "::1") return true;
|
|
||||||
return PRIVATE_IPV6_PREFIXES.some((prefix) => lower.startsWith(prefix));
|
|
||||||
}
|
|
||||||
return PRIVATE_IPV4_PATTERNS.some((pattern) => pattern.test(address));
|
|
||||||
}
|
|
||||||
|
|
||||||
function isBlockedHostname(hostname: string): boolean {
|
|
||||||
const lower = hostname.toLowerCase();
|
|
||||||
return (
|
|
||||||
lower === "localhost" ||
|
|
||||||
lower.endsWith(".localhost") ||
|
|
||||||
lower.endsWith(".local") ||
|
|
||||||
lower.endsWith(".internal")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function assertPublicHostname(hostname: string): Promise<void> {
|
|
||||||
if (isBlockedHostname(hostname)) {
|
|
||||||
throw new Error(`Blocked hostname: ${hostname}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const results = await lookup(hostname, { all: true });
|
|
||||||
if (results.length === 0) {
|
|
||||||
throw new Error(`Unable to resolve hostname: ${hostname}`);
|
|
||||||
}
|
|
||||||
for (const entry of results) {
|
|
||||||
if (isPrivateIpAddress(entry.address)) {
|
|
||||||
throw new Error(`Private IP addresses are not allowed: ${entry.address}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isRedirectStatus(status: number): boolean {
|
function isRedirectStatus(status: number): boolean {
|
||||||
return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
|
return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -545,7 +545,7 @@ async function handleInvoke(
|
|||||||
const rawCommand = typeof params.rawCommand === "string" ? params.rawCommand.trim() : "";
|
const rawCommand = typeof params.rawCommand === "string" ? params.rawCommand.trim() : "";
|
||||||
const cmdText = rawCommand || formatCommand(argv);
|
const cmdText = rawCommand || formatCommand(argv);
|
||||||
const agentId = params.agentId?.trim() || undefined;
|
const agentId = params.agentId?.trim() || undefined;
|
||||||
const approvals = resolveExecApprovals(agentId);
|
const approvals = resolveExecApprovals(agentId, { security: "allowlist" });
|
||||||
const security = approvals.agent.security;
|
const security = approvals.agent.security;
|
||||||
const ask = approvals.agent.ask;
|
const ask = approvals.agent.ask;
|
||||||
const autoAllowSkills = approvals.agent.autoAllowSkills;
|
const autoAllowSkills = approvals.agent.autoAllowSkills;
|
||||||
|
|||||||
@@ -179,6 +179,8 @@ export const registerTelegramHandlers = ({
|
|||||||
const callback = ctx.callbackQuery;
|
const callback = ctx.callbackQuery;
|
||||||
if (!callback) return;
|
if (!callback) return;
|
||||||
if (shouldSkipUpdate(ctx)) return;
|
if (shouldSkipUpdate(ctx)) return;
|
||||||
|
// Answer immediately to prevent Telegram from retrying while we process
|
||||||
|
await bot.api.answerCallbackQuery(callback.id).catch(() => {});
|
||||||
try {
|
try {
|
||||||
const data = (callback.data ?? "").trim();
|
const data = (callback.data ?? "").trim();
|
||||||
const callbackMessage = callback.message;
|
const callbackMessage = callback.message;
|
||||||
@@ -323,8 +325,6 @@ export const registerTelegramHandlers = ({
|
|||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
runtime.error?.(danger(`callback handler failed: ${String(err)}`));
|
runtime.error?.(danger(`callback handler failed: ${String(err)}`));
|
||||||
} finally {
|
|
||||||
await bot.api.answerCallbackQuery(callback.id).catch(() => {});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
import { createSafeStreamWriter } from "./stream-writer.js";
|
||||||
|
|
||||||
|
describe("createSafeStreamWriter", () => {
|
||||||
|
it("signals broken pipes and closes the writer", () => {
|
||||||
|
const onBrokenPipe = vi.fn();
|
||||||
|
const writer = createSafeStreamWriter({ onBrokenPipe });
|
||||||
|
const stream = {
|
||||||
|
write: vi.fn(() => {
|
||||||
|
const err = new Error("EPIPE") as NodeJS.ErrnoException;
|
||||||
|
err.code = "EPIPE";
|
||||||
|
throw err;
|
||||||
|
}),
|
||||||
|
} as unknown as NodeJS.WriteStream;
|
||||||
|
|
||||||
|
expect(writer.writeLine(stream, "hello")).toBe(false);
|
||||||
|
expect(writer.isClosed()).toBe(true);
|
||||||
|
expect(onBrokenPipe).toHaveBeenCalledTimes(1);
|
||||||
|
|
||||||
|
onBrokenPipe.mockClear();
|
||||||
|
expect(writer.writeLine(stream, "again")).toBe(false);
|
||||||
|
expect(onBrokenPipe).toHaveBeenCalledTimes(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("treats broken pipes from beforeWrite as closed", () => {
|
||||||
|
const onBrokenPipe = vi.fn();
|
||||||
|
const writer = createSafeStreamWriter({
|
||||||
|
onBrokenPipe,
|
||||||
|
beforeWrite: () => {
|
||||||
|
const err = new Error("EIO") as NodeJS.ErrnoException;
|
||||||
|
err.code = "EIO";
|
||||||
|
throw err;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const stream = { write: vi.fn(() => true) } as unknown as NodeJS.WriteStream;
|
||||||
|
|
||||||
|
expect(writer.write(stream, "hi")).toBe(false);
|
||||||
|
expect(writer.isClosed()).toBe(true);
|
||||||
|
expect(onBrokenPipe).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
export type SafeStreamWriterOptions = {
|
||||||
|
beforeWrite?: () => void;
|
||||||
|
onBrokenPipe?: (err: NodeJS.ErrnoException, stream: NodeJS.WriteStream) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type SafeStreamWriter = {
|
||||||
|
write: (stream: NodeJS.WriteStream, text: string) => boolean;
|
||||||
|
writeLine: (stream: NodeJS.WriteStream, text: string) => boolean;
|
||||||
|
reset: () => void;
|
||||||
|
isClosed: () => boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
function isBrokenPipeError(err: unknown): err is NodeJS.ErrnoException {
|
||||||
|
const code = (err as NodeJS.ErrnoException)?.code;
|
||||||
|
return code === "EPIPE" || code === "EIO";
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createSafeStreamWriter(options: SafeStreamWriterOptions = {}): SafeStreamWriter {
|
||||||
|
let closed = false;
|
||||||
|
let notified = false;
|
||||||
|
|
||||||
|
const noteBrokenPipe = (err: NodeJS.ErrnoException, stream: NodeJS.WriteStream) => {
|
||||||
|
if (notified) return;
|
||||||
|
notified = true;
|
||||||
|
options.onBrokenPipe?.(err, stream);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleError = (err: unknown, stream: NodeJS.WriteStream): boolean => {
|
||||||
|
if (!isBrokenPipeError(err)) {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
closed = true;
|
||||||
|
noteBrokenPipe(err, stream);
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
|
const write = (stream: NodeJS.WriteStream, text: string): boolean => {
|
||||||
|
if (closed) return false;
|
||||||
|
try {
|
||||||
|
options.beforeWrite?.();
|
||||||
|
} catch (err) {
|
||||||
|
return handleError(err, process.stderr);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
stream.write(text);
|
||||||
|
return !closed;
|
||||||
|
} catch (err) {
|
||||||
|
return handleError(err, stream);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const writeLine = (stream: NodeJS.WriteStream, text: string): boolean =>
|
||||||
|
write(stream, `${text}\n`);
|
||||||
|
|
||||||
|
return {
|
||||||
|
write,
|
||||||
|
writeLine,
|
||||||
|
reset: () => {
|
||||||
|
closed = false;
|
||||||
|
notified = false;
|
||||||
|
},
|
||||||
|
isClosed: () => closed,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
@import "./chat/layout.css";
|
@import "./chat/layout.css";
|
||||||
@import "./chat/legacy.css";
|
|
||||||
@import "./chat/text.css";
|
@import "./chat/text.css";
|
||||||
@import "./chat/grouped.css";
|
@import "./chat/grouped.css";
|
||||||
@import "./chat/tool-cards.css";
|
@import "./chat/tool-cards.css";
|
||||||
|
|||||||
@@ -91,6 +91,7 @@
|
|||||||
|
|
||||||
/* Minimal Bubble Design - dynamic width based on content */
|
/* Minimal Bubble Design - dynamic width based on content */
|
||||||
.chat-bubble {
|
.chat-bubble {
|
||||||
|
position: relative;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
background: rgba(0, 0, 0, 0.12);
|
background: rgba(0, 0, 0, 0.12);
|
||||||
@@ -102,6 +103,77 @@
|
|||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.chat-bubble.has-copy {
|
||||||
|
padding-right: 36px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-copy-btn {
|
||||||
|
position: absolute;
|
||||||
|
top: 6px;
|
||||||
|
right: 8px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(0, 0, 0, 0.22);
|
||||||
|
color: var(--muted);
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 4px 6px;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1;
|
||||||
|
cursor: pointer;
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transition: opacity 120ms ease-out, background 120ms ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-copy-btn__icon {
|
||||||
|
display: inline-block;
|
||||||
|
width: 1em;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-bubble:hover .chat-copy-btn {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-copy-btn:hover {
|
||||||
|
background: rgba(0, 0, 0, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-copy-btn[data-copying="1"] {
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-copy-btn[data-error="1"] {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
border-color: rgba(255, 69, 58, 0.8);
|
||||||
|
background: rgba(255, 69, 58, 0.18);
|
||||||
|
color: rgba(255, 69, 58, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-copy-btn[data-copied="1"] {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
border-color: rgba(52, 199, 183, 0.8);
|
||||||
|
background: rgba(52, 199, 183, 0.18);
|
||||||
|
color: rgba(52, 199, 183, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-copy-btn:focus-visible {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
outline: 2px solid var(--accent);
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (hover: none) {
|
||||||
|
.chat-copy-btn {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.chat-bubble:hover {
|
.chat-bubble:hover {
|
||||||
background: rgba(0, 0, 0, 0.18);
|
background: rgba(0, 0, 0, 0.18);
|
||||||
}
|
}
|
||||||
@@ -145,4 +217,3 @@
|
|||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/* =============================================
|
|
||||||
LEGACY CHAT LINE LAYOUT (non-grouped)
|
|
||||||
============================================= */
|
|
||||||
|
|
||||||
.chat-line {
|
|
||||||
display: flex;
|
|
||||||
margin-bottom: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.chat-line.user {
|
|
||||||
justify-content: flex-end;
|
|
||||||
}
|
|
||||||
|
|
||||||
.chat-line.assistant,
|
|
||||||
.chat-line.other,
|
|
||||||
.chat-line.tool {
|
|
||||||
justify-content: flex-start;
|
|
||||||
}
|
|
||||||
|
|
||||||
.chat-line.tool .chat-bubble {
|
|
||||||
border-style: dashed;
|
|
||||||
opacity: 0.95;
|
|
||||||
}
|
|
||||||
|
|
||||||
.chat-msg {
|
|
||||||
display: grid;
|
|
||||||
gap: 6px;
|
|
||||||
max-width: min(900px, 95%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.chat-line.user .chat-msg {
|
|
||||||
justify-items: end;
|
|
||||||
}
|
|
||||||
|
|
||||||
.chat-stamp {
|
|
||||||
font-size: 11px;
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.chat-line.user .chat-stamp {
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -39,10 +39,6 @@ export function renderTab(state: AppViewState, tab: Tab) {
|
|||||||
|
|
||||||
export function renderChatControls(state: AppViewState) {
|
export function renderChatControls(state: AppViewState) {
|
||||||
const sessionOptions = resolveSessionOptions(state.sessionKey, state.sessionsResult);
|
const sessionOptions = resolveSessionOptions(state.sessionKey, state.sessionsResult);
|
||||||
// Icon for list view (legacy)
|
|
||||||
const listIcon = html`<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"></line><line x1="8" y1="12" x2="21" y2="12"></line><line x1="8" y1="18" x2="21" y2="18"></line><line x1="3" y1="6" x2="3.01" y2="6"></line><line x1="3" y1="12" x2="3.01" y2="12"></line><line x1="3" y1="18" x2="3.01" y2="18"></line></svg>`;
|
|
||||||
// Icon for grouped view
|
|
||||||
const groupIcon = html`<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"></rect><rect x="14" y="3" width="7" height="7"></rect><rect x="14" y="14" width="7" height="7"></rect><rect x="3" y="14" width="7" height="7"></rect></svg>`;
|
|
||||||
// Refresh icon
|
// Refresh icon
|
||||||
const refreshIcon = html`<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12a9 9 0 1 1-9-9c2.52 0 4.93 1 6.74 2.74L21 8"></path><path d="M21 3v5h-5"></path></svg>`;
|
const refreshIcon = html`<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12a9 9 0 1 1-9-9c2.52 0 4.93 1 6.74 2.74L21 8"></path><path d="M21 3v5h-5"></path></svg>`;
|
||||||
const focusIcon = html`<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 7V4h3"></path><path d="M20 7V4h-3"></path><path d="M4 17v3h3"></path><path d="M20 17v3h-3"></path><circle cx="12" cy="12" r="3"></circle></svg>`;
|
const focusIcon = html`<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 7V4h3"></path><path d="M20 7V4h-3"></path><path d="M4 17v3h3"></path><path d="M20 17v3h-3"></path><circle cx="12" cy="12" r="3"></circle></svg>`;
|
||||||
@@ -116,18 +112,6 @@ export function renderChatControls(state: AppViewState) {
|
|||||||
>
|
>
|
||||||
${focusIcon}
|
${focusIcon}
|
||||||
</button>
|
</button>
|
||||||
<button
|
|
||||||
class="btn btn--sm btn--icon ${state.settings.useNewChatLayout ? "active" : ""}"
|
|
||||||
@click=${() =>
|
|
||||||
state.applySettings({
|
|
||||||
...state.settings,
|
|
||||||
useNewChatLayout: !state.settings.useNewChatLayout,
|
|
||||||
})}
|
|
||||||
aria-pressed=${state.settings.useNewChatLayout}
|
|
||||||
title="${state.settings.useNewChatLayout ? "Switch to list view" : "Switch to grouped view"}"
|
|
||||||
>
|
|
||||||
${state.settings.useNewChatLayout ? groupIcon : listIcon}
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -429,11 +429,7 @@ export function renderApp(state: AppViewState) {
|
|||||||
disabledReason: chatDisabledReason,
|
disabledReason: chatDisabledReason,
|
||||||
error: state.lastError,
|
error: state.lastError,
|
||||||
sessions: state.sessionsResult,
|
sessions: state.sessionsResult,
|
||||||
isToolOutputExpanded: (id) => state.toolOutputExpanded.has(id),
|
|
||||||
onToolOutputToggle: (id, expanded) =>
|
|
||||||
state.toggleToolOutput(id, expanded),
|
|
||||||
focusMode: state.settings.chatFocusMode,
|
focusMode: state.settings.chatFocusMode,
|
||||||
useNewChatLayout: state.settings.useNewChatLayout,
|
|
||||||
onRefresh: () => {
|
onRefresh: () => {
|
||||||
state.resetToolStream();
|
state.resetToolStream();
|
||||||
return loadChatHistory(state);
|
return loadChatHistory(state);
|
||||||
@@ -443,11 +439,6 @@ export function renderApp(state: AppViewState) {
|
|||||||
...state.settings,
|
...state.settings,
|
||||||
chatFocusMode: !state.settings.chatFocusMode,
|
chatFocusMode: !state.settings.chatFocusMode,
|
||||||
}),
|
}),
|
||||||
onToggleLayout: () =>
|
|
||||||
state.applySettings({
|
|
||||||
...state.settings,
|
|
||||||
useNewChatLayout: !state.settings.useNewChatLayout,
|
|
||||||
}),
|
|
||||||
onChatScroll: (event) => state.handleChatScroll(event),
|
onChatScroll: (event) => state.handleChatScroll(event),
|
||||||
onDraftChange: (next) => (state.chatMessage = next),
|
onDraftChange: (next) => (state.chatMessage = next),
|
||||||
onSend: () => state.handleSendChat(),
|
onSend: () => state.handleSendChat(),
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ type ToolStreamHost = {
|
|||||||
toolStreamById: Map<string, ToolStreamEntry>;
|
toolStreamById: Map<string, ToolStreamEntry>;
|
||||||
toolStreamOrder: string[];
|
toolStreamOrder: string[];
|
||||||
chatToolMessages: Record<string, unknown>[];
|
chatToolMessages: Record<string, unknown>[];
|
||||||
toolOutputExpanded: Set<string>;
|
|
||||||
toolStreamSyncTimer: number | null;
|
toolStreamSyncTimer: number | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -136,20 +135,9 @@ export function resetToolStream(host: ToolStreamHost) {
|
|||||||
host.toolStreamById.clear();
|
host.toolStreamById.clear();
|
||||||
host.toolStreamOrder = [];
|
host.toolStreamOrder = [];
|
||||||
host.chatToolMessages = [];
|
host.chatToolMessages = [];
|
||||||
host.toolOutputExpanded = new Set();
|
|
||||||
flushToolStreamSync(host);
|
flushToolStreamSync(host);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function toggleToolOutput(host: ToolStreamHost, id: string, expanded: boolean) {
|
|
||||||
const next = new Set(host.toolOutputExpanded);
|
|
||||||
if (expanded) {
|
|
||||||
next.add(id);
|
|
||||||
} else {
|
|
||||||
next.delete(id);
|
|
||||||
}
|
|
||||||
host.toolOutputExpanded = next;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function handleAgentEvent(host: ToolStreamHost, payload?: AgentEventPayload) {
|
export function handleAgentEvent(host: ToolStreamHost, payload?: AgentEventPayload) {
|
||||||
if (!payload || payload.stream !== "tool") return;
|
if (!payload || payload.stream !== "tool") return;
|
||||||
const sessionKey =
|
const sessionKey =
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ import type { DevicePairingList } from "./controllers/devices";
|
|||||||
import type { ExecApprovalRequest } from "./controllers/exec-approval";
|
import type { ExecApprovalRequest } from "./controllers/exec-approval";
|
||||||
import {
|
import {
|
||||||
resetToolStream as resetToolStreamInternal,
|
resetToolStream as resetToolStreamInternal,
|
||||||
toggleToolOutput as toggleToolOutputInternal,
|
|
||||||
type ToolStreamEntry,
|
type ToolStreamEntry,
|
||||||
} from "./app-tool-stream";
|
} from "./app-tool-stream";
|
||||||
import {
|
import {
|
||||||
@@ -109,7 +108,6 @@ export class ClawdbotApp extends LitElement {
|
|||||||
@state() chatRunId: string | null = null;
|
@state() chatRunId: string | null = null;
|
||||||
@state() chatThinkingLevel: string | null = null;
|
@state() chatThinkingLevel: string | null = null;
|
||||||
@state() chatQueue: ChatQueueItem[] = [];
|
@state() chatQueue: ChatQueueItem[] = [];
|
||||||
@state() toolOutputExpanded = new Set<string>();
|
|
||||||
// Sidebar state for tool output viewing
|
// Sidebar state for tool output viewing
|
||||||
@state() sidebarOpen = false;
|
@state() sidebarOpen = false;
|
||||||
@state() sidebarContent: string | null = null;
|
@state() sidebarContent: string | null = null;
|
||||||
@@ -301,13 +299,6 @@ export class ClawdbotApp extends LitElement {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleToolOutput(id: string, expanded: boolean) {
|
|
||||||
toggleToolOutputInternal(
|
|
||||||
this as unknown as Parameters<typeof toggleToolOutputInternal>[0],
|
|
||||||
id,
|
|
||||||
expanded,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
applySettings(next: UiSettings) {
|
applySettings(next: UiSettings) {
|
||||||
applySettingsInternal(
|
applySettingsInternal(
|
||||||
this as unknown as Parameters<typeof applySettingsInternal>[0],
|
this as unknown as Parameters<typeof applySettingsInternal>[0],
|
||||||
|
|||||||
@@ -28,12 +28,7 @@ afterEach(() => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe("chat markdown rendering", () => {
|
describe("chat markdown rendering", () => {
|
||||||
it("renders markdown inside tool result cards", async () => {
|
it("renders markdown inside tool output sidebar", async () => {
|
||||||
localStorage.setItem(
|
|
||||||
"clawdbot.control.settings.v1",
|
|
||||||
JSON.stringify({ useNewChatLayout: false }),
|
|
||||||
);
|
|
||||||
|
|
||||||
const app = mountApp("/chat");
|
const app = mountApp("/chat");
|
||||||
await app.updateComplete;
|
await app.updateComplete;
|
||||||
|
|
||||||
@@ -48,12 +43,16 @@ describe("chat markdown rendering", () => {
|
|||||||
timestamp,
|
timestamp,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
// Expand the tool output card so its markdown is rendered into the DOM.
|
|
||||||
app.toolOutputExpanded = new Set([`${timestamp}:1`]);
|
|
||||||
|
|
||||||
await app.updateComplete;
|
await app.updateComplete;
|
||||||
|
|
||||||
const strong = app.querySelector(".chat-tool-card__output strong");
|
const toolCard = app.querySelector(".chat-tool-card") as HTMLElement | null;
|
||||||
|
expect(toolCard).not.toBeNull();
|
||||||
|
toolCard?.click();
|
||||||
|
|
||||||
|
await app.updateComplete;
|
||||||
|
|
||||||
|
const strong = app.querySelector(".sidebar-markdown strong");
|
||||||
expect(strong?.textContent).toBe("world");
|
expect(strong?.textContent).toBe("world");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import { html, type TemplateResult } from "lit";
|
||||||
|
import { renderEmojiIcon, setEmojiIcon } from "../icons";
|
||||||
|
|
||||||
|
const COPIED_FOR_MS = 1500;
|
||||||
|
const ERROR_FOR_MS = 2000;
|
||||||
|
const COPY_LABEL = "Copy as markdown";
|
||||||
|
const COPIED_LABEL = "Copied";
|
||||||
|
const ERROR_LABEL = "Copy failed";
|
||||||
|
const COPY_ICON = "📋";
|
||||||
|
const COPIED_ICON = "✓";
|
||||||
|
const ERROR_ICON = "!";
|
||||||
|
|
||||||
|
type CopyButtonOptions = {
|
||||||
|
text: () => string;
|
||||||
|
label?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
async function copyTextToClipboard(text: string): Promise<boolean> {
|
||||||
|
if (!text) return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(text);
|
||||||
|
return true;
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function setButtonLabel(button: HTMLButtonElement, label: string) {
|
||||||
|
button.title = label;
|
||||||
|
button.setAttribute("aria-label", label);
|
||||||
|
}
|
||||||
|
|
||||||
|
function createCopyButton(options: CopyButtonOptions): TemplateResult {
|
||||||
|
const idleLabel = options.label ?? COPY_LABEL;
|
||||||
|
return html`
|
||||||
|
<button
|
||||||
|
class="chat-copy-btn"
|
||||||
|
type="button"
|
||||||
|
title=${idleLabel}
|
||||||
|
aria-label=${idleLabel}
|
||||||
|
@click=${async (e: Event) => {
|
||||||
|
const btn = e.currentTarget as HTMLButtonElement | null;
|
||||||
|
const icon = btn?.querySelector(
|
||||||
|
".chat-copy-btn__icon",
|
||||||
|
) as HTMLElement | null;
|
||||||
|
|
||||||
|
if (!btn || btn.dataset.copying === "1") return;
|
||||||
|
|
||||||
|
btn.dataset.copying = "1";
|
||||||
|
btn.setAttribute("aria-busy", "true");
|
||||||
|
btn.disabled = true;
|
||||||
|
|
||||||
|
const copied = await copyTextToClipboard(options.text());
|
||||||
|
if (!btn.isConnected) return;
|
||||||
|
|
||||||
|
delete btn.dataset.copying;
|
||||||
|
btn.removeAttribute("aria-busy");
|
||||||
|
btn.disabled = false;
|
||||||
|
|
||||||
|
if (!copied) {
|
||||||
|
btn.dataset.error = "1";
|
||||||
|
setButtonLabel(btn, ERROR_LABEL);
|
||||||
|
setEmojiIcon(icon, ERROR_ICON);
|
||||||
|
|
||||||
|
window.setTimeout(() => {
|
||||||
|
if (!btn.isConnected) return;
|
||||||
|
delete btn.dataset.error;
|
||||||
|
setButtonLabel(btn, idleLabel);
|
||||||
|
setEmojiIcon(icon, COPY_ICON);
|
||||||
|
}, ERROR_FOR_MS);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
btn.dataset.copied = "1";
|
||||||
|
setButtonLabel(btn, COPIED_LABEL);
|
||||||
|
setEmojiIcon(icon, COPIED_ICON);
|
||||||
|
|
||||||
|
window.setTimeout(() => {
|
||||||
|
if (!btn.isConnected) return;
|
||||||
|
delete btn.dataset.copied;
|
||||||
|
setButtonLabel(btn, idleLabel);
|
||||||
|
setEmojiIcon(icon, COPY_ICON);
|
||||||
|
}, COPIED_FOR_MS);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
${renderEmojiIcon(COPY_ICON, "chat-copy-btn__icon")}
|
||||||
|
</button>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function renderCopyAsMarkdownButton(markdown: string): TemplateResult {
|
||||||
|
return createCopyButton({ text: () => markdown, label: COPY_LABEL });
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import { unsafeHTML } from "lit/directives/unsafe-html.js";
|
|||||||
|
|
||||||
import { toSanitizedMarkdownHtml } from "../markdown";
|
import { toSanitizedMarkdownHtml } from "../markdown";
|
||||||
import type { MessageGroup } from "../types/chat-types";
|
import type { MessageGroup } from "../types/chat-types";
|
||||||
|
import { renderCopyAsMarkdownButton } from "./copy-as-markdown";
|
||||||
import { isToolResultMessage, normalizeRoleForGrouping } from "./message-normalizer";
|
import { isToolResultMessage, normalizeRoleForGrouping } from "./message-normalizer";
|
||||||
import {
|
import {
|
||||||
extractText,
|
extractText,
|
||||||
@@ -150,9 +151,11 @@ function renderGroupedMessage(
|
|||||||
? formatReasoningMarkdown(extractedThinking)
|
? formatReasoningMarkdown(extractedThinking)
|
||||||
: null;
|
: null;
|
||||||
const markdown = markdownBase;
|
const markdown = markdownBase;
|
||||||
|
const canCopyMarkdown = role === "assistant" && Boolean(markdown?.trim());
|
||||||
|
|
||||||
const bubbleClasses = [
|
const bubbleClasses = [
|
||||||
"chat-bubble",
|
"chat-bubble",
|
||||||
|
canCopyMarkdown ? "has-copy" : "",
|
||||||
opts.isStreaming ? "streaming" : "",
|
opts.isStreaming ? "streaming" : "",
|
||||||
"fade-in",
|
"fade-in",
|
||||||
]
|
]
|
||||||
@@ -169,6 +172,7 @@ function renderGroupedMessage(
|
|||||||
|
|
||||||
return html`
|
return html`
|
||||||
<div class="${bubbleClasses}">
|
<div class="${bubbleClasses}">
|
||||||
|
${canCopyMarkdown ? renderCopyAsMarkdownButton(markdown!) : nothing}
|
||||||
${reasoningMarkdown
|
${reasoningMarkdown
|
||||||
? html`<div class="chat-thinking">${unsafeHTML(
|
? html`<div class="chat-thinking">${unsafeHTML(
|
||||||
toSanitizedMarkdownHtml(reasoningMarkdown),
|
toSanitizedMarkdownHtml(reasoningMarkdown),
|
||||||
@@ -181,4 +185,3 @@ function renderGroupedMessage(
|
|||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
import { html, nothing } from "lit";
|
|
||||||
import { unsafeHTML } from "lit/directives/unsafe-html.js";
|
|
||||||
|
|
||||||
import { toSanitizedMarkdownHtml } from "../markdown";
|
|
||||||
import {
|
|
||||||
isToolResultMessage,
|
|
||||||
normalizeRoleForGrouping,
|
|
||||||
} from "./message-normalizer";
|
|
||||||
import {
|
|
||||||
extractText,
|
|
||||||
extractThinking,
|
|
||||||
formatReasoningMarkdown,
|
|
||||||
} from "./message-extract";
|
|
||||||
import { extractToolCards, renderToolCardLegacy } from "./tool-cards";
|
|
||||||
|
|
||||||
export type LegacyToolOutputProps = {
|
|
||||||
isToolOutputExpanded?: (id: string) => boolean;
|
|
||||||
onToolOutputToggle?: (id: string, expanded: boolean) => void;
|
|
||||||
};
|
|
||||||
|
|
||||||
export function renderReadingIndicator() {
|
|
||||||
return html`
|
|
||||||
<div class="chat-line assistant">
|
|
||||||
<div class="chat-msg">
|
|
||||||
<div class="chat-bubble chat-reading-indicator" aria-hidden="true">
|
|
||||||
<span class="chat-reading-indicator__dots">
|
|
||||||
<span></span><span></span><span></span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function renderMessage(
|
|
||||||
message: unknown,
|
|
||||||
props?: LegacyToolOutputProps,
|
|
||||||
opts?: { streaming?: boolean; showReasoning?: boolean },
|
|
||||||
) {
|
|
||||||
const m = message as Record<string, unknown>;
|
|
||||||
const role = typeof m.role === "string" ? m.role : "unknown";
|
|
||||||
const toolCards = extractToolCards(message);
|
|
||||||
const hasToolCards = toolCards.length > 0;
|
|
||||||
const isToolResult =
|
|
||||||
isToolResultMessage(message) ||
|
|
||||||
typeof m.toolCallId === "string" ||
|
|
||||||
typeof m.tool_call_id === "string";
|
|
||||||
const extractedText = extractText(message);
|
|
||||||
const extractedThinking =
|
|
||||||
opts?.showReasoning && role === "assistant" ? extractThinking(message) : null;
|
|
||||||
const contentText = typeof m.content === "string" ? m.content : null;
|
|
||||||
const fallback = hasToolCards ? null : JSON.stringify(message, null, 2);
|
|
||||||
|
|
||||||
const display =
|
|
||||||
!isToolResult && extractedText?.trim()
|
|
||||||
? { kind: "text" as const, value: extractedText }
|
|
||||||
: !isToolResult && contentText?.trim()
|
|
||||||
? { kind: "text" as const, value: contentText }
|
|
||||||
: !isToolResult && fallback
|
|
||||||
? { kind: "json" as const, value: fallback }
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const markdownBase =
|
|
||||||
display?.kind === "json"
|
|
||||||
? ["```json", display.value, "```"].join("\n")
|
|
||||||
: (display?.value ?? null);
|
|
||||||
const reasoningMarkdown = extractedThinking
|
|
||||||
? formatReasoningMarkdown(extractedThinking)
|
|
||||||
: null;
|
|
||||||
const markdown = markdownBase;
|
|
||||||
|
|
||||||
const timestamp =
|
|
||||||
typeof m.timestamp === "number" ? new Date(m.timestamp).toLocaleTimeString() : "";
|
|
||||||
|
|
||||||
const normalizedRole = normalizeRoleForGrouping(role);
|
|
||||||
const klass =
|
|
||||||
normalizedRole === "assistant"
|
|
||||||
? "assistant"
|
|
||||||
: normalizedRole === "user"
|
|
||||||
? "user"
|
|
||||||
: normalizedRole === "tool"
|
|
||||||
? "tool"
|
|
||||||
: "other";
|
|
||||||
const who =
|
|
||||||
normalizedRole === "assistant"
|
|
||||||
? "Assistant"
|
|
||||||
: normalizedRole === "user"
|
|
||||||
? "You"
|
|
||||||
: normalizedRole === "tool"
|
|
||||||
? "Working"
|
|
||||||
: normalizedRole;
|
|
||||||
|
|
||||||
const toolCallId = typeof m.toolCallId === "string" ? m.toolCallId : "";
|
|
||||||
const toolCardBase =
|
|
||||||
toolCallId ||
|
|
||||||
(typeof m.id === "string" ? m.id : "") ||
|
|
||||||
(typeof m.messageId === "string" ? m.messageId : "") ||
|
|
||||||
(typeof m.timestamp === "number" ? String(m.timestamp) : "tool-card");
|
|
||||||
|
|
||||||
return html`
|
|
||||||
<div class="chat-line ${klass}">
|
|
||||||
<div class="chat-msg">
|
|
||||||
<div class="chat-bubble ${opts?.streaming ? "streaming" : ""}">
|
|
||||||
${reasoningMarkdown
|
|
||||||
? html`<div class="chat-thinking">${unsafeHTML(
|
|
||||||
toSanitizedMarkdownHtml(reasoningMarkdown),
|
|
||||||
)}</div>`
|
|
||||||
: nothing}
|
|
||||||
${markdown
|
|
||||||
? html`<div class="chat-text">${unsafeHTML(toSanitizedMarkdownHtml(markdown))}</div>`
|
|
||||||
: nothing}
|
|
||||||
${toolCards.map((card, index) =>
|
|
||||||
renderToolCardLegacy(card, {
|
|
||||||
id: `${toolCardBase}:${index}`,
|
|
||||||
expanded: props?.isToolOutputExpanded
|
|
||||||
? props.isToolOutputExpanded(`${toolCardBase}:${index}`)
|
|
||||||
: false,
|
|
||||||
onToggle: props?.onToolOutputToggle,
|
|
||||||
}),
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div class="chat-stamp mono">
|
|
||||||
${who}${timestamp ? html` · ${timestamp}` : nothing}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
import { html, nothing } from "lit";
|
import { html, nothing } from "lit";
|
||||||
import { unsafeHTML } from "lit/directives/unsafe-html.js";
|
|
||||||
|
|
||||||
import { toSanitizedMarkdownHtml } from "../markdown";
|
|
||||||
import { formatToolDetail, resolveToolDisplay } from "../tool-display";
|
import { formatToolDetail, resolveToolDisplay } from "../tool-display";
|
||||||
import type { ToolCard } from "../types/chat-types";
|
import type { ToolCard } from "../types/chat-types";
|
||||||
import { TOOL_INLINE_THRESHOLD } from "./constants";
|
import { TOOL_INLINE_THRESHOLD } from "./constants";
|
||||||
@@ -54,60 +52,6 @@ export function extractToolCards(message: unknown): ToolCard[] {
|
|||||||
return cards;
|
return cards;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function renderToolCardLegacy(
|
|
||||||
card: ToolCard,
|
|
||||||
opts?: {
|
|
||||||
id: string;
|
|
||||||
expanded: boolean;
|
|
||||||
onToggle?: (id: string, expanded: boolean) => void;
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
const display = resolveToolDisplay({ name: card.name, args: card.args });
|
|
||||||
const detail = formatToolDetail(display);
|
|
||||||
const hasOutput = typeof card.text === "string" && card.text.length > 0;
|
|
||||||
const expanded = opts?.expanded ?? false;
|
|
||||||
const id = opts?.id ?? `${card.name}-${Math.random()}`;
|
|
||||||
return html`
|
|
||||||
<div class="chat-tool-card">
|
|
||||||
<div class="chat-tool-card__header">
|
|
||||||
<div class="chat-tool-card__title">
|
|
||||||
<span class="chat-tool-card__icon">${display.emoji}</span>
|
|
||||||
<span>${display.label}</span>
|
|
||||||
</div>
|
|
||||||
${!hasOutput ? html`<span class="chat-tool-card__status">✓</span>` : nothing}
|
|
||||||
</div>
|
|
||||||
${detail
|
|
||||||
? html`<div class="chat-tool-card__detail">${detail}</div>`
|
|
||||||
: nothing}
|
|
||||||
${hasOutput
|
|
||||||
? html`
|
|
||||||
<details
|
|
||||||
class="chat-tool-card__details"
|
|
||||||
?open=${expanded}
|
|
||||||
@toggle=${(e: Event) => {
|
|
||||||
if (!opts?.onToggle) return;
|
|
||||||
const target = e.currentTarget as HTMLDetailsElement;
|
|
||||||
opts.onToggle(id, target.open);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<summary class="chat-tool-card__summary">
|
|
||||||
${expanded ? "Hide output" : "Show output"}
|
|
||||||
<span class="chat-tool-card__summary-meta">
|
|
||||||
(${card.text?.length ?? 0} chars)
|
|
||||||
</span>
|
|
||||||
</summary>
|
|
||||||
${expanded
|
|
||||||
? html`<div class="chat-tool-card__output chat-text">
|
|
||||||
${unsafeHTML(toSanitizedMarkdownHtml(card.text ?? ""))}
|
|
||||||
</div>`
|
|
||||||
: nothing}
|
|
||||||
</details>
|
|
||||||
`
|
|
||||||
: nothing}
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function renderToolCardSidebar(
|
export function renderToolCardSidebar(
|
||||||
card: ToolCard,
|
card: ToolCard,
|
||||||
onOpenSidebar?: (content: string) => void,
|
onOpenSidebar?: (content: string) => void,
|
||||||
@@ -197,4 +141,3 @@ function extractToolText(item: Record<string, unknown>): string | undefined {
|
|||||||
if (typeof item.content === "string") return item.content;
|
if (typeof item.content === "string") return item.content;
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { html, type TemplateResult } from "lit";
|
||||||
|
|
||||||
|
export function renderEmojiIcon(icon: string, className: string): TemplateResult {
|
||||||
|
return html`<span class=${className} aria-hidden="true">${icon}</span>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setEmojiIcon(target: HTMLElement | null, icon: string): void {
|
||||||
|
if (!target) return;
|
||||||
|
target.textContent = icon;
|
||||||
|
}
|
||||||
@@ -11,7 +11,6 @@ export type UiSettings = {
|
|||||||
chatFocusMode: boolean;
|
chatFocusMode: boolean;
|
||||||
chatShowThinking: boolean;
|
chatShowThinking: boolean;
|
||||||
splitRatio: number; // Sidebar split ratio (0.4 to 0.7, default 0.6)
|
splitRatio: number; // Sidebar split ratio (0.4 to 0.7, default 0.6)
|
||||||
useNewChatLayout: boolean; // Slack-style grouped messages layout
|
|
||||||
navCollapsed: boolean; // Collapsible sidebar state
|
navCollapsed: boolean; // Collapsible sidebar state
|
||||||
navGroupsCollapsed: Record<string, boolean>; // Which nav groups are collapsed
|
navGroupsCollapsed: Record<string, boolean>; // Which nav groups are collapsed
|
||||||
};
|
};
|
||||||
@@ -31,7 +30,6 @@ export function loadSettings(): UiSettings {
|
|||||||
chatFocusMode: false,
|
chatFocusMode: false,
|
||||||
chatShowThinking: true,
|
chatShowThinking: true,
|
||||||
splitRatio: 0.6,
|
splitRatio: 0.6,
|
||||||
useNewChatLayout: true, // Enabled by default
|
|
||||||
navCollapsed: false,
|
navCollapsed: false,
|
||||||
navGroupsCollapsed: {},
|
navGroupsCollapsed: {},
|
||||||
};
|
};
|
||||||
@@ -77,10 +75,6 @@ export function loadSettings(): UiSettings {
|
|||||||
parsed.splitRatio <= 0.7
|
parsed.splitRatio <= 0.7
|
||||||
? parsed.splitRatio
|
? parsed.splitRatio
|
||||||
: defaults.splitRatio,
|
: defaults.splitRatio,
|
||||||
useNewChatLayout:
|
|
||||||
typeof parsed.useNewChatLayout === "boolean"
|
|
||||||
? parsed.useNewChatLayout
|
|
||||||
: defaults.useNewChatLayout,
|
|
||||||
navCollapsed:
|
navCollapsed:
|
||||||
typeof parsed.navCollapsed === "boolean"
|
typeof parsed.navCollapsed === "boolean"
|
||||||
? parsed.navCollapsed
|
? parsed.navCollapsed
|
||||||
|
|||||||
+10
-31
@@ -8,7 +8,6 @@ import {
|
|||||||
normalizeRoleForGrouping,
|
normalizeRoleForGrouping,
|
||||||
} from "../chat/message-normalizer";
|
} from "../chat/message-normalizer";
|
||||||
import { extractText } from "../chat/message-extract";
|
import { extractText } from "../chat/message-extract";
|
||||||
import { renderMessage, renderReadingIndicator } from "../chat/legacy-render";
|
|
||||||
import {
|
import {
|
||||||
renderMessageGroup,
|
renderMessageGroup,
|
||||||
renderReadingIndicatorGroup,
|
renderReadingIndicatorGroup,
|
||||||
@@ -36,14 +35,9 @@ export type ChatProps = {
|
|||||||
disabledReason: string | null;
|
disabledReason: string | null;
|
||||||
error: string | null;
|
error: string | null;
|
||||||
sessions: SessionsListResult | null;
|
sessions: SessionsListResult | null;
|
||||||
// Legacy tool output expand/collapse (used when useNewChatLayout is false)
|
|
||||||
isToolOutputExpanded: (id: string) => boolean;
|
|
||||||
onToolOutputToggle: (id: string, expanded: boolean) => void;
|
|
||||||
// Focus mode
|
// Focus mode
|
||||||
focusMode: boolean;
|
focusMode: boolean;
|
||||||
// Feature flag for new Slack-style layout with sidebar
|
// Sidebar state
|
||||||
useNewChatLayout?: boolean;
|
|
||||||
// Sidebar state (used when useNewChatLayout is true)
|
|
||||||
sidebarOpen?: boolean;
|
sidebarOpen?: boolean;
|
||||||
sidebarContent?: string | null;
|
sidebarContent?: string | null;
|
||||||
sidebarError?: string | null;
|
sidebarError?: string | null;
|
||||||
@@ -51,7 +45,6 @@ export type ChatProps = {
|
|||||||
// Event handlers
|
// Event handlers
|
||||||
onRefresh: () => void;
|
onRefresh: () => void;
|
||||||
onToggleFocusMode: () => void;
|
onToggleFocusMode: () => void;
|
||||||
onToggleLayout?: () => void;
|
|
||||||
onDraftChange: (next: string) => void;
|
onDraftChange: (next: string) => void;
|
||||||
onSend: () => void;
|
onSend: () => void;
|
||||||
onAbort?: () => void;
|
onAbort?: () => void;
|
||||||
@@ -78,7 +71,6 @@ export function renderChat(props: ChatProps) {
|
|||||||
|
|
||||||
const splitRatio = props.splitRatio ?? 0.6;
|
const splitRatio = props.splitRatio ?? 0.6;
|
||||||
const sidebarOpen = Boolean(props.sidebarOpen && props.onCloseSidebar);
|
const sidebarOpen = Boolean(props.sidebarOpen && props.onCloseSidebar);
|
||||||
const useNewLayout = props.useNewChatLayout ?? false;
|
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<section class="card chat">
|
<section class="card chat">
|
||||||
@@ -122,27 +114,15 @@ export function renderChat(props: ChatProps) {
|
|||||||
: nothing}
|
: nothing}
|
||||||
${repeat(buildChatItems(props), (item) => item.key, (item) => {
|
${repeat(buildChatItems(props), (item) => item.key, (item) => {
|
||||||
if (item.kind === "reading-indicator") {
|
if (item.kind === "reading-indicator") {
|
||||||
return useNewLayout
|
return renderReadingIndicatorGroup();
|
||||||
? renderReadingIndicatorGroup()
|
|
||||||
: renderReadingIndicator();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.kind === "stream") {
|
if (item.kind === "stream") {
|
||||||
return useNewLayout
|
return renderStreamingGroup(
|
||||||
? renderStreamingGroup(
|
item.text,
|
||||||
item.text,
|
item.startedAt,
|
||||||
item.startedAt,
|
props.onOpenSidebar,
|
||||||
props.onOpenSidebar,
|
);
|
||||||
)
|
|
||||||
: renderMessage(
|
|
||||||
{
|
|
||||||
role: "assistant",
|
|
||||||
content: [{ type: "text", text: item.text }],
|
|
||||||
timestamp: item.startedAt,
|
|
||||||
},
|
|
||||||
props,
|
|
||||||
{ streaming: true, showReasoning },
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.kind === "group") {
|
if (item.kind === "group") {
|
||||||
@@ -152,12 +132,12 @@ export function renderChat(props: ChatProps) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return renderMessage(item.message, props, { showReasoning });
|
return nothing;
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
${useNewLayout && sidebarOpen
|
${sidebarOpen
|
||||||
? html`
|
? html`
|
||||||
<resizable-divider
|
<resizable-divider
|
||||||
.splitRatio=${splitRatio}
|
.splitRatio=${splitRatio}
|
||||||
@@ -348,8 +328,7 @@ function buildChatItems(props: ChatProps): Array<ChatItem | MessageGroup> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (props.useNewChatLayout) return groupMessages(items);
|
return groupMessages(items);
|
||||||
return items;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function messageKey(message: unknown, index: number): string {
|
function messageKey(message: unknown, index: number): string {
|
||||||
|
|||||||
Reference in new issue
Block a user