fix: drop stale ts-expect-error in pdf input parsing

.npmrc

@@ -1 +1 @@
-allow-build-scripts=@whiskeysockets/baileys,sharp,esbuild,protobufjs,fs-ext,node-pty,@lydell/node-pty,@matrix-org/matrix-sdk-crypto-nodejs
+allow-build-scripts=@whiskeysockets/baileys,sharp,esbuild,protobufjs,fs-ext,node-pty,@lydell/node-pty

CHANGELOG.md

@@ -6,18 +6,12 @@ Docs: https://docs.clawd.bot
 
 ### Changes
 - Repo: remove the Peekaboo git submodule now that the SPM release is used.
-- 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.
-- Docs: refresh bird skill install metadata and usage notes. (#1302) — thanks @odysseus0.
-- Matrix: migrate to matrix-bot-sdk with E2EE support, location handling, and group allowlist upgrades. (#1298) — thanks @sibbl.
-- Plugins/UI: let channel plugin metadata drive UI labels/icons and cron channel options. (#1306) — thanks @steipete.
+
 ### Fixes
 - Web search: infer Perplexity base URL from API key source (direct vs OpenRouter).
-- Config: allow Perplexity as a web_search provider in config validation. (#1230, #1247) — thanks @sebslight.
 - TUI: keep thinking blocks ordered before content during streaming and isolate per-run assembly. (#1202) — thanks @aaronveklabs.
 - CLI: avoid duplicating --profile/--dev flags when formatting commands.
-- Exec: prefer bash when fish is default shell, falling back to sh if bash is missing. (#1297) — thanks @ysqander.
-- Plugins: add Nextcloud Talk manifest for plugin config validation. (#1297) — thanks @ysqander.
+- Agents: enforce tool policy/sandbox rules for tool-dispatched skill commands and forward tool media outputs. (#1235) — thanks @dougvk.
 
 ## 2026.1.19-3
 

README.md

@@ -471,26 +471,24 @@ Thanks to all clawtributors:
 
 <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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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=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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></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/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/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/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/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/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=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/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/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/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/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>

apps/macos/Package.swift

@@ -78,7 +78,6 @@ let package = Package(
         .executableTarget(
             name: "ClawdbotWizardCLI",
             dependencies: [
-                .product(name: "ClawdbotKit", package: "ClawdbotKit"),
                 .product(name: "ClawdbotProtocol", package: "ClawdbotKit"),
             ],
             path: "Sources/ClawdbotWizardCLI",

apps/macos/Sources/Clawdbot/ChannelsSettings+ChannelState.swift

@@ -433,17 +433,27 @@ extension ChannelsSettings {
     }
 
     private func resolveChannelDetailTitle(_ id: String) -> String {
-        if let detail = self.store.snapshot?.channelDetailLabels?[id], !detail.isEmpty {
-            return detail
+        switch id {
+        case "whatsapp": "WhatsApp Web"
+        case "telegram": "Telegram Bot"
+        case "discord": "Discord Bot"
+        case "slack": "Slack Bot"
+        case "signal": "Signal REST"
+        case "imessage": "iMessage"
+        default: self.resolveChannelTitle(id)
         }
-        return self.resolveChannelTitle(id)
     }
 
     private func resolveChannelSystemImage(_ id: String) -> String {
-        if let symbol = self.store.snapshot?.channelSystemImages?[id], !symbol.isEmpty {
-            return symbol
+        switch id {
+        case "whatsapp": "message"
+        case "telegram": "paperplane"
+        case "discord": "bubble.left.and.bubble.right"
+        case "slack": "number"
+        case "signal": "antenna.radiowaves.left.and.right"
+        case "imessage": "message.fill"
+        default: "message"
         }
-        return "message"
     }
 
     private func channelStatusDictionary(_ id: String) -> [String: AnyCodable]? {

apps/macos/Sources/Clawdbot/ChannelsStore.swift

@@ -156,8 +156,6 @@ struct ChannelsStatusSnapshot: Codable {
     let ts: Double
     let channelOrder: [String]
     let channelLabels: [String: String]
-    let channelDetailLabels: [String: String]? = nil
-    let channelSystemImages: [String: String]? = nil
     let channels: [String: AnyCodable]
     let channelAccounts: [String: [ChannelAccountSnapshot]]
     let channelDefaultAccountId: [String: String]

apps/macos/Sources/Clawdbot/CronJobEditor+Helpers.swift

@@ -42,8 +42,7 @@ extension CronJobEditor {
             self.thinking = thinking ?? ""
             self.timeoutSeconds = timeoutSeconds.map(String.init) ?? ""
             self.deliver = deliver ?? false
-            let trimmed = (channel ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-            self.channel = trimmed.isEmpty ? "last" : trimmed
+            self.channel = GatewayAgentChannel(raw: channel)
             self.to = to ?? ""
             self.bestEffortDeliver = bestEffortDeliver ?? false
         }
@@ -211,8 +210,7 @@ extension CronJobEditor {
         if let n = Int(self.timeoutSeconds), n > 0 { payload["timeoutSeconds"] = n }
         payload["deliver"] = self.deliver
         if self.deliver {
-            let trimmed = self.channel.trimmingCharacters(in: .whitespacesAndNewlines)
-            payload["channel"] = trimmed.isEmpty ? "last" : trimmed
+            payload["channel"] = self.channel.rawValue
             let to = self.to.trimmingCharacters(in: .whitespacesAndNewlines)
             if !to.isEmpty { payload["to"] = to }
             payload["bestEffortDeliver"] = self.bestEffortDeliver

apps/macos/Sources/Clawdbot/CronJobEditor+Testing.swift

@@ -14,7 +14,7 @@ extension CronJobEditor {
         self.payloadKind = .agentTurn
         self.agentMessage = "Run diagnostic"
         self.deliver = true
-        self.channel = "last"
+        self.channel = .last
         self.to = "+15551230000"
         self.thinking = "low"
         self.timeoutSeconds = "90"

apps/macos/Sources/Clawdbot/CronJobEditor.swift

@@ -1,12 +1,10 @@
 import ClawdbotProtocol
-import Observation
 import SwiftUI
 
 struct CronJobEditor: View {
     let job: CronJob?
     @Binding var isSaving: Bool
     @Binding var error: String?
-    @Bindable var channelsStore: ChannelsStore
     let onCancel: () -> Void
     let onSave: ([String: AnyCodable]) -> Void
 
@@ -47,30 +45,13 @@ struct CronJobEditor: View {
     @State var systemEventText: String = ""
     @State var agentMessage: String = ""
     @State var deliver: Bool = false
-    @State var channel: String = "last"
+    @State var channel: GatewayAgentChannel = .last
     @State var to: String = ""
     @State var thinking: String = ""
     @State var timeoutSeconds: String = ""
     @State var bestEffortDeliver: Bool = false
     @State var postPrefix: String = "Cron"
 
-    var channelOptions: [String] {
-        let snapshot = self.channelsStore.snapshot
-        let ordered = snapshot?.channelOrder ?? []
-        var options = ["last"] + ordered
-        let trimmed = self.channel.trimmingCharacters(in: .whitespacesAndNewlines)
-        if !trimmed.isEmpty, !options.contains(trimmed) {
-            options.append(trimmed)
-        }
-        var seen = Set<String>()
-        return options.filter { seen.insert($0).inserted }
-    }
-
-    func channelLabel(for id: String) -> String {
-        if id == "last" { return "last" }
-        return self.channelsStore.snapshot?.channelLabels[id] ?? id
-    }
-
     var body: some View {
         VStack(alignment: .leading, spacing: 16) {
             VStack(alignment: .leading, spacing: 6) {
@@ -352,9 +333,13 @@ struct CronJobEditor: View {
                     GridRow {
                         self.gridLabel("Channel")
                         Picker("", selection: self.$channel) {
-                            ForEach(self.channelOptions, id: \.self) { channel in
-                                Text(self.channelLabel(for: channel)).tag(channel)
-                            }
+                            Text("last").tag(GatewayAgentChannel.last)
+                            Text("whatsapp").tag(GatewayAgentChannel.whatsapp)
+                            Text("telegram").tag(GatewayAgentChannel.telegram)
+                            Text("discord").tag(GatewayAgentChannel.discord)
+                            Text("slack").tag(GatewayAgentChannel.slack)
+                            Text("signal").tag(GatewayAgentChannel.signal)
+                            Text("imessage").tag(GatewayAgentChannel.imessage)
                         }
                         .labelsHidden()
                         .pickerStyle(.segmented)

apps/macos/Sources/Clawdbot/CronSettings+Layout.swift

@@ -8,20 +8,13 @@ extension CronSettings {
             self.content
             Spacer(minLength: 0)
         }
-        .onAppear {
-            self.store.start()
-            self.channelsStore.start()
-        }
-        .onDisappear {
-            self.store.stop()
-            self.channelsStore.stop()
-        }
+        .onAppear { self.store.start() }
+        .onDisappear { self.store.stop() }
         .sheet(isPresented: self.$showEditor) {
             CronJobEditor(
                 job: self.editingJob,
                 isSaving: self.$isSaving,
                 error: self.$editorError,
-                channelsStore: self.channelsStore,
                 onCancel: {
                     self.showEditor = false
                     self.editingJob = nil

apps/macos/Sources/Clawdbot/CronSettings+Testing.swift

@@ -47,7 +47,7 @@ struct CronSettings_Previews: PreviewProvider {
                 durationMs: 1234,
                 nextRunAtMs: nil),
         ]
-        return CronSettings(store: store, channelsStore: ChannelsStore(isPreview: true))
+        return CronSettings(store: store)
             .frame(width: SettingsTab.windowWidth, height: SettingsTab.windowHeight)
     }
 }
@@ -103,7 +103,7 @@ extension CronSettings {
         store.selectedJobId = job.id
         store.runEntries = [run]
 
-        let view = CronSettings(store: store, channelsStore: ChannelsStore(isPreview: true))
+        let view = CronSettings(store: store)
         _ = view.body
         _ = view.jobRow(job)
         _ = view.jobContextMenu(job)

apps/macos/Sources/Clawdbot/CronSettings.swift

@@ -3,15 +3,13 @@ import SwiftUI
 
 struct CronSettings: View {
     @Bindable var store: CronJobsStore
-    @Bindable var channelsStore: ChannelsStore
     @State var showEditor = false
     @State var editingJob: CronJob?
     @State var editorError: String?
     @State var isSaving = false
     @State var confirmDelete: CronJob?
 
-    init(store: CronJobsStore = .shared, channelsStore: ChannelsStore = .shared) {
+    init(store: CronJobsStore = .shared) {
         self.store = store
-        self.channelsStore = channelsStore
     }
 }

apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift

@@ -46,7 +46,6 @@ private struct ExecHostRequest: Codable {
     var needsScreenRecording: Bool?
     var agentId: String?
     var sessionKey: String?
-    var approvalDecision: ExecApprovalDecision?
 }
 
 private struct ExecHostRunResult: Codable {
@@ -329,21 +328,8 @@ private enum ExecHostExecutor {
             return false
         }()
 
-        let approvalDecision = request.approvalDecision
-        if approvalDecision == .deny {
-            return ExecHostResponse(
-                type: "exec-res",
-                id: UUID().uuidString,
-                ok: false,
-                payload: nil,
-                error: ExecHostError(
-                    code: "UNAVAILABLE",
-                    message: "SYSTEM_RUN_DENIED: user denied",
-                    reason: "user-denied"))
-        }
-
-        var approvedByAsk = approvalDecision != nil
-        if requiresAsk, approvalDecision == nil {
+        var approvedByAsk = false
+        if requiresAsk {
             let decision = ExecApprovalsPromptPresenter.prompt(
                 ExecApprovalPromptRequest(
                     command: displayCommand,
@@ -378,13 +364,6 @@ private enum ExecHostExecutor {
             }
         }
 
-        if approvalDecision == .allowAlways, security == .allowlist {
-            let pattern = resolution?.resolvedPath ?? resolution?.rawExecutable ?? command.first ?? ""
-            if !pattern.isEmpty {
-                ExecApprovalsStore.addAllowlistEntry(agentId: trimmedAgent, pattern: pattern)
-            }
-        }
-
         if security == .allowlist, allowlistMatch == nil, !skillAllow, !approvedByAsk {
             return ExecHostResponse(
                 type: "exec-res",

apps/macos/Sources/Clawdbot/GatewayConnection.swift

@@ -15,7 +15,6 @@ enum GatewayAgentChannel: String, Codable, CaseIterable, Sendable {
     case signal
     case imessage
     case msteams
-    case bluebubbles
     case webchat
 
     init(raw: String?) {

apps/macos/Sources/ClawdbotWizardCLI/main.swift

@@ -1,10 +1,7 @@
-import ClawdbotKit
 import ClawdbotProtocol
 import Darwin
 import Foundation
 
-private typealias ProtoAnyCodable = ClawdbotProtocol.AnyCodable
-
 struct WizardCliOptions {
     var url: String?
     var token: String?
@@ -231,10 +228,6 @@ private func parseInt(_ value: Any?) -> Int? {
 }
 
 actor GatewayWizardClient {
-    private enum ConnectChallengeError: Error {
-        case timeout
-    }
-
     private let url: URL
     private let token: String?
     private let password: String?
@@ -242,7 +235,6 @@ actor GatewayWizardClient {
     private let encoder = JSONEncoder()
     private let decoder = JSONDecoder()
     private let session = URLSession(configuration: .default)
-    private let connectChallengeTimeoutSeconds: Double = 0.75
     private var task: URLSessionWebSocketTask?
 
     init(url: URL, token: String?, password: String?, json: Bool) {
@@ -265,7 +257,7 @@ actor GatewayWizardClient {
         self.task = nil
     }
 
-    func request(method: String, params: [String: ProtoAnyCodable]?) async throws -> ResponseFrame {
+    func request(method: String, params: [String: AnyCodable]?) async throws -> ResponseFrame {
         guard let task = self.task else {
             throw WizardCliError.gatewayError("gateway not connected")
         }
@@ -274,7 +266,7 @@ actor GatewayWizardClient {
             type: "req",
             id: id,
             method: method,
-            params: params.map { ProtoAnyCodable($0) })
+            params: params.map { AnyCodable($0) })
         let data = try self.encoder.encode(frame)
         try await task.send(.data(data))
 
@@ -317,65 +309,28 @@ actor GatewayWizardClient {
         }
         let osVersion = ProcessInfo.processInfo.operatingSystemVersion
         let platform = "macos \(osVersion.majorVersion).\(osVersion.minorVersion).\(osVersion.patchVersion)"
-        let clientId = "clawdbot-macos"
-        let clientMode = "ui"
-        let role = "operator"
-        let scopes: [String] = []
-        let client: [String: ProtoAnyCodable] = [
-            "id": ProtoAnyCodable(clientId),
-            "displayName": ProtoAnyCodable(Host.current().localizedName ?? "Clawdbot macOS Wizard CLI"),
-            "version": ProtoAnyCodable("dev"),
-            "platform": ProtoAnyCodable(platform),
-            "deviceFamily": ProtoAnyCodable("Mac"),
-            "mode": ProtoAnyCodable(clientMode),
-            "instanceId": ProtoAnyCodable(UUID().uuidString),
+        let client: [String: AnyCodable] = [
+            "id": AnyCodable("clawdbot-macos"),
+            "displayName": AnyCodable(Host.current().localizedName ?? "Clawdbot macOS Wizard CLI"),
+            "version": AnyCodable("dev"),
+            "platform": AnyCodable(platform),
+            "deviceFamily": AnyCodable("Mac"),
+            "mode": AnyCodable("ui"),
+            "instanceId": AnyCodable(UUID().uuidString),
         ]
 
-        var params: [String: ProtoAnyCodable] = [
-            "minProtocol": ProtoAnyCodable(GATEWAY_PROTOCOL_VERSION),
-            "maxProtocol": ProtoAnyCodable(GATEWAY_PROTOCOL_VERSION),
-            "client": ProtoAnyCodable(client),
-            "caps": ProtoAnyCodable([String]()),
-            "locale": ProtoAnyCodable(Locale.preferredLanguages.first ?? Locale.current.identifier),
-            "userAgent": ProtoAnyCodable(ProcessInfo.processInfo.operatingSystemVersionString),
-            "role": ProtoAnyCodable(role),
-            "scopes": ProtoAnyCodable(scopes),
+        var params: [String: AnyCodable] = [
+            "minProtocol": AnyCodable(GATEWAY_PROTOCOL_VERSION),
+            "maxProtocol": AnyCodable(GATEWAY_PROTOCOL_VERSION),
+            "client": AnyCodable(client),
+            "caps": AnyCodable([String]()),
+            "locale": AnyCodable(Locale.preferredLanguages.first ?? Locale.current.identifier),
+            "userAgent": AnyCodable(ProcessInfo.processInfo.operatingSystemVersionString),
         ]
         if let token = self.token {
-            params["auth"] = ProtoAnyCodable(["token": ProtoAnyCodable(token)])
+            params["auth"] = AnyCodable(["token": AnyCodable(token)])
         } else if let password = self.password {
-            params["auth"] = ProtoAnyCodable(["password": ProtoAnyCodable(password)])
-        }
-        let connectNonce = try await self.waitForConnectChallenge()
-        let identity = DeviceIdentityStore.loadOrCreate()
-        let signedAtMs = Int(Date().timeIntervalSince1970 * 1000)
-        let scopesValue = scopes.joined(separator: ",")
-        var payloadParts = [
-            connectNonce == nil ? "v1" : "v2",
-            identity.deviceId,
-            clientId,
-            clientMode,
-            role,
-            scopesValue,
-            String(signedAtMs),
-            self.token ?? "",
-        ]
-        if let connectNonce {
-            payloadParts.append(connectNonce)
-        }
-        let payload = payloadParts.joined(separator: "|")
-        if let signature = DeviceIdentityStore.signPayload(payload, identity: identity),
-           let publicKey = DeviceIdentityStore.publicKeyBase64Url(identity) {
-            var device: [String: ProtoAnyCodable] = [
-                "id": ProtoAnyCodable(identity.deviceId),
-                "publicKey": ProtoAnyCodable(publicKey),
-                "signature": ProtoAnyCodable(signature),
-                "signedAt": ProtoAnyCodable(signedAtMs),
-            ]
-            if let connectNonce {
-                device["nonce"] = ProtoAnyCodable(connectNonce)
-            }
-            params["device"] = ProtoAnyCodable(device)
+            params["auth"] = AnyCodable(["password": AnyCodable(password)])
         }
 
         let reqId = UUID().uuidString
@@ -383,57 +338,31 @@ actor GatewayWizardClient {
             type: "req",
             id: reqId,
             method: "connect",
-            params: ProtoAnyCodable(params))
+            params: AnyCodable(params))
         let data = try self.encoder.encode(frame)
         try await task.send(.data(data))
 
-        while true {
-            let message = try await task.receive()
-            let frameResponse = try decodeFrame(message)
-            if case let .res(res) = frameResponse, res.id == reqId {
-                if res.ok == false {
-                    let msg = (res.error?["message"]?.value as? String) ?? "gateway connect failed"
-                    throw WizardCliError.gatewayError(msg)
-                }
-                _ = try self.decodePayload(res, as: HelloOk.self)
-                return
-            }
+        let message = try await task.receive()
+        let frameResponse = try decodeFrame(message)
+        guard case let .res(res) = frameResponse, res.id == reqId else {
+            throw WizardCliError.gatewayError("connect failed (unexpected response)")
         }
-    }
-
-    private func waitForConnectChallenge() async throws -> String? {
-        guard let task = self.task else { return nil }
-        do {
-            return try await AsyncTimeout.withTimeout(
-                seconds: self.connectChallengeTimeoutSeconds,
-                onTimeout: { ConnectChallengeError.timeout },
-                operation: {
-                    while true {
-                        let message = try await task.receive()
-                        let frame = try decodeFrame(message)
-                        if case let .event(evt) = frame, evt.event == "connect.challenge" {
-                            if let payload = evt.payload?.value as? [String: ProtoAnyCodable],
-                               let nonce = payload["nonce"]?.value as? String {
-                                return nonce
-                            }
-                        }
-                    }
-                })
-        } catch {
-            if error is ConnectChallengeError { return nil }
-            throw error
+        if res.ok == false {
+            let msg = (res.error?["message"]?.value as? String) ?? "gateway connect failed"
+            throw WizardCliError.gatewayError(msg)
         }
+        _ = try self.decodePayload(res, as: HelloOk.self)
     }
 }
 
 private func runWizard(client: GatewayWizardClient, opts: WizardCliOptions) async throws {
-    var params: [String: ProtoAnyCodable] = [:]
+    var params: [String: AnyCodable] = [:]
     let mode = opts.mode.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
     if mode == "local" || mode == "remote" {
-        params["mode"] = ProtoAnyCodable(mode)
+        params["mode"] = AnyCodable(mode)
     }
     if let workspace = opts.workspace?.trimmingCharacters(in: .whitespacesAndNewlines), !workspace.isEmpty {
-        params["workspace"] = ProtoAnyCodable(workspace)
+        params["workspace"] = AnyCodable(workspace)
     }
 
     let startResponse = try await client.request(method: "wizard.start", params: params)
@@ -466,17 +395,17 @@ private func runWizard(client: GatewayWizardClient, opts: WizardCliOptions) asyn
 
             if let step = decodeWizardStep(nextResult.step) {
                 let answer = try promptAnswer(for: step)
-                var answerPayload: [String: ProtoAnyCodable] = [
-                    "stepId": ProtoAnyCodable(step.id),
+                var answerPayload: [String: AnyCodable] = [
+                    "stepId": AnyCodable(step.id),
                 ]
                 if !(answer is NSNull) {
-                    answerPayload["value"] = ProtoAnyCodable(answer)
+                    answerPayload["value"] = AnyCodable(answer)
                 }
                 let response = try await client.request(
                     method: "wizard.next",
                     params: [
-                        "sessionId": ProtoAnyCodable(sessionId),
-                        "answer": ProtoAnyCodable(answerPayload),
+                        "sessionId": AnyCodable(sessionId),
+                        "answer": AnyCodable(answerPayload),
                     ])
                 nextResult = try await client.decodePayload(response, as: WizardNextResult.self)
                 if opts.json {
@@ -485,7 +414,7 @@ private func runWizard(client: GatewayWizardClient, opts: WizardCliOptions) asyn
             } else {
                 let response = try await client.request(
                     method: "wizard.next",
-                    params: ["sessionId": ProtoAnyCodable(sessionId)])
+                    params: ["sessionId": AnyCodable(sessionId)])
                 nextResult = try await client.decodePayload(response, as: WizardNextResult.self)
                 if opts.json {
                     dumpResult(response)
@@ -495,7 +424,7 @@ private func runWizard(client: GatewayWizardClient, opts: WizardCliOptions) asyn
     } catch WizardCliError.cancelled {
         _ = try? await client.request(
             method: "wizard.cancel",
-            params: ["sessionId": ProtoAnyCodable(sessionId)])
+            params: ["sessionId": AnyCodable(sessionId)])
         throw WizardCliError.cancelled
     }
 }

apps/macos/Tests/ClawdbotIPCTests/GatewayAgentChannelTests.swift

@@ -11,7 +11,6 @@ import Testing
         #expect(GatewayAgentChannel.last.shouldDeliver(true) == true)
         #expect(GatewayAgentChannel.whatsapp.shouldDeliver(true) == true)
         #expect(GatewayAgentChannel.telegram.shouldDeliver(true) == true)
-        #expect(GatewayAgentChannel.bluebubbles.shouldDeliver(true) == true)
         #expect(GatewayAgentChannel.last.shouldDeliver(false) == false)
     }
 
@@ -19,7 +18,6 @@ import Testing
         #expect(GatewayAgentChannel(raw: nil) == .last)
         #expect(GatewayAgentChannel(raw: "  ") == .last)
         #expect(GatewayAgentChannel(raw: "WEBCHAT") == .webchat)
-        #expect(GatewayAgentChannel(raw: "BLUEBUBBLES") == .bluebubbles)
         #expect(GatewayAgentChannel(raw: "unknown") == .last)
     }
 }

apps/shared/ClawdbotKit/Sources/ClawdbotKit/DeviceAuthStore.swift

@@ -1,107 +0,0 @@
-import Foundation
-
-public struct DeviceAuthEntry: Codable, Sendable {
-    public let token: String
-    public let role: String
-    public let scopes: [String]
-    public let updatedAtMs: Int
-
-    public init(token: String, role: String, scopes: [String], updatedAtMs: Int) {
-        self.token = token
-        self.role = role
-        self.scopes = scopes
-        self.updatedAtMs = updatedAtMs
-    }
-}
-
-private struct DeviceAuthStoreFile: Codable {
-    var version: Int
-    var deviceId: String
-    var tokens: [String: DeviceAuthEntry]
-}
-
-public enum DeviceAuthStore {
-    private static let fileName = "device-auth.json"
-
-    public static func loadToken(deviceId: String, role: String) -> DeviceAuthEntry? {
-        guard let store = readStore(), store.deviceId == deviceId else { return nil }
-        let role = normalizeRole(role)
-        return store.tokens[role]
-    }
-
-    public static func storeToken(
-        deviceId: String,
-        role: String,
-        token: String,
-        scopes: [String] = []
-    ) -> DeviceAuthEntry {
-        let normalizedRole = normalizeRole(role)
-        var next = readStore()
-        if next?.deviceId != deviceId {
-            next = DeviceAuthStoreFile(version: 1, deviceId: deviceId, tokens: [:])
-        }
-        let entry = DeviceAuthEntry(
-            token: token,
-            role: normalizedRole,
-            scopes: normalizeScopes(scopes),
-            updatedAtMs: Int(Date().timeIntervalSince1970 * 1000)
-        )
-        if next == nil {
-            next = DeviceAuthStoreFile(version: 1, deviceId: deviceId, tokens: [:])
-        }
-        next?.tokens[normalizedRole] = entry
-        if let store = next {
-            writeStore(store)
-        }
-        return entry
-    }
-
-    public static func clearToken(deviceId: String, role: String) {
-        guard var store = readStore(), store.deviceId == deviceId else { return }
-        let normalizedRole = normalizeRole(role)
-        guard store.tokens[normalizedRole] != nil else { return }
-        store.tokens.removeValue(forKey: normalizedRole)
-        writeStore(store)
-    }
-
-    private static func normalizeRole(_ role: String) -> String {
-        role.trimmingCharacters(in: .whitespacesAndNewlines)
-    }
-
-    private static func normalizeScopes(_ scopes: [String]) -> [String] {
-        let trimmed = scopes
-            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
-            .filter { !$0.isEmpty }
-        return Array(Set(trimmed)).sorted()
-    }
-
-    private static func fileURL() -> URL {
-        DeviceIdentityPaths.stateDirURL()
-            .appendingPathComponent("identity", isDirectory: true)
-            .appendingPathComponent(fileName, isDirectory: false)
-    }
-
-    private static func readStore() -> DeviceAuthStoreFile? {
-        let url = fileURL()
-        guard let data = try? Data(contentsOf: url) else { return nil }
-        guard let decoded = try? JSONDecoder().decode(DeviceAuthStoreFile.self, from: data) else {
-            return nil
-        }
-        guard decoded.version == 1 else { return nil }
-        return decoded
-    }
-
-    private static func writeStore(_ store: DeviceAuthStoreFile) {
-        let url = fileURL()
-        do {
-            try FileManager.default.createDirectory(
-                at: url.deletingLastPathComponent(),
-                withIntermediateDirectories: true)
-            let data = try JSONEncoder().encode(store)
-            try data.write(to: url, options: [.atomic])
-            try? FileManager.default.setAttributes([.posixPermissions: 0o600], ofItemAtPath: url.path)
-        } catch {
-            // best-effort only
-        }
-    }
-}

apps/shared/ClawdbotKit/Sources/ClawdbotKit/DeviceIdentity.swift

@@ -1,18 +1,11 @@
 import CryptoKit
 import Foundation
 
-public struct DeviceIdentity: Codable, Sendable {
-    public var deviceId: String
-    public var publicKey: String
-    public var privateKey: String
-    public var createdAtMs: Int
-
-    public init(deviceId: String, publicKey: String, privateKey: String, createdAtMs: Int) {
-        self.deviceId = deviceId
-        self.publicKey = publicKey
-        self.privateKey = privateKey
-        self.createdAtMs = createdAtMs
-    }
+struct DeviceIdentity: Codable, Sendable {
+    var deviceId: String
+    var publicKey: String
+    var privateKey: String
+    var createdAtMs: Int
 }
 
 enum DeviceIdentityPaths {
@@ -34,10 +27,10 @@ enum DeviceIdentityPaths {
     }
 }
 
-public enum DeviceIdentityStore {
+enum DeviceIdentityStore {
     private static let fileName = "device.json"
 
-    public static func loadOrCreate() -> DeviceIdentity {
+    static func loadOrCreate() -> DeviceIdentity {
         let url = self.fileURL()
         if let data = try? Data(contentsOf: url),
            let decoded = try? JSONDecoder().decode(DeviceIdentity.self, from: data),
@@ -51,7 +44,7 @@ public enum DeviceIdentityStore {
         return identity
     }
 
-    public static func signPayload(_ payload: String, identity: DeviceIdentity) -> String? {
+    static func signPayload(_ payload: String, identity: DeviceIdentity) -> String? {
         guard let privateKeyData = Data(base64Encoded: identity.privateKey) else { return nil }
         do {
             let privateKey = try Curve25519.Signing.PrivateKey(rawRepresentation: privateKeyData)
@@ -83,7 +76,7 @@ public enum DeviceIdentityStore {
             .replacingOccurrences(of: "=", with: "")
     }
 
-    public static func publicKeyBase64Url(_ identity: DeviceIdentity) -> String? {
+    static func publicKeyBase64Url(_ identity: DeviceIdentity) -> String? {
         guard let data = Data(base64Encoded: identity.publicKey) else { return nil }
         return self.base64UrlEncode(data)
     }

apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift

@@ -94,10 +94,6 @@ public struct GatewayConnectOptions: Sendable {
 // Avoid ambiguity with the app's own AnyCodable type.
 private typealias ProtoAnyCodable = ClawdbotProtocol.AnyCodable
 
-private enum ConnectChallengeError: Error {
-    case timeout
-}
-
 public actor GatewayChannelActor {
     private let logger = Logger(subsystem: "com.clawdbot", category: "gateway")
     private var task: WebSocketTaskBox?
@@ -117,7 +113,6 @@ public actor GatewayChannelActor {
     private let decoder = JSONDecoder()
     private let encoder = JSONEncoder()
     private let connectTimeoutSeconds: Double = 6
-    private let connectChallengeTimeoutSeconds: Double = 0.75
     private var watchdogTask: Task<Void, Never>?
     private var tickTask: Task<Void, Never>?
     private let defaultRequestTimeoutMs: Double = 15000
@@ -261,8 +256,6 @@ public actor GatewayChannelActor {
         let clientDisplayName = options.clientDisplayName ?? InstanceIdentity.displayName
         let clientId = options.clientId
         let clientMode = options.clientMode
-        let role = options.role
-        let scopes = options.scopes
 
         let reqId = UUID().uuidString
         var client: [String: ProtoAnyCodable] = [
@@ -285,8 +278,8 @@ public actor GatewayChannelActor {
             "caps": ProtoAnyCodable(options.caps),
             "locale": ProtoAnyCodable(primaryLocale),
             "userAgent": ProtoAnyCodable(ProcessInfo.processInfo.operatingSystemVersionString),
-            "role": ProtoAnyCodable(role),
-            "scopes": ProtoAnyCodable(scopes),
+            "role": ProtoAnyCodable(options.role),
+            "scopes": ProtoAnyCodable(options.scopes),
         ]
         if !options.commands.isEmpty {
             params["commands"] = ProtoAnyCodable(options.commands)
@@ -294,44 +287,32 @@ public actor GatewayChannelActor {
         if !options.permissions.isEmpty {
             params["permissions"] = ProtoAnyCodable(options.permissions)
         }
-        let identity = DeviceIdentityStore.loadOrCreate()
-        let storedToken = DeviceAuthStore.loadToken(deviceId: identity.deviceId, role: role)?.token
-        let authToken = storedToken ?? self.token
-        let canFallbackToShared = storedToken != nil && self.token != nil
-        if let authToken {
-            params["auth"] = ProtoAnyCodable(["token": ProtoAnyCodable(authToken)])
+        if let token = self.token {
+            params["auth"] = ProtoAnyCodable(["token": ProtoAnyCodable(token)])
         } else if let password = self.password {
             params["auth"] = ProtoAnyCodable(["password": ProtoAnyCodable(password)])
         }
+        let identity = DeviceIdentityStore.loadOrCreate()
         let signedAtMs = Int(Date().timeIntervalSince1970 * 1000)
-        let connectNonce = try await self.waitForConnectChallenge()
-        let scopesValue = scopes.joined(separator: ",")
-        var payloadParts = [
-            connectNonce == nil ? "v1" : "v2",
+        let scopes = options.scopes.joined(separator: ",")
+        let payload = [
+            "v1",
             identity.deviceId,
             clientId,
             clientMode,
-            role,
-            scopesValue,
+            options.role,
+            scopes,
             String(signedAtMs),
-            authToken ?? "",
-        ]
-        if let connectNonce {
-            payloadParts.append(connectNonce)
-        }
-        let payload = payloadParts.joined(separator: "|")
+            self.token ?? "",
+        ].joined(separator: "|")
         if let signature = DeviceIdentityStore.signPayload(payload, identity: identity),
            let publicKey = DeviceIdentityStore.publicKeyBase64Url(identity) {
-            var device: [String: ProtoAnyCodable] = [
+            params["device"] = ProtoAnyCodable([
                 "id": ProtoAnyCodable(identity.deviceId),
                 "publicKey": ProtoAnyCodable(publicKey),
                 "signature": ProtoAnyCodable(signature),
                 "signedAt": ProtoAnyCodable(signedAtMs),
-            ]
-            if let connectNonce {
-                device["nonce"] = ProtoAnyCodable(connectNonce)
-            }
-            params["device"] = ProtoAnyCodable(device)
+            ])
         }
 
         let frame = RequestFrame(
@@ -341,22 +322,40 @@ public actor GatewayChannelActor {
             params: ProtoAnyCodable(params))
         let data = try self.encoder.encode(frame)
         try await self.task?.send(.data(data))
-        do {
-            let response = try await self.waitForConnectResponse(reqId: reqId)
-            try await self.handleConnectResponse(response, identity: identity, role: role)
-        } catch {
-            if canFallbackToShared {
-                DeviceAuthStore.clearToken(deviceId: identity.deviceId, role: role)
-            }
-            throw error
+        guard let msg = try await task?.receive() else {
+            throw NSError(
+                domain: "Gateway",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "connect failed (no response)"])
         }
+        try await self.handleConnectResponse(msg, reqId: reqId)
     }
 
-    private func handleConnectResponse(
-        _ res: ResponseFrame,
-        identity: DeviceIdentity,
-        role: String
-    ) async throws {
+    private func handleConnectResponse(_ msg: URLSessionWebSocketTask.Message, reqId: String) async throws {
+        let data: Data? = switch msg {
+        case let .data(d): d
+        case let .string(s): s.data(using: .utf8)
+        @unknown default: nil
+        }
+        guard let data else {
+            throw NSError(
+                domain: "Gateway",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "connect failed (empty response)"])
+        }
+        let decoder = JSONDecoder()
+        guard let frame = try? decoder.decode(GatewayFrame.self, from: data) else {
+            throw NSError(
+                domain: "Gateway",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "connect failed (invalid response)"])
+        }
+        guard case let .res(res) = frame, res.id == reqId else {
+            throw NSError(
+                domain: "Gateway",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "connect failed (unexpected response)"])
+        }
         if res.ok == false {
             let msg = (res.error?["message"]?.value as? String) ?? "gateway connect failed"
             throw NSError(domain: "Gateway", code: 1008, userInfo: [NSLocalizedDescriptionKey: msg])
@@ -374,17 +373,6 @@ public actor GatewayChannelActor {
         } else if let tick = ok.policy["tickIntervalMs"]?.value as? Int {
             self.tickIntervalMs = Double(tick)
         }
-        if let auth = ok.auth,
-           let deviceToken = auth["deviceToken"]?.value as? String {
-            let authRole = auth["role"]?.value as? String ?? role
-            let scopes = (auth["scopes"]?.value as? [ProtoAnyCodable])?
-                .compactMap { $0.value as? String } ?? []
-            _ = DeviceAuthStore.storeToken(
-                deviceId: identity.deviceId,
-                role: authRole,
-                token: deviceToken,
-                scopes: scopes)
-        }
         self.lastTick = Date()
         self.tickTask?.cancel()
         self.tickTask = Task { [weak self] in
@@ -436,7 +424,6 @@ public actor GatewayChannelActor {
                 waiter.resume(returning: .res(res))
             }
         case let .event(evt):
-            if evt.event == "connect.challenge" { return }
             if let seq = evt.seq {
                 if let last = lastSeq, seq > last + 1 {
                     await self.pushHandler?(.seqGap(expected: last + 1, received: seq))
@@ -450,63 +437,6 @@ public actor GatewayChannelActor {
         }
     }
 
-    private func waitForConnectChallenge() async throws -> String? {
-        guard let task = self.task else { return nil }
-        do {
-            return try await AsyncTimeout.withTimeout(
-                seconds: self.connectChallengeTimeoutSeconds,
-                onTimeout: { ConnectChallengeError.timeout },
-                operation: { [weak self] in
-                    guard let self else { return nil }
-                    while true {
-                        let msg = try await task.receive()
-                        guard let data = self.decodeMessageData(msg) else { continue }
-                        guard let frame = try? self.decoder.decode(GatewayFrame.self, from: data) else { continue }
-                        if case let .event(evt) = frame, evt.event == "connect.challenge" {
-                            if let payload = evt.payload?.value as? [String: ProtoAnyCodable],
-                               let nonce = payload["nonce"]?.value as? String {
-                                return nonce
-                            }
-                        }
-                    }
-                })
-        } catch {
-            if error is ConnectChallengeError { return nil }
-            throw error
-        }
-    }
-
-    private func waitForConnectResponse(reqId: String) async throws -> ResponseFrame {
-        guard let task = self.task else {
-            throw NSError(
-                domain: "Gateway",
-                code: 1,
-                userInfo: [NSLocalizedDescriptionKey: "connect failed (no response)"])
-        }
-        while true {
-            let msg = try await task.receive()
-            guard let data = self.decodeMessageData(msg) else { continue }
-            guard let frame = try? self.decoder.decode(GatewayFrame.self, from: data) else {
-                throw NSError(
-                    domain: "Gateway",
-                    code: 1,
-                    userInfo: [NSLocalizedDescriptionKey: "connect failed (invalid response)"])
-            }
-            if case let .res(res) = frame, res.id == reqId {
-                return res
-            }
-        }
-    }
-
-    private func decodeMessageData(_ msg: URLSessionWebSocketTask.Message) -> Data? {
-        let data: Data? = switch msg {
-        case let .data(data): data
-        case let .string(text): text.data(using: .utf8)
-        @unknown default: nil
-        }
-        return data
-    }
-
     private func watchTicks() async {
         let tolerance = self.tickIntervalMs * 2
         while self.connected {

apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift

@@ -5,7 +5,6 @@ public let GATEWAY_PROTOCOL_VERSION = 3
 
 public enum ErrorCode: String, Codable, Sendable {
     case notLinked = "NOT_LINKED"
-    case notPaired = "NOT_PAIRED"
     case agentTimeout = "AGENT_TIMEOUT"
     case invalidRequest = "INVALID_REQUEST"
     case unavailable = "UNAVAILABLE"
@@ -16,11 +15,6 @@ public struct ConnectParams: Codable, Sendable {
     public let maxprotocol: Int
     public let client: [String: AnyCodable]
     public let caps: [String]?
-    public let commands: [String]?
-    public let permissions: [String: AnyCodable]?
-    public let role: String?
-    public let scopes: [String]?
-    public let device: [String: AnyCodable]?
     public let auth: [String: AnyCodable]?
     public let locale: String?
     public let useragent: String?
@@ -30,11 +24,6 @@ public struct ConnectParams: Codable, Sendable {
         maxprotocol: Int,
         client: [String: AnyCodable],
         caps: [String]?,
-        commands: [String]?,
-        permissions: [String: AnyCodable]?,
-        role: String?,
-        scopes: [String]?,
-        device: [String: AnyCodable]?,
         auth: [String: AnyCodable]?,
         locale: String?,
         useragent: String?
@@ -43,11 +32,6 @@ public struct ConnectParams: Codable, Sendable {
         self.maxprotocol = maxprotocol
         self.client = client
         self.caps = caps
-        self.commands = commands
-        self.permissions = permissions
-        self.role = role
-        self.scopes = scopes
-        self.device = device
         self.auth = auth
         self.locale = locale
         self.useragent = useragent
@@ -57,11 +41,6 @@ public struct ConnectParams: Codable, Sendable {
         case maxprotocol = "maxProtocol"
         case client
         case caps
-        case commands
-        case permissions
-        case role
-        case scopes
-        case device
         case auth
         case locale
         case useragent = "userAgent"
@@ -75,7 +54,6 @@ public struct HelloOk: Codable, Sendable {
     public let features: [String: AnyCodable]
     public let snapshot: Snapshot
     public let canvashosturl: String?
-    public let auth: [String: AnyCodable]?
     public let policy: [String: AnyCodable]
 
     public init(
@@ -85,7 +63,6 @@ public struct HelloOk: Codable, Sendable {
         features: [String: AnyCodable],
         snapshot: Snapshot,
         canvashosturl: String?,
-        auth: [String: AnyCodable]?,
         policy: [String: AnyCodable]
     ) {
         self.type = type
@@ -94,7 +71,6 @@ public struct HelloOk: Codable, Sendable {
         self.features = features
         self.snapshot = snapshot
         self.canvashosturl = canvashosturl
-        self.auth = auth
         self.policy = policy
     }
     private enum CodingKeys: String, CodingKey {
@@ -104,7 +80,6 @@ public struct HelloOk: Codable, Sendable {
         case features
         case snapshot
         case canvashosturl = "canvasHostUrl"
-        case auth
         case policy
     }
 }
@@ -205,9 +180,6 @@ public struct PresenceEntry: Codable, Sendable {
     public let tags: [String]?
     public let text: String?
     public let ts: Int
-    public let deviceid: String?
-    public let roles: [String]?
-    public let scopes: [String]?
     public let instanceid: String?
 
     public init(
@@ -223,9 +195,6 @@ public struct PresenceEntry: Codable, Sendable {
         tags: [String]?,
         text: String?,
         ts: Int,
-        deviceid: String?,
-        roles: [String]?,
-        scopes: [String]?,
         instanceid: String?
     ) {
         self.host = host
@@ -240,9 +209,6 @@ public struct PresenceEntry: Codable, Sendable {
         self.tags = tags
         self.text = text
         self.ts = ts
-        self.deviceid = deviceid
-        self.roles = roles
-        self.scopes = scopes
         self.instanceid = instanceid
     }
     private enum CodingKeys: String, CodingKey {
@@ -258,9 +224,6 @@ public struct PresenceEntry: Codable, Sendable {
         case tags
         case text
         case ts
-        case deviceid = "deviceId"
-        case roles
-        case scopes
         case instanceid = "instanceId"
     }
 }
@@ -743,93 +706,6 @@ public struct NodeInvokeParams: Codable, Sendable {
     }
 }
 
-public struct NodeInvokeResultParams: Codable, Sendable {
-    public let id: String
-    public let nodeid: String
-    public let ok: Bool
-    public let payload: AnyCodable?
-    public let payloadjson: String?
-    public let error: [String: AnyCodable]?
-
-    public init(
-        id: String,
-        nodeid: String,
-        ok: Bool,
-        payload: AnyCodable?,
-        payloadjson: String?,
-        error: [String: AnyCodable]?
-    ) {
-        self.id = id
-        self.nodeid = nodeid
-        self.ok = ok
-        self.payload = payload
-        self.payloadjson = payloadjson
-        self.error = error
-    }
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case nodeid = "nodeId"
-        case ok
-        case payload
-        case payloadjson = "payloadJSON"
-        case error
-    }
-}
-
-public struct NodeEventParams: Codable, Sendable {
-    public let event: String
-    public let payload: AnyCodable?
-    public let payloadjson: String?
-
-    public init(
-        event: String,
-        payload: AnyCodable?,
-        payloadjson: String?
-    ) {
-        self.event = event
-        self.payload = payload
-        self.payloadjson = payloadjson
-    }
-    private enum CodingKeys: String, CodingKey {
-        case event
-        case payload
-        case payloadjson = "payloadJSON"
-    }
-}
-
-public struct NodeInvokeRequestEvent: Codable, Sendable {
-    public let id: String
-    public let nodeid: String
-    public let command: String
-    public let paramsjson: String?
-    public let timeoutms: Int?
-    public let idempotencykey: String?
-
-    public init(
-        id: String,
-        nodeid: String,
-        command: String,
-        paramsjson: String?,
-        timeoutms: Int?,
-        idempotencykey: String?
-    ) {
-        self.id = id
-        self.nodeid = nodeid
-        self.command = command
-        self.paramsjson = paramsjson
-        self.timeoutms = timeoutms
-        self.idempotencykey = idempotencykey
-    }
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case nodeid = "nodeId"
-        case command
-        case paramsjson = "paramsJSON"
-        case timeoutms = "timeoutMs"
-        case idempotencykey = "idempotencyKey"
-    }
-}
-
 public struct SessionsListParams: Codable, Sendable {
     public let limit: Int?
     public let activeminutes: Int?
@@ -1505,22 +1381,6 @@ public struct ModelsListResult: Codable, Sendable {
 public struct SkillsStatusParams: Codable, Sendable {
 }
 
-public struct SkillsBinsParams: Codable, Sendable {
-}
-
-public struct SkillsBinsResult: Codable, Sendable {
-    public let bins: [String]
-
-    public init(
-        bins: [String]
-    ) {
-        self.bins = bins
-    }
-    private enum CodingKeys: String, CodingKey {
-        case bins
-    }
-}
-
 public struct SkillsInstallParams: Codable, Sendable {
     public let name: String
     public let installid: String
@@ -1875,225 +1735,6 @@ public struct ExecApprovalsSnapshot: Codable, Sendable {
     }
 }
 
-public struct ExecApprovalRequestParams: Codable, Sendable {
-    public let command: String
-    public let cwd: String?
-    public let host: String?
-    public let security: String?
-    public let ask: String?
-    public let agentid: String?
-    public let resolvedpath: String?
-    public let sessionkey: String?
-    public let timeoutms: Int?
-
-    public init(
-        command: String,
-        cwd: String?,
-        host: String?,
-        security: String?,
-        ask: String?,
-        agentid: String?,
-        resolvedpath: String?,
-        sessionkey: String?,
-        timeoutms: Int?
-    ) {
-        self.command = command
-        self.cwd = cwd
-        self.host = host
-        self.security = security
-        self.ask = ask
-        self.agentid = agentid
-        self.resolvedpath = resolvedpath
-        self.sessionkey = sessionkey
-        self.timeoutms = timeoutms
-    }
-    private enum CodingKeys: String, CodingKey {
-        case command
-        case cwd
-        case host
-        case security
-        case ask
-        case agentid = "agentId"
-        case resolvedpath = "resolvedPath"
-        case sessionkey = "sessionKey"
-        case timeoutms = "timeoutMs"
-    }
-}
-
-public struct ExecApprovalResolveParams: Codable, Sendable {
-    public let id: String
-    public let decision: String
-
-    public init(
-        id: String,
-        decision: String
-    ) {
-        self.id = id
-        self.decision = decision
-    }
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case decision
-    }
-}
-
-public struct DevicePairListParams: Codable, Sendable {
-}
-
-public struct DevicePairApproveParams: Codable, Sendable {
-    public let requestid: String
-
-    public init(
-        requestid: String
-    ) {
-        self.requestid = requestid
-    }
-    private enum CodingKeys: String, CodingKey {
-        case requestid = "requestId"
-    }
-}
-
-public struct DevicePairRejectParams: Codable, Sendable {
-    public let requestid: String
-
-    public init(
-        requestid: String
-    ) {
-        self.requestid = requestid
-    }
-    private enum CodingKeys: String, CodingKey {
-        case requestid = "requestId"
-    }
-}
-
-public struct DeviceTokenRotateParams: Codable, Sendable {
-    public let deviceid: String
-    public let role: String
-    public let scopes: [String]?
-
-    public init(
-        deviceid: String,
-        role: String,
-        scopes: [String]?
-    ) {
-        self.deviceid = deviceid
-        self.role = role
-        self.scopes = scopes
-    }
-    private enum CodingKeys: String, CodingKey {
-        case deviceid = "deviceId"
-        case role
-        case scopes
-    }
-}
-
-public struct DeviceTokenRevokeParams: Codable, Sendable {
-    public let deviceid: String
-    public let role: String
-
-    public init(
-        deviceid: String,
-        role: String
-    ) {
-        self.deviceid = deviceid
-        self.role = role
-    }
-    private enum CodingKeys: String, CodingKey {
-        case deviceid = "deviceId"
-        case role
-    }
-}
-
-public struct DevicePairRequestedEvent: Codable, Sendable {
-    public let requestid: String
-    public let deviceid: String
-    public let publickey: String
-    public let displayname: String?
-    public let platform: String?
-    public let clientid: String?
-    public let clientmode: String?
-    public let role: String?
-    public let roles: [String]?
-    public let scopes: [String]?
-    public let remoteip: String?
-    public let silent: Bool?
-    public let isrepair: Bool?
-    public let ts: Int
-
-    public init(
-        requestid: String,
-        deviceid: String,
-        publickey: String,
-        displayname: String?,
-        platform: String?,
-        clientid: String?,
-        clientmode: String?,
-        role: String?,
-        roles: [String]?,
-        scopes: [String]?,
-        remoteip: String?,
-        silent: Bool?,
-        isrepair: Bool?,
-        ts: Int
-    ) {
-        self.requestid = requestid
-        self.deviceid = deviceid
-        self.publickey = publickey
-        self.displayname = displayname
-        self.platform = platform
-        self.clientid = clientid
-        self.clientmode = clientmode
-        self.role = role
-        self.roles = roles
-        self.scopes = scopes
-        self.remoteip = remoteip
-        self.silent = silent
-        self.isrepair = isrepair
-        self.ts = ts
-    }
-    private enum CodingKeys: String, CodingKey {
-        case requestid = "requestId"
-        case deviceid = "deviceId"
-        case publickey = "publicKey"
-        case displayname = "displayName"
-        case platform
-        case clientid = "clientId"
-        case clientmode = "clientMode"
-        case role
-        case roles
-        case scopes
-        case remoteip = "remoteIp"
-        case silent
-        case isrepair = "isRepair"
-        case ts
-    }
-}
-
-public struct DevicePairResolvedEvent: Codable, Sendable {
-    public let requestid: String
-    public let deviceid: String
-    public let decision: String
-    public let ts: Int
-
-    public init(
-        requestid: String,
-        deviceid: String,
-        decision: String,
-        ts: Int
-    ) {
-        self.requestid = requestid
-        self.deviceid = deviceid
-        self.decision = decision
-        self.ts = ts
-    }
-    private enum CodingKeys: String, CodingKey {
-        case requestid = "requestId"
-        case deviceid = "deviceId"
-        case decision
-        case ts
-    }
-}
-
 public struct ChatHistoryParams: Codable, Sendable {
     public let sessionkey: String
     public let limit: Int?

docs/channels/bluebubbles.md

@@ -1,203 +1,55 @@
 ---
-summary: "iMessage via BlueBubbles macOS server (REST send/receive, typing, reactions, pairing, advanced actions)."
+summary: "iMessage via BlueBubbles macOS server (REST send/receive, typing, reactions, pairing)."
 read_when:
   - Setting up BlueBubbles channel
   - Troubleshooting webhook pairing
-  - Configuring iMessage on macOS
 ---
 # BlueBubbles (macOS REST)
 
-Status: bundled plugin that talks to the BlueBubbles macOS server over HTTP. **Recommended for iMessage integration** due to its richer API and easier setup compared to the legacy imsg channel.
+Status: bundled plugin (disabled by default) that talks to the BlueBubbles macOS server over HTTP.
 
 ## Overview
-- Runs on macOS via the BlueBubbles helper app ([bluebubbles.app](https://bluebubbles.app)).
-- Recommended/tested: macOS Sequoia (15). macOS Tahoe (26) works; edit is currently broken on Tahoe, and group icon updates may report success but not sync.
+- Runs on macOS via the BlueBubbles helper app (`https://bluebubbles.app`).
 - Clawdbot talks to it through its REST API (`GET /api/v1/ping`, `POST /message/text`, `POST /chat/:id/*`).
 - Incoming messages arrive via webhooks; outgoing replies, typing indicators, read receipts, and tapbacks are REST calls.
 - Attachments and stickers are ingested as inbound media (and surfaced to the agent when possible).
 - Pairing/allowlist works the same way as other channels (`/start/pairing` etc) with `channels.bluebubbles.allowFrom` + pairing codes.
-- Reactions are surfaced as system events just like Slack/Telegram so agents can "mention" them before replying.
-- Advanced features: edit, unsend, reply threading, message effects, group management.
+- Reactions are surfaced as system events just like Slack/Telegram so agents can “mention” them before replying.
 
 ## Quick start
-1. Install the BlueBubbles server on your Mac (follow the instructions at [bluebubbles.app/install](https://bluebubbles.app/install)).
-2. In the BlueBubbles config, enable the web API and set a password.
-3. Run `clawdbot onboard` and select BlueBubbles, or configure manually:
+1. Install the BlueBubbles server on your Mac (follows the app store instructions at `https://bluebubbles.app/install`).
+2. In the BlueBubbles config, enable the web API and set a password for `guid`/`password`.
+3. Configure Clawdbot:
    ```json5
    {
      channels: {
        bluebubbles: {
          enabled: true,
-         serverUrl: "http://192.168.1.100:1234",
+         serverUrl: "http://bluebubbles-host:1234",
          password: "example-password",
-         webhookPath: "/bluebubbles-webhook"
+         webhookPath: "/bluebubbles-webhook",
+         actions: { reactions: true }
        }
      }
    }
    ```
-4. Point BlueBubbles webhooks to your gateway (example: `https://your-gateway-host:3000/bluebubbles-webhook?password=<password>`).
+4. Point BlueBubbles webhooks to your gateway (example: `http://your-gateway-host/bluebubbles-webhook?password=<password>`).
 5. Start the gateway; it will register the webhook handler and start pairing.
 
-## Onboarding
-BlueBubbles is available in the interactive setup wizard:
-```
-clawdbot onboard
-```
+## Configuration notes
+- `channels.bluebubbles.serverUrl`: base URL of the BlueBubbles REST API.
+- `channels.bluebubbles.password`: password that BlueBubbles expects on every request (`?password=...` or header).
+- `channels.bluebubbles.webhookPath`: HTTP path the gateway exposes for BlueBubbles webhooks.
+- `channels.bluebubbles.dmPolicy` / `groupPolicy` + `allowFrom`/`groupAllowFrom` behave like other channels; pairing/allowlist info is stored in `/pairing`.
+- `channels.bluebubbles.actions.reactions` toggles whether the gateway enqueues system events for reactions/tapbacks.
+- `channels.bluebubbles.textChunkLimit` overrides the default 4k limit.
+- `channels.bluebubbles.mediaMaxMb` controls the max size of inbound attachments saved for analysis (default 8MB).
 
-The wizard prompts for:
-- **Server URL** (required): BlueBubbles server address (e.g., `http://192.168.1.100:1234`)
-- **Password** (required): API password from BlueBubbles Server settings
-- **Webhook path** (optional): Defaults to `/bluebubbles-webhook`
-- **DM policy**: pairing, allowlist, open, or disabled
-- **Allow list**: Phone numbers, emails, or chat targets
-
-You can also add BlueBubbles via CLI:
-```
-clawdbot channels add bluebubbles --http-url http://192.168.1.100:1234 --password <password>
-```
-
-## Access control (DMs + groups)
-DMs:
-- Default: `channels.bluebubbles.dmPolicy = "pairing"`.
-- Unknown senders receive a pairing code; messages are ignored until approved (codes expire after 1 hour).
-- Approve via:
-  - `clawdbot pairing list bluebubbles`
-  - `clawdbot pairing approve bluebubbles <CODE>`
-- Pairing is the default token exchange. Details: [Pairing](/start/pairing)
-
-Groups:
-- `channels.bluebubbles.groupPolicy = open | allowlist | disabled` (default: `allowlist`).
-- `channels.bluebubbles.groupAllowFrom` controls who can trigger in groups when `allowlist` is set.
-
-### Mention gating (groups)
-BlueBubbles supports mention gating for group chats, matching iMessage/WhatsApp behavior:
-- Uses `agents.list[].groupChat.mentionPatterns` (or `messages.groupChat.mentionPatterns`) to detect mentions.
-- When `requireMention` is enabled for a group, the agent only responds when mentioned.
-- Control commands from authorized senders bypass mention gating.
-
-Per-group configuration:
-```json5
-{
-  channels: {
-    bluebubbles: {
-      groupPolicy: "allowlist",
-      groupAllowFrom: ["+15555550123"],
-      groups: {
-        "*": { requireMention: true },  // default for all groups
-        "iMessage;-;chat123": { requireMention: false }  // override for specific group
-      }
-    }
-  }
-}
-```
-
-### Command gating
-- Control commands (e.g., `/config`, `/model`) require authorization.
-- Uses `allowFrom` and `groupAllowFrom` to determine command authorization.
-- Authorized senders can run control commands even without mentioning in groups.
-
-## Typing + read receipts
-- **Typing indicators**: Sent automatically before and during response generation.
-- **Read receipts**: Controlled by `channels.bluebubbles.sendReadReceipts` (default: `true`).
-- **Typing indicators**: Clawdbot sends typing start events; BlueBubbles clears typing automatically on send or timeout (manual stop via DELETE is unreliable).
-
-```json5
-{
-  channels: {
-    bluebubbles: {
-      sendReadReceipts: false  // disable read receipts
-    }
-  }
-}
-```
-
-## Advanced actions
-BlueBubbles supports advanced message actions when enabled in config:
-
-```json5
-{
-  channels: {
-    bluebubbles: {
-      actions: {
-        reactions: true,       // tapbacks (default: true)
-        edit: true,            // edit sent messages (macOS 13+, broken on macOS 26 Tahoe)
-        unsend: true,          // unsend messages (macOS 13+)
-        reply: true,           // reply threading by message GUID
-        sendWithEffect: true,  // message effects (slam, loud, etc.)
-        renameGroup: true,     // rename group chats
-        setGroupIcon: true,    // set group chat icon/photo (flaky on macOS 26 Tahoe)
-        addParticipant: true,  // add participants to groups
-        removeParticipant: true, // remove participants from groups
-        leaveGroup: true,      // leave group chats
-        sendAttachment: true   // send attachments/media
-      }
-    }
-  }
-}
-```
-
-Available actions:
-- **react**: Add/remove tapback reactions (`messageId`, `emoji`, `remove`)
-- **edit**: Edit a sent message (`messageId`, `text`)
-- **unsend**: Unsend a message (`messageId`)
-- **reply**: Reply to a specific message (`messageId`, `text`, `to`)
-- **sendWithEffect**: Send with iMessage effect (`text`, `to`, `effectId`)
-- **renameGroup**: Rename a group chat (`chatGuid`, `displayName`)
-- **setGroupIcon**: Set a group chat's icon/photo (`chatGuid`, `media`) — flaky on macOS 26 Tahoe (API may return success but the icon does not sync).
-- **addParticipant**: Add someone to a group (`chatGuid`, `address`)
-- **removeParticipant**: Remove someone from a group (`chatGuid`, `address`)
-- **leaveGroup**: Leave a group chat (`chatGuid`)
-- **sendAttachment**: Send media/files (`to`, `buffer`, `filename`)
-
-## Block streaming
-Control whether responses are sent as a single message or streamed in blocks:
-```json5
-{
-  channels: {
-    bluebubbles: {
-      blockStreaming: true  // enable block streaming (default behavior)
-    }
-  }
-}
-```
-
-## Media + limits
-- Inbound attachments are downloaded and stored in the media cache.
-- Media cap via `channels.bluebubbles.mediaMaxMb` (default: 8 MB).
-- Outbound text is chunked to `channels.bluebubbles.textChunkLimit` (default: 4000 chars).
-
-## Configuration reference
-Full configuration: [Configuration](/gateway/configuration)
-
-Provider options:
-- `channels.bluebubbles.enabled`: Enable/disable the channel.
-- `channels.bluebubbles.serverUrl`: BlueBubbles REST API base URL.
-- `channels.bluebubbles.password`: API password.
-- `channels.bluebubbles.webhookPath`: Webhook endpoint path (default: `/bluebubbles-webhook`).
-- `channels.bluebubbles.dmPolicy`: `pairing | allowlist | open | disabled` (default: `pairing`).
-- `channels.bluebubbles.allowFrom`: DM allowlist (handles, emails, E.164 numbers, `chat_id:*`, `chat_guid:*`).
-- `channels.bluebubbles.groupPolicy`: `open | allowlist | disabled` (default: `allowlist`).
-- `channels.bluebubbles.groupAllowFrom`: Group sender allowlist.
-- `channels.bluebubbles.groups`: Per-group config (`requireMention`, etc.).
-- `channels.bluebubbles.sendReadReceipts`: Send read receipts (default: `true`).
-- `channels.bluebubbles.blockStreaming`: Enable block streaming (default: `true`).
-- `channels.bluebubbles.textChunkLimit`: Outbound chunk size in chars (default: 4000).
-- `channels.bluebubbles.mediaMaxMb`: Inbound media cap in MB (default: 8).
-- `channels.bluebubbles.historyLimit`: Max group messages for context (0 disables).
-- `channels.bluebubbles.dmHistoryLimit`: DM history limit.
-- `channels.bluebubbles.actions`: Enable/disable specific actions.
-- `channels.bluebubbles.accounts`: Multi-account configuration.
-
-Related global options:
-- `agents.list[].groupChat.mentionPatterns` (or `messages.groupChat.mentionPatterns`).
-- `messages.responsePrefix`.
-
-## Addressing / delivery targets
-Prefer `chat_guid` for stable routing:
-- `chat_guid:iMessage;-;+15555550123` (preferred for groups)
-- `chat_id:123`
-- `chat_identifier:...`
-- Direct handles: `+15555550123`, `user@example.com`
+## How it works
+- Outbound replies: `sendMessageBlueBubbles` resolves a chat GUID via `/api/v1/chat/query` and posts to `/api/v1/message/text`. Typing (`/api/v1/chat/<guid>/typing`) and read receipts (`/api/v1/chat/<guid>/read`) are sent before/after responses.
+- Webhooks: BlueBubbles POSTs JSON payloads with `type` and `data`. The plugin ignores non-message events (typing indicator, read status) and extracts `chatGuid` from `data.chats[0].guid`.
+- Reactions/tapbacks generate `BlueBubbles reaction added/removed` system events so agents can mention them. Agents can also trigger tapbacks via the `react` action with `messageId`, `emoji`, and a `to`/`chatGuid`.
+- Attachments are downloaded via the REST API and stored in the inbound media cache; text-less messages are converted into `<media:...>` placeholders so the agent knows something was sent.
 
 ## Security
 - Webhook requests are authenticated by comparing `guid`/`password` query params or headers against `channels.bluebubbles.password`. Requests from `localhost` are also accepted.
@@ -205,12 +57,8 @@ Prefer `chat_guid` for stable routing:
 - Enable HTTPS + firewall rules on the BlueBubbles server if exposing it outside your LAN.
 
 ## Troubleshooting
-- If typing/read events stop working, check the BlueBubbles webhook logs and verify the gateway path matches `channels.bluebubbles.webhookPath`.
+- If Voice/typing events stop working, check the BlueBubbles webhook logs and verify the gateway path matches `channels.bluebubbles.webhookPath`.
 - Pairing codes expire after one hour; use `clawdbot pairing list bluebubbles` and `clawdbot pairing approve bluebubbles <code>`.
 - Reactions require the BlueBubbles private API (`POST /api/v1/message/react`); ensure the server version exposes it.
-- Edit/unsend require macOS 13+ and a compatible BlueBubbles server version. On macOS 26 (Tahoe), edit is currently broken due to private API changes.
-- Group icon updates can be flaky on macOS 26 (Tahoe): the API may return success but the new icon does not sync.
-- Clawdbot auto-hides known-broken actions based on the BlueBubbles server's macOS version. If edit still appears on macOS 26 (Tahoe), disable it manually with `channels.bluebubbles.actions.edit=false`.
-- For status/health info: `clawdbot status --all` or `clawdbot status --deep`.
 
-For general channel workflow reference, see [Channels](/channels) and the [Plugins](/plugins) guide.
+For general channel workflow reference, see [/channels/index] and the [[plugins|/plugin]] guide.

docs/channels/index.md

@@ -16,10 +16,9 @@ Text is supported everywhere; media and reactions vary by channel.
 - [Discord](/channels/discord) — Discord Bot API + Gateway; supports servers, channels, and DMs.
 - [Slack](/channels/slack) — Bolt SDK; workspace apps.
 - [Signal](/channels/signal) — signal-cli; privacy-focused.
-- [BlueBubbles](/channels/bluebubbles) — **Recommended for iMessage**; uses the BlueBubbles macOS server REST API with full feature support (edit, unsend, effects, reactions, group management — edit currently broken on macOS 26 Tahoe).
-- [iMessage](/channels/imessage) — macOS only; native integration via imsg (legacy, consider BlueBubbles for new setups).
+- [iMessage](/channels/imessage) — macOS only; native integration.
+- [BlueBubbles](/channels/bluebubbles) — iMessage via BlueBubbles macOS server (bundled plugin, disabled by default).
 - [Microsoft Teams](/channels/msteams) — Bot Framework; enterprise support (plugin, installed separately).
-- [Nextcloud Talk](/channels/nextcloud-talk) — Self-hosted chat via Nextcloud Talk (plugin, installed separately).
 - [Matrix](/channels/matrix) — Matrix protocol (plugin, installed separately).
 - [Zalo](/channels/zalo) — Zalo Bot API; Vietnam's popular messenger (plugin, installed separately).
 - [Zalo Personal](/channels/zalouser) — Zalo personal account via QR login (plugin, installed separately).

docs/channels/location.md

@@ -14,7 +14,6 @@ Clawdbot normalizes shared locations from chat channels into:
 Currently supported:
 - **Telegram** (location pins + venues + live locations)
 - **WhatsApp** (locationMessage + liveLocationMessage)
-- **Matrix** (`m.location` with `geo_uri`)
 
 ## Text formatting
 Locations are rendered as friendly lines without brackets:
@@ -45,4 +44,3 @@ When a location is present, these fields are added to `ctx`:
 ## Channel notes
 - **Telegram**: venues map to `LocationName/LocationAddress`; live locations use `live_period`.
 - **WhatsApp**: `locationMessage.comment` and `liveLocationMessage.caption` are appended as the caption line.
-- **Matrix**: `geo_uri` is parsed as a pin location; altitude is ignored and `LocationIsLive` is always false.

docs/channels/matrix.md

@@ -5,26 +5,17 @@ read_when:
 ---
 # Matrix (plugin)
 
-Matrix is an open, decentralized messaging protocol. Clawdbot connects as a Matrix **user**
-on any homeserver, so you need a Matrix account for the bot. Once it is logged in, you can DM
-the bot directly or invite it to rooms (Matrix "groups"). Beeper is a valid client option too,
-but it requires E2EE to be enabled.
-
-Status: supported via plugin (matrix-bot-sdk). Direct messages, rooms, threads, media, reactions,
-polls (send + poll-start as text), location, and E2EE (with crypto support).
+Status: supported via plugin (matrix-js-sdk). Direct messages, rooms, threads, media, reactions, and polls.
 
 ## Plugin required
-
 Matrix ships as a plugin and is not bundled with the core install.
 
 Install via CLI (npm registry):
-
 ```bash
 clawdbot plugins install @clawdbot/matrix
 ```
 
 Local checkout (when running from a git repo):
-
 ```bash
 clawdbot plugins install ./extensions/matrix
 ```
@@ -34,54 +25,27 @@ Clawdbot will offer the local install path automatically.
 
 Details: [Plugins](/plugin)
 
-## Setup
-
+## Quick setup (beginner)
 1) Install the Matrix plugin:
    - From npm: `clawdbot plugins install @clawdbot/matrix`
    - From a local checkout: `clawdbot plugins install ./extensions/matrix`
-2) Create a Matrix account on a homeserver:
-   - Browse hosting options at [https://matrix.org/ecosystem/hosting/](https://matrix.org/ecosystem/hosting/)
-   - Or host it yourself.
-3) Get an access token for the bot account:
-   - Use the Matrix login API with `curl` at your home server:
-
-   ```bash
-   curl --request POST \
-     --url https://matrix.example.org/_matrix/client/v3/login \
-     --header 'Content-Type: application/json' \
-     --data '{
-     "type": "m.login.password",
-     "identifier": {
-       "type": "m.id.user",
-       "user": "your-user-name"
-     },
-     "password": "your-password"
-   }'
-   ```
-
-   - Replace `matrix.example.org` with your homeserver URL.
-   - Or set `channels.matrix.userId` + `channels.matrix.password`: Clawdbot calls the same
-     login endpoint, stores the access token in `~/.clawdbot/credentials/matrix/credentials.json`,
-     and reuses it on next start.
-4) Configure credentials:
-   - Env: `MATRIX_HOMESERVER`, `MATRIX_ACCESS_TOKEN` (or `MATRIX_USER_ID` + `MATRIX_PASSWORD`)
+2) Configure credentials:
+   - Env: `MATRIX_HOMESERVER`, `MATRIX_USER_ID`, `MATRIX_ACCESS_TOKEN` (or `MATRIX_PASSWORD`)
    - Or config: `channels.matrix.*`
    - If both are set, config takes precedence.
-   - With access token: user ID is fetched automatically via `/whoami`.
-   - When set, `channels.matrix.userId` should be the full Matrix ID (example: `@bot:example.org`).
-5) Restart the gateway (or finish onboarding).
-6) Start a DM with the bot or invite it to a room from any Matrix client
-   (Element, Beeper, etc.; see https://matrix.org/ecosystem/clients/). Beeper requires E2EE,
-   so set `channels.matrix.encryption: true` and verify the device.
+3) Restart the gateway (or finish onboarding).
+4) DM access defaults to pairing; approve the pairing code on first contact.
 
-Minimal config (access token, user ID auto-fetched):
+Runtime note: Matrix requires Node.js (Bun is not supported).
 
+Minimal config:
 ```json5
 {
   channels: {
     matrix: {
       enabled: true,
       homeserver: "https://matrix.example.org",
+      userId: "@clawdbot:example.org",
       accessToken: "syt_***",
       dm: { policy: "pairing" }
     }
@@ -89,57 +53,18 @@ Minimal config (access token, user ID auto-fetched):
 }
 ```
 
-E2EE config (end to end encryption enabled):
-
-```json5
-{
-  channels: {
-    matrix: {
-      enabled: true,
-      homeserver: "https://matrix.example.org",
-      accessToken: "syt_***",
-      encryption: true,
-      dm: { policy: "pairing" }
-    }
-  }
-}
-```
-
 ## Encryption (E2EE)
+End-to-end encrypted rooms are **not** supported.
+- Use unencrypted rooms or disable encryption when creating the room.
+- If a room is E2EE, the bot will receive encrypted events and won’t reply.
 
-End-to-end encryption is **supported** via the Rust crypto SDK.
-
-Enable with `channels.matrix.encryption: true`:
-
-- If the crypto module loads, encrypted rooms are decrypted automatically.
-- Outbound media is encrypted when sending to encrypted rooms.
-- On first connection, Clawdbot requests device verification from your other sessions.
-- Verify the device in another Matrix client (Element, etc.) to enable key sharing.
-- If the crypto module cannot be loaded, E2EE is disabled and encrypted rooms will not decrypt;
-  Clawdbot logs a warning.
-- If you see missing crypto module errors (for example, `@matrix-org/matrix-sdk-crypto-nodejs-*`),
-  allow build scripts for `@matrix-org/matrix-sdk-crypto-nodejs` and run
-  `pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs` or fetch the binary with
-  `node node_modules/@matrix-org/matrix-sdk-crypto-nodejs/download-lib.js`.
-
-Crypto state is stored per account + access token in
-`~/.clawdbot/matrix/accounts/<account>/<homeserver>__<user>/<token-hash>/crypto/`
-(SQLite database). Sync state lives alongside it in `bot-storage.json`.
-If the access token (device) changes, a new store is created and the bot must be
-re-verified for encrypted rooms.
-
-**Device verification:**
-When E2EE is enabled, the bot will request verification from your other sessions on startup.
-Open Element (or another client) and approve the verification request to establish trust.
-Once verified, the bot can decrypt messages in encrypted rooms.
-
-## Routing model
-
-- Replies always go back to Matrix.
+## What it is
+Matrix is an open messaging protocol. Clawdbot connects as a Matrix user and listens to DMs and rooms.
+- A Matrix user account owned by the Gateway.
+- Deterministic routing: replies go back to Matrix.
 - DMs share the agent's main session; rooms map to group sessions.
 
 ## Access control (DMs)
-
 - Default: `channels.matrix.dm.policy = "pairing"`. Unknown senders get a pairing code.
 - Approve via:
   - `clawdbot pairing list matrix`
@@ -148,80 +73,58 @@ Once verified, the bot can decrypt messages in encrypted rooms.
 - `channels.matrix.dm.allowFrom` accepts user IDs or display names. The wizard resolves display names to user IDs when directory search is available.
 
 ## Rooms (groups)
-
 - Default: `channels.matrix.groupPolicy = "allowlist"` (mention-gated). Use `channels.defaults.groupPolicy` to override the default when unset.
-- Allowlist rooms with `channels.matrix.groups` (room IDs, aliases, or names):
-
+- Allowlist rooms with `channels.matrix.rooms`:
 ```json5
 {
   channels: {
     matrix: {
-      groupPolicy: "allowlist",
-      groups: {
-        "!roomId:example.org": { allow: true },
-        "#alias:example.org": { allow: true }
-      },
-      groupAllowFrom: ["@owner:example.org"]
+      rooms: {
+        "!roomId:example.org": { requireMention: true }
+      }
     }
   }
 }
 ```
-
 - `requireMention: false` enables auto-reply in that room.
-- `groups."*"` can set defaults for mention gating across rooms.
-- `groupAllowFrom` restricts which senders can trigger the bot in rooms (optional).
-- Per-room `users` allowlists can further restrict senders inside a specific room.
 - The configure wizard prompts for room allowlists (room IDs, aliases, or names) and resolves names when possible.
 - On startup, Clawdbot resolves room/user names in allowlists to IDs and logs the mapping; unresolved entries are kept as typed.
-- Invites are auto-joined by default; control with `channels.matrix.autoJoin` and `channels.matrix.autoJoinAllowlist`.
 - To allow **no rooms**, set `channels.matrix.groupPolicy: "disabled"` (or keep an empty allowlist).
-- Legacy key: `channels.matrix.rooms` (same shape as `groups`).
 
 ## Threads
-
 - Reply threading is supported.
-- `channels.matrix.threadReplies` controls whether replies stay in threads:
-  - `off`, `inbound` (default), `always`
-- `channels.matrix.replyToMode` controls reply-to metadata when not replying in a thread:
+- `channels.matrix.replyToMode` controls replies when tagged:
   - `off` (default), `first`, `all`
 
 ## Capabilities
-
 | Feature | Status |
 |---------|--------|
 | Direct messages | ✅ Supported |
 | Rooms | ✅ Supported |
 | Threads | ✅ Supported |
 | Media | ✅ Supported |
-| E2EE | ✅ Supported (crypto module required) |
-| Reactions | ✅ Supported (send/read via tools) |
-| Polls | ✅ Send supported; inbound poll starts are converted to text (responses/ends ignored) |
-| Location | ✅ Supported (geo URI; altitude ignored) |
+| Reactions | ✅ Supported |
+| Polls | ✅ Supported |
 | Native commands | ✅ Supported |
 
 ## Configuration reference (Matrix)
-
 Full configuration: [Configuration](/gateway/configuration)
 
 Provider options:
-
 - `channels.matrix.enabled`: enable/disable channel startup.
 - `channels.matrix.homeserver`: homeserver URL.
-- `channels.matrix.userId`: Matrix user ID (optional with access token).
+- `channels.matrix.userId`: Matrix user ID.
 - `channels.matrix.accessToken`: access token.
 - `channels.matrix.password`: password for login (token stored).
 - `channels.matrix.deviceName`: device display name.
-- `channels.matrix.encryption`: enable E2EE (default: false).
 - `channels.matrix.initialSyncLimit`: initial sync limit.
 - `channels.matrix.threadReplies`: `off | inbound | always` (default: inbound).
 - `channels.matrix.textChunkLimit`: outbound text chunk size (chars).
 - `channels.matrix.dm.policy`: `pairing | allowlist | open | disabled` (default: pairing).
 - `channels.matrix.dm.allowFrom`: DM allowlist (user IDs or display names). `open` requires `"*"`. The wizard resolves names to IDs when possible.
 - `channels.matrix.groupPolicy`: `allowlist | open | disabled` (default: allowlist).
-- `channels.matrix.groupAllowFrom`: allowlisted senders for group messages.
 - `channels.matrix.allowlistOnly`: force allowlist rules for DMs + rooms.
-- `channels.matrix.groups`: group allowlist + per-room settings map.
-- `channels.matrix.rooms`: legacy group allowlist/config.
+- `channels.matrix.rooms`: per-room settings and allowlist.
 - `channels.matrix.replyToMode`: reply-to mode for threads/tags.
 - `channels.matrix.mediaMaxMb`: inbound/outbound media cap (MB).
 - `channels.matrix.autoJoin`: invite handling (`always | allowlist | off`, default: always).

docs/channels/nextcloud-talk.md

@@ -1,119 +0,0 @@
----
-summary: "Nextcloud Talk support status, capabilities, and configuration"
-read_when:
-  - Working on Nextcloud Talk channel features
----
-# Nextcloud Talk (plugin)
-
-Status: supported via plugin (webhook bot). Direct messages, rooms, reactions, and markdown messages are supported.
-
-## Plugin required
-Nextcloud Talk ships as a plugin and is not bundled with the core install.
-
-Install via CLI (npm registry):
-```bash
-clawdbot plugins install @clawdbot/nextcloud-talk
-```
-
-Local checkout (when running from a git repo):
-```bash
-clawdbot plugins install ./extensions/nextcloud-talk
-```
-
-If you choose Nextcloud Talk during configure/onboarding and a git checkout is detected,
-Clawdbot will offer the local install path automatically.
-
-Details: [Plugins](/plugin)
-
-## Quick setup (beginner)
-1) Install the Nextcloud Talk plugin.
-2) On your Nextcloud server, create a bot:
-   ```bash
-   ./occ talk:bot:install "Clawdbot" "<shared-secret>" "<webhook-url>" --feature reaction
-   ```
-3) Enable the bot in the target room settings.
-4) Configure Clawdbot:
-   - Config: `channels.nextcloud-talk.baseUrl` + `channels.nextcloud-talk.botSecret`
-   - Or env: `NEXTCLOUD_TALK_BOT_SECRET` (default account only)
-5) Restart the gateway (or finish onboarding).
-
-Minimal config:
-```json5
-{
-  channels: {
-    "nextcloud-talk": {
-      enabled: true,
-      baseUrl: "https://cloud.example.com",
-      botSecret: "shared-secret",
-      dmPolicy: "pairing"
-    }
-  }
-}
-```
-
-## Notes
-- Bots cannot initiate DMs. The user must message the bot first.
-- Webhook URL must be reachable by the Gateway; set `webhookPublicUrl` if behind a proxy.
-- Media uploads are not supported by the bot API; media is sent as URLs.
-- The webhook payload does not distinguish DMs vs rooms; set `apiUser` + `apiPassword` to enable room-type lookups (otherwise DMs are treated as rooms).
-
-## Access control (DMs)
-- Default: `channels.nextcloud-talk.dmPolicy = "pairing"`. Unknown senders get a pairing code.
-- Approve via:
-  - `clawdbot pairing list nextcloud-talk`
-  - `clawdbot pairing approve nextcloud-talk <CODE>`
-- Public DMs: `channels.nextcloud-talk.dmPolicy="open"` plus `channels.nextcloud-talk.allowFrom=["*"]`.
-
-## Rooms (groups)
-- Default: `channels.nextcloud-talk.groupPolicy = "allowlist"` (mention-gated).
-- Allowlist rooms with `channels.nextcloud-talk.rooms`:
-```json5
-{
-  channels: {
-    "nextcloud-talk": {
-      rooms: {
-        "room-token": { requireMention: true }
-      }
-    }
-  }
-}
-```
-- To allow no rooms, keep the allowlist empty or set `channels.nextcloud-talk.groupPolicy="disabled"`.
-
-## Capabilities
-| Feature | Status |
-|---------|--------|
-| Direct messages | Supported |
-| Rooms | Supported |
-| Threads | Not supported |
-| Media | URL-only |
-| Reactions | Supported |
-| Native commands | Not supported |
-
-## Configuration reference (Nextcloud Talk)
-Full configuration: [Configuration](/gateway/configuration)
-
-Provider options:
-- `channels.nextcloud-talk.enabled`: enable/disable channel startup.
-- `channels.nextcloud-talk.baseUrl`: Nextcloud instance URL.
-- `channels.nextcloud-talk.botSecret`: bot shared secret.
-- `channels.nextcloud-talk.botSecretFile`: secret file path.
-- `channels.nextcloud-talk.apiUser`: API user for room lookups (DM detection).
-- `channels.nextcloud-talk.apiPassword`: API/app password for room lookups.
-- `channels.nextcloud-talk.apiPasswordFile`: API password file path.
-- `channels.nextcloud-talk.webhookPort`: webhook listener port (default: 8788).
-- `channels.nextcloud-talk.webhookHost`: webhook host (default: 0.0.0.0).
-- `channels.nextcloud-talk.webhookPath`: webhook path (default: /nextcloud-talk-webhook).
-- `channels.nextcloud-talk.webhookPublicUrl`: externally reachable webhook URL.
-- `channels.nextcloud-talk.dmPolicy`: `pairing | allowlist | open | disabled`.
-- `channels.nextcloud-talk.allowFrom`: DM allowlist (user IDs). `open` requires `"*"`.
-- `channels.nextcloud-talk.groupPolicy`: `allowlist | open | disabled`.
-- `channels.nextcloud-talk.groupAllowFrom`: group allowlist (user IDs).
-- `channels.nextcloud-talk.rooms`: per-room settings and allowlist.
-- `channels.nextcloud-talk.historyLimit`: group history limit (0 disables).
-- `channels.nextcloud-talk.dmHistoryLimit`: DM history limit (0 disables).
-- `channels.nextcloud-talk.dms`: per-DM overrides (historyLimit).
-- `channels.nextcloud-talk.textChunkLimit`: outbound text chunk size (chars).
-- `channels.nextcloud-talk.blockStreaming`: disable block streaming for this channel.
-- `channels.nextcloud-talk.blockStreamingCoalesce`: block streaming coalesce tuning.
-- `channels.nextcloud-talk.mediaMaxMb`: inbound media cap (MB).

docs/cli/devices.md

@@ -1,66 +0,0 @@
----
-summary: "CLI reference for `clawdbot devices` (device pairing + token rotation/revocation)"
-read_when:
-  - You are approving device pairing requests
-  - You need to rotate or revoke device tokens
----
-
-# `clawdbot devices`
-
-Manage device pairing requests and device-scoped tokens.
-
-## Commands
-
-### `clawdbot devices list`
-
-List pending pairing requests and paired devices.
-
-```
-clawdbot devices list
-clawdbot devices list --json
-```
-
-### `clawdbot devices approve <requestId>`
-
-Approve a pending device pairing request.
-
-```
-clawdbot devices approve <requestId>
-```
-
-### `clawdbot devices reject <requestId>`
-
-Reject a pending device pairing request.
-
-```
-clawdbot devices reject <requestId>
-```
-
-### `clawdbot devices rotate --device <id> --role <role> [--scope <scope...>]`
-
-Rotate a device token for a specific role (optionally updating scopes).
-
-```
-clawdbot devices rotate --device <deviceId> --role operator --scope operator.read --scope operator.write
-```
-
-### `clawdbot devices revoke --device <id> --role <role>`
-
-Revoke a device token for a specific role.
-
-```
-clawdbot devices revoke --device <deviceId> --role node
-```
-
-## Common options
-
-- `--url <url>`: Gateway WebSocket URL (defaults to `gateway.remote.url` when configured).
-- `--token <token>`: Gateway token (if required).
-- `--password <password>`: Gateway password (password auth).
-- `--timeout <ms>`: RPC timeout.
-- `--json`: JSON output (recommended for scripting).
-
-## Notes
-
-- Token rotation returns a new token (sensitive). Treat it like a secret.
-- These commands require `operator.pairing` (or `operator.admin`) scope.

docs/cli/gateway.md

@@ -116,20 +116,17 @@ clawdbot gateway call logs.tail --params '{"sinceMs": 60000}'
 
 ## Discover gateways (Bonjour)
 
-`gateway discover` scans for Gateway beacons (`_clawdbot-gateway._tcp`).
+`gateway discover` scans for Gateway bridge beacons (`_clawdbot-bridge._tcp`).
 
 - Multicast DNS-SD: `local.`
 - Unicast DNS-SD (Wide-Area Bonjour): `clawdbot.internal.` (requires split DNS + DNS server; see [/gateway/bonjour](/gateway/bonjour))
 
-Only gateways with Bonjour discovery enabled (default) advertise the beacon.
+Only gateways with the **bridge enabled** will advertise the discovery beacon.
 
 Wide-Area discovery records include (TXT):
-- `role` (gateway role hint)
-- `transport` (transport hint, e.g. `gateway`)
 - `gatewayPort` (WebSocket port, usually `18789`)
 - `sshPort` (SSH port; defaults to `22` if not present)
 - `tailnetDns` (MagicDNS hostname, when available)
-- `gatewayTls` / `gatewayTlsSha256` (TLS enabled + cert fingerprint)
 - `cliPath` (optional hint for remote installs)
 
 ### `gateway discover`

docs/cli/index.md

@@ -34,7 +34,6 @@ This page describes the current CLI behavior. If commands change, update this do
 - [`models`](/cli/models)
 - [`memory`](/cli/memory)
 - [`nodes`](/cli/nodes)
-- [`devices`](/cli/devices)
 - [`node`](/cli/node)
 - [`approvals`](/cli/approvals)
 - [`sandbox`](/cli/sandbox)
@@ -189,7 +188,6 @@ clawdbot [--dev] [--profile <name>] <command>
     runs
     run
   nodes
-  devices
   node
     start
     daemon

docs/cli/plugins.md

@@ -11,7 +11,6 @@ Manage Gateway plugins/extensions (loaded in-process).
 
 Related:
 - Plugin system: [Plugins](/plugin)
-- Plugin manifest + schema: [Plugin manifest](/plugins/manifest)
 - Security hardening: [Security](/gateway/security)
 
 ## Commands
@@ -29,10 +28,6 @@ clawdbot plugins update --all
 Bundled plugins ship with Clawdbot but start disabled. Use `plugins enable` to
 activate them.
 
-All plugins must ship a `clawdbot.plugin.json` file with an inline JSON Schema
-(`configSchema`, even if empty). Missing/invalid manifests or schemas prevent
-the plugin from loading and fail config validation.
-
 ### Install
 
 ```bash

docs/concepts/groups.md

@@ -149,14 +149,6 @@ Control how group/room messages are handled per channel:
     slack: {
       groupPolicy: "allowlist",
       channels: { "#general": { allow: true } }
-    },
-    matrix: {
-      groupPolicy: "allowlist",
-      groupAllowFrom: ["@owner:example.org"],
-      groups: {
-        "!roomId:example.org": { allow: true },
-        "#alias:example.org": { allow: true }
-      }
     }
   }
 }
@@ -173,7 +165,6 @@ Notes:
 - WhatsApp/Telegram/Signal/iMessage/Microsoft Teams: use `groupAllowFrom` (fallback: explicit `allowFrom`).
 - Discord: allowlist uses `channels.discord.guilds.<id>.channels`.
 - Slack: allowlist uses `channels.slack.channels`.
-- Matrix: allowlist uses `channels.matrix.groups` (room IDs, aliases, or names). Use `channels.matrix.groupAllowFrom` to restrict senders; per-room `users` allowlists are also supported.
 - Group DMs are controlled separately (`channels.discord.dm.*`, `channels.slack.dm.*`).
 - Telegram allowlist can match user IDs (`"123456789"`, `"telegram:123456789"`, `"tg:123456789"`) or usernames (`"@alice"` or `"alice"`); prefixes are case-insensitive.
 - Default is `groupPolicy: "allowlist"`; if your group allowlist is empty, group messages are blocked.

docs/concepts/queue.md

@@ -12,7 +12,7 @@ We serialize inbound auto-reply runs (all channels) through a tiny in-process qu
 - Serializing avoids competing for shared resources (session files, logs, CLI stdin) and reduces the chance of upstream rate limits.
 
 ## How it works
-- A lane-aware FIFO queue drains each lane with a configurable concurrency cap (default 1 for unconfigured lanes; main defaults to 4, subagent to 8).
+- A lane-aware FIFO queue drains each lane with a configurable concurrency cap (default 1).
 - `runEmbeddedPiAgent` enqueues by **session key** (lane `session:<key>`) to guarantee only one active run per session.
 - Each session run is then queued into a **global lane** (`main` by default) so overall parallelism is capped by `agents.defaults.maxConcurrent`.
 - When verbose logging is enabled, queued runs emit a short notice if they waited more than ~2s before starting.

docs/gateway/configuration.md

@@ -1840,7 +1840,7 @@ Example:
 
 `agents.defaults.subagents` configures sub-agent defaults:
 - `model`: default model for spawned sub-agents (string or `{ primary, fallbacks }`). If omitted, sub-agents inherit the caller’s model unless overridden per agent or per call.
-- `maxConcurrent`: max concurrent sub-agent runs (default 8)
+- `maxConcurrent`: max concurrent sub-agent runs (default 1)
 - `archiveAfterMinutes`: auto-archive sub-agent sessions after N minutes (default 60; set `0` to disable)
 - Per-subagent tool policy: `tools.subagents.tools.allow` / `tools.subagents.tools.deny` (deny wins)
 
@@ -1974,7 +1974,7 @@ Notes:
 
 `agents.defaults.maxConcurrent` sets the maximum number of embedded agent runs that can
 execute in parallel across sessions. Each session is still serialized (one run
-per session key at a time). Default: 4.
+per session key at a time). Default: 1.
 
 ### `agents.defaults.sandbox`
 
@@ -2677,7 +2677,7 @@ Notes:
 
 Auth and Tailscale:
 - `gateway.auth.mode` sets the handshake requirements (`token` or `password`).
-- `gateway.auth.token` stores the shared token for token auth (used by the CLI on the same machine and as the bootstrap credential for device pairing).
+- `gateway.auth.token` stores the shared token for token auth (used by the CLI on the same machine).
 - When `gateway.auth.mode` is set, only that method is accepted (plus optional Tailscale headers).
 - `gateway.auth.password` can be set here, or via `CLAWDBOT_GATEWAY_PASSWORD` (recommended).
 - `gateway.auth.allowTailscale` allows Tailscale Serve identity headers
@@ -2686,9 +2686,6 @@ Auth and Tailscale:
   `true`, Serve requests do not need a token/password; set `false` to require
   explicit credentials. Defaults to `true` when `tailscale.mode = "serve"` and
   auth mode is not `password`.
-- After pairing, the Gateway issues **device tokens** scoped to the device role + scopes.
-  These are returned in `hello-ok.auth.deviceToken`; clients should persist and reuse them
-  instead of the shared token. Rotate/revoke via `device.token.rotate`/`device.token.revoke`.
 - `gateway.tailscale.mode: "serve"` uses Tailscale Serve (tailnet only, loopback bind).
 - `gateway.tailscale.mode: "funnel"` exposes the dashboard publicly; requires auth.
 - `gateway.tailscale.resetOnExit` resets Serve/Funnel config on shutdown.
@@ -2697,7 +2694,6 @@ Remote client defaults (CLI):
 - `gateway.remote.url` sets the default Gateway WebSocket URL for CLI calls when `gateway.mode = "remote"`.
 - `gateway.remote.token` supplies the token for remote calls (leave unset for no auth).
 - `gateway.remote.password` supplies the password for remote calls (leave unset for no auth).
-- `gateway.remote.tlsFingerprint` pins the gateway TLS cert fingerprint (sha256).
 
 macOS app behavior:
 - Clawdbot.app watches `~/.clawdbot/clawdbot.json` and switches modes live when `gateway.mode` or `gateway.remote.url` changes.
@@ -2711,36 +2707,12 @@ macOS app behavior:
     remote: {
       url: "ws://gateway.tailnet:18789",
       token: "your-token",
-      password: "your-password",
-      tlsFingerprint: "sha256:ab12cd34..."
+      password: "your-password"
     }
   }
 }
 ```
 
-### `gateway.nodes` (Node command allowlist)
-
-The Gateway enforces a per-platform command allowlist for `node.invoke`. Nodes must both
-**declare** a command and have it **allowed** by the Gateway to run it.
-
-Use this section to extend or deny commands:
-
-```json5
-{
-  gateway: {
-    nodes: {
-      allowCommands: ["custom.vendor.command"], // extra commands beyond defaults
-      denyCommands: ["sms.send"]      // block a command even if declared
-    }
-  }
-}
-```
-
-Notes:
-- `allowCommands` extends the built-in per-platform defaults.
-- `denyCommands` always wins (even if the node claims the command).
-- `node.invoke` rejects commands that are not declared by the node.
-
 ### `gateway.reload` (Config hot reload)
 
 The Gateway watches `~/.clawdbot/clawdbot.json` (or `CLAWDBOT_CONFIG_PATH`) and applies changes automatically.

docs/gateway/protocol.md

@@ -20,16 +20,6 @@ handshake time.
 
 ## Handshake (connect)
 
-Gateway → Client (pre-connect challenge):
-
-```json
-{
-  "type": "event",
-  "event": "connect.challenge",
-  "payload": { "nonce": "…", "ts": 1737264000000 }
-}
-```
-
 Client → Gateway:
 
 ```json
@@ -53,14 +43,7 @@ Client → Gateway:
     "permissions": {},
     "auth": { "token": "…" },
     "locale": "en-US",
-    "userAgent": "clawdbot-cli/1.2.3",
-    "device": {
-      "id": "device_fingerprint",
-      "publicKey": "…",
-      "signature": "…",
-      "signedAt": 1737264000000,
-      "nonce": "…"
-    }
+    "userAgent": "clawdbot-cli/1.2.3"
   }
 }
 ```
@@ -76,18 +59,6 @@ Gateway → Client:
 }
 ```
 
-When a device token is issued, `hello-ok` also includes:
-
-```json
-{
-  "auth": {
-    "deviceToken": "…",
-    "role": "operator",
-    "scopes": ["operator.read", "operator.write"]
-  }
-}
-```
-
 ### Node example
 
 ```json
@@ -116,8 +87,7 @@ When a device token is issued, `hello-ok` also includes:
       "id": "device_fingerprint",
       "publicKey": "…",
       "signature": "…",
-      "signedAt": 1737264000000,
-      "nonce": "…"
+      "signedAt": 1737264000000
     }
   }
 }
@@ -153,22 +123,6 @@ Nodes declare capability claims at connect time:
 
 The Gateway treats these as **claims** and enforces server-side allowlists.
 
-## Presence
-
-- `system-presence` returns entries keyed by device identity.
-- Presence entries include `deviceId`, `roles`, and `scopes` so UIs can show a single row per device
-  even when it connects as both **operator** and **node**.
-
-### Node helper methods
-
-- Nodes may call `skills.bins` to fetch the current list of skill executables
-  for auto-allow checks.
-
-## Exec approvals
-
-- When an exec request needs approval, the gateway broadcasts `exec.approval.requested`.
-- Operator clients resolve by calling `exec.approval.resolve` (requires `operator.approvals` scope).
-
 ## Versioning
 
 - `PROTOCOL_VERSION` lives in `src/gateway/protocol/schema.ts`.
@@ -182,11 +136,6 @@ The Gateway treats these as **claims** and enforces server-side allowlists.
 
 - If `CLAWDBOT_GATEWAY_TOKEN` (or `--token`) is set, `connect.params.auth.token`
   must match or the socket is closed.
-- After pairing, the Gateway issues a **device token** scoped to the connection
-  role + scopes. It is returned in `hello-ok.auth.deviceToken` and should be
-  persisted by the client for future connects.
-- Device tokens can be rotated/revoked via `device.token.rotate` and
-  `device.token.revoke` (requires `operator.pairing` scope).
 
 ## Device identity + pairing
 
@@ -195,14 +144,12 @@ The Gateway treats these as **claims** and enforces server-side allowlists.
 - Gateways issue tokens per device + role.
 - Pairing approvals are required for new device IDs unless local auto-approval
   is enabled.
-- All WS clients must include `device` identity during `connect` (operator + node).
-- Non-local connections must sign the server-provided `connect.challenge` nonce.
 
 ## TLS + pinning
 
 - TLS is supported for WS connections.
 - Clients may optionally pin the gateway cert fingerprint (see `gateway.tls`
-  config plus `gateway.remote.tlsFingerprint` or CLI `--tls-fingerprint`).
+  config and client TLS settings).
 
 ## Scope
 

docs/gateway/remote.md

@@ -114,7 +114,6 @@ Short version: **keep the Gateway loopback-only** unless you’re sure you need
 - **Loopback + SSH/Tailscale Serve** is the safest default (no public exposure).
 - **Non-loopback binds** (`lan`/`tailnet`/`auto`) must use auth tokens/passwords.
 - `gateway.remote.token` is **only** for remote CLI calls — it does **not** enable local auth.
-- `gateway.remote.tlsFingerprint` pins the remote TLS cert when using `wss://`.
 - **Tailscale Serve** can authenticate via identity headers when `gateway.auth.allowTailscale: true`.
   Set it to `false` if you want tokens/passwords instead.
 - Treat `browser.controlUrl` like an admin API: tailnet-only + token auth.

docs/gateway/security.md

@@ -267,7 +267,6 @@ Doctor can generate one for you: `clawdbot doctor --generate-gateway-token`.
 
 Note: `gateway.remote.token` is **only** for remote CLI calls; it does not
 protect local WS access.
-Optional: pin remote TLS with `gateway.remote.tlsFingerprint` when using `wss://`.
 
 Auth modes:
 - `gateway.auth.mode: "token"`: shared bearer token (recommended for most setups).

docs/hooks.md

@@ -235,12 +235,6 @@ Triggered when the gateway starts:
 
 - **`gateway:startup`**: After channels start and hooks are loaded
 
-### Tool Result Hooks (Plugin API)
-
-These hooks are not event-stream listeners; they let plugins synchronously adjust tool results before Clawdbot persists them.
-
-- **`tool_result_persist`**: transform tool results before they are written to the session transcript. Must be synchronous; return the updated tool result payload or `undefined` to keep it as-is. See [Agent Loop](/concepts/agent-loop).
-
 ### Future Events
 
 Planned event types:

docs/plugin.md

@@ -48,11 +48,8 @@ See [Voice Call](/plugins/voice-call) for a concrete example plugin.
 - Qwen OAuth (provider auth) — bundled as `qwen-portal-auth` (disabled by default)
 - Copilot Proxy (provider auth) — local VS Code Copilot Proxy bridge; distinct from built-in `github-copilot` device login (bundled, disabled by default)
 
-Clawdbot plugins are **TypeScript modules** loaded at runtime via jiti. **Config
-validation does not execute plugin code**; it uses the plugin manifest and JSON
-Schema instead. See [Plugin manifest](/plugins/manifest).
-
-Plugins can register:
+Clawdbot plugins are **TypeScript modules** loaded at runtime via jiti. They can
+register:
 
 - Gateway RPC methods
 - Gateway HTTP handlers
@@ -86,10 +83,6 @@ Bundled plugins must be enabled explicitly via `plugins.entries.<id>.enabled`
 or `clawdbot plugins enable <id>`. Installed plugins are enabled by default,
 but can be disabled the same way.
 
-Each plugin must include a `clawdbot.plugin.json` file in its root. If a path
-points at a file, the plugin root is the file's directory and must contain the
-manifest.
-
 If multiple plugins resolve to the same id, the first match in the order above
 wins and lower-precedence copies are ignored.
 
@@ -112,37 +105,6 @@ becomes `name/<fileBase>`.
 If your plugin imports npm deps, install them in that directory so
 `node_modules` is available (`npm install` / `pnpm install`).
 
-### Channel catalog metadata
-
-Channel plugins can advertise onboarding metadata via `clawdbot.channel` and
-install hints via `clawdbot.install`. This keeps the core catalog data-free.
-
-Example:
-
-```json
-{
-  "name": "@clawdbot/nextcloud-talk",
-  "clawdbot": {
-    "extensions": ["./index.ts"],
-    "channel": {
-      "id": "nextcloud-talk",
-      "label": "Nextcloud Talk",
-      "selectionLabel": "Nextcloud Talk (self-hosted)",
-      "docsPath": "/channels/nextcloud-talk",
-      "docsLabel": "nextcloud-talk",
-      "blurb": "Self-hosted chat via Nextcloud Talk webhook bots.",
-      "order": 65,
-      "aliases": ["nc-talk", "nc"]
-    },
-    "install": {
-      "npmSpec": "@clawdbot/nextcloud-talk",
-      "localPath": "extensions/nextcloud-talk",
-      "defaultChoice": "npm"
-    }
-  }
-}
-```
-
 ## Plugin IDs
 
 Default plugin ids:
@@ -178,14 +140,6 @@ Fields:
 
 Config changes **require a gateway restart**.
 
-Validation rules (strict):
-- Unknown plugin ids in `entries`, `allow`, `deny`, or `slots` are **errors**.
-- Unknown `channels.<id>` keys are **errors** unless a plugin manifest declares
-  the channel id.
-- Plugin config is validated using the JSON Schema embedded in
-  `clawdbot.plugin.json` (`configSchema`).
-- If a plugin is disabled, its config is preserved and a **warning** is emitted.
-
 ## Plugin slots (exclusive categories)
 
 Some plugin categories are **exclusive** (only one active at a time). Use
@@ -215,26 +169,22 @@ Clawdbot augments `uiHints` at runtime based on discovered plugins:
   `plugins.entries.<id>.config.<field>`
 
 If you want your plugin config fields to show good labels/placeholders (and mark secrets as sensitive),
-provide `uiHints` alongside your JSON Schema in the plugin manifest.
+provide `configSchema.uiHints`.
 
 Example:
 
-```json
-{
-  "id": "my-plugin",
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {
-      "apiKey": { "type": "string" },
-      "region": { "type": "string" }
-    }
+```ts
+export default {
+  id: "my-plugin",
+  configSchema: {
+    parse: (v) => v,
+    uiHints: {
+      "apiKey": { label: "API Key", sensitive: true },
+      "region": { label: "Region", placeholder: "us-east-1" },
+    },
   },
-  "uiHints": {
-    "apiKey": { "label": "API Key", "sensitive": true },
-    "region": { "label": "Region", "placeholder": "us-east-1" }
-  }
-}
+  register(api) {},
+};
 ```
 
 ## CLI
@@ -375,8 +325,6 @@ Notes:
 - Put config under `channels.<id>` (not `plugins.entries`).
 - `meta.label` is used for labels in CLI/UI lists.
 - `meta.aliases` adds alternate ids for normalization and CLI inputs.
-- `meta.preferOver` lists channel ids to skip auto-enable when both are configured.
-- `meta.detailLabel` and `meta.systemImage` let UIs show richer channel labels/icons.
 
 ### Write a new messaging channel (step‑by‑step)
 
@@ -390,8 +338,6 @@ Model provider docs live under `/providers/*`.
 2) Define the channel metadata
 - `meta.label`, `meta.selectionLabel`, `meta.docsPath`, `meta.blurb` control CLI/UI lists.
 - `meta.docsPath` should point at a docs page like `/channels/<id>`.
-- `meta.preferOver` lets a plugin replace another channel (auto-enable prefers it).
-- `meta.detailLabel` and `meta.systemImage` are used by UIs for detail text/icons.
 
 3) Implement the required adapters
 - `config.listAccountIds` + `config.resolveAccount`

docs/plugins/manifest.md

@@ -1,66 +0,0 @@
----
-summary: "Plugin manifest + JSON schema requirements (strict config validation)"
-read_when:
-  - You are building a Clawdbot plugin
-  - You need to ship a plugin config schema or debug plugin validation errors
----
-# Plugin manifest (clawdbot.plugin.json)
-
-Every plugin **must** ship a `clawdbot.plugin.json` file in the **plugin root**.
-Clawdbot uses this manifest to validate configuration **without executing plugin
-code**. Missing or invalid manifests are treated as plugin errors and block
-config validation.
-
-See the full plugin system guide: [Plugins](/plugin).
-
-## Required fields
-
-```json
-{
-  "id": "voice-call",
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}
-```
-
-Required keys:
-- `id` (string): canonical plugin id.
-- `configSchema` (object): JSON Schema for plugin config (inline).
-
-Optional keys:
-- `kind` (string): plugin kind (example: `"memory"`).
-- `channels` (array): channel ids registered by this plugin (example: `["matrix"]`).
-- `providers` (array): provider ids registered by this plugin.
-- `name` (string): display name for the plugin.
-- `description` (string): short plugin summary.
-- `uiHints` (object): config field labels/placeholders/sensitive flags for UI rendering.
-- `version` (string): plugin version (informational).
-
-## JSON Schema requirements
-
-- **Every plugin must ship a JSON Schema**, even if it accepts no config.
-- An empty schema is acceptable (for example, `{ "type": "object", "additionalProperties": false }`).
-- Schemas are validated at config read/write time, not at runtime.
-
-## Validation behavior
-
-- Unknown `channels.*` keys are **errors**, unless the channel id is declared by
-  a plugin manifest.
-- `plugins.entries.<id>`, `plugins.allow`, `plugins.deny`, and `plugins.slots.*`
-  must reference **discoverable** plugin ids. Unknown ids are **errors**.
-- If a plugin is installed but has a broken or missing manifest or schema,
-  validation fails and Doctor reports the plugin error.
-- If plugin config exists but the plugin is **disabled**, the config is kept and
-  a **warning** is surfaced in Doctor + logs.
-
-## Notes
-
-- The manifest is **required for all plugins**, including local filesystem loads.
-- Runtime still loads the plugin module separately; the manifest is only for
-  discovery + validation.
-- If your plugin depends on native modules, document the build steps and any
-  package-manager allowlist requirements (for example, pnpm `allow-build-scripts`
-  + `pnpm rebuild <package>`).

docs/refactor/strict-config.md

@@ -22,20 +22,17 @@ read_when:
 - Unknown keys are validation errors (no passthrough at root or nested).
 - `plugins.entries.<id>.config` must be validated by the plugin’s schema.
   - If a plugin lacks a schema, **reject plugin load** and surface a clear error.
-- Unknown `channels.<id>` keys are errors unless a plugin manifest declares the channel id.
-- Plugin manifests (`clawdbot.plugin.json`) are required for all plugins.
 
 ## Plugin schema enforcement
-- Each plugin provides a strict JSON Schema for its config (inline in the manifest).
+- Each plugin provides a strict schema for its config (no passthrough).
 - Plugin load flow:
-  1) Resolve plugin manifest + schema (`clawdbot.plugin.json`).
+  1) Resolve plugin schema by plugin id.
   2) Validate config against the schema.
   3) If missing schema or invalid config: block plugin load, record error.
 - Error message includes:
   - Plugin id
   - Reason (missing schema / invalid config)
   - Path(s) that failed validation
-- Disabled plugins keep their config, but Doctor + logs surface a warning.
 
 ## Doctor flow
 - Doctor runs **every time** config is loaded (dry-run by default).

docs/testing.md

@@ -323,22 +323,6 @@ These are “real pipeline” regressions without real providers:
 - Gateway tool calling (mock OpenAI, real gateway + agent loop): `src/gateway/gateway.tool-calling.mock-openai.test.ts`
 - Gateway wizard (WS `wizard.start`/`wizard.next`, writes config + auth enforced): `src/gateway/gateway.wizard.e2e.test.ts`
 
-## Agent reliability evals (skills)
-
-We already have a few CI-safe tests that behave like “agent reliability evals”:
-- Mock tool-calling through the real gateway + agent loop (`src/gateway/gateway.tool-calling.mock-openai.test.ts`).
-- End-to-end wizard flows that validate session wiring and config effects (`src/gateway/gateway.wizard.e2e.test.ts`).
-
-What’s still missing for skills (see [Skills](/tools/skills)):
-- **Decisioning:** when skills are listed in the prompt, does the agent pick the right skill (or avoid irrelevant ones)?
-- **Compliance:** does the agent read `SKILL.md` before use and follow required steps/args?
-- **Workflow contracts:** multi-turn scenarios that assert tool order, session history carryover, and sandbox boundaries.
-
-Future evals should stay deterministic first:
-- A scenario runner using mock providers to assert tool calls + order, skill file reads, and session wiring.
-- A small suite of skill-focused scenarios (use vs avoid, gating, prompt injection).
-- Optional live evals (opt-in, env-gated) only after the CI-safe suite is in place.
-
 ## Adding regressions (guidance)
 
 When you fix a provider/model issue discovered in live:

docs/tools/exec-approvals.md

@@ -120,11 +120,7 @@ CLI: `clawdbot approvals` supports gateway or node editing (see [Approvals CLI](
 
 ## Approval flow
 
-When a prompt is required, the gateway broadcasts `exec.approval.requested` to operator clients.
-The Control UI and macOS app resolve it via `exec.approval.resolve`, then the gateway forwards the
-approved request to the node host.
-
-The confirmation dialog includes:
+When a prompt is required, the companion app displays a confirmation dialog with:
 - command + args
 - cwd
 - agent id

docs/tools/exec.md

@@ -32,8 +32,6 @@ Notes:
 - `gateway`/`node` approvals are controlled by `~/.clawdbot/exec-approvals.json`.
 - `node` requires a paired node (companion app or headless node host).
 - If multiple nodes are available, set `exec.node` or `tools.exec.node` to select one.
-- On non-Windows hosts, exec uses `SHELL` when set; if `SHELL` is `fish`, it prefers `bash` (or `sh`)
-  from `PATH` to avoid fish-incompatible scripts, then falls back to `SHELL` if neither exists.
 
 ## Config
 

docs/tools/skills.md

@@ -88,6 +88,8 @@ Notes:
 
     The tool is invoked with params:
     `{ command: "<raw args>", commandName: "<slash command>", skillName: "<skill name>" }`.
+    Tool-dispatch commands still respect tool policies/sandbox rules (same as normal model tools).
+    Replies are derived from tool results; include `MEDIA:` tokens or media URLs in tool output to send attachments.
 
 ## Gating (load-time filters)
 

docs/tools/slash-commands.md

@@ -104,6 +104,7 @@ Notes:
 - **Skill commands:** `user-invocable` skills are exposed as slash commands. Names are sanitized to `a-z0-9_` (max 32 chars); collisions get numeric suffixes (e.g. `_2`).
   - By default, skill commands are forwarded to the model as a normal request.
   - Skills may optionally declare `command-dispatch: tool` to route the command directly to a tool (deterministic, no model).
+  - Tool-dispatch still respects tool policies/sandbox rules; replies use the tool result text/media (including `MEDIA:` tokens).
 - **Native command arguments:** Discord uses autocomplete for dynamic options (and button menus when you omit required args). Telegram and Slack show a button menu when a command supports choices and you omit the arg.
 
 ## Usage surfaces (what shows where)

docs/tools/subagents.md

@@ -118,7 +118,7 @@ Override via config:
 
 Sub-agents use a dedicated in-process queue lane:
 - Lane name: `subagent`
-- Concurrency: `agents.defaults.subagents.maxConcurrent` (default `8`)
+- Concurrency: `agents.defaults.subagents.maxConcurrent` (default `1`)
 
 ## Stopping
 

extensions/bluebubbles/clawdbot.plugin.json

@@ -1,11 +0,0 @@
-{
-  "id": "bluebubbles",
-  "channels": [
-    "bluebubbles"
-  ],
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

extensions/bluebubbles/package.json

@@ -4,28 +4,6 @@
   "type": "module",
   "description": "Clawdbot BlueBubbles channel plugin",
   "clawdbot": {
-    "extensions": ["./index.ts"],
-    "channel": {
-      "id": "bluebubbles",
-      "label": "BlueBubbles",
-      "selectionLabel": "BlueBubbles (macOS app)",
-      "detailLabel": "BlueBubbles",
-      "docsPath": "/channels/bluebubbles",
-      "docsLabel": "bluebubbles",
-      "blurb": "iMessage via the BlueBubbles mac app + REST API.",
-      "aliases": [
-        "bb"
-      ],
-      "preferOver": [
-        "imessage"
-      ],
-      "systemImage": "bubble.left.and.text.bubble.right",
-      "order": 75
-    },
-    "install": {
-      "npmSpec": "@clawdbot/bluebubbles",
-      "localPath": "extensions/bluebubbles",
-      "defaultChoice": "npm"
-    }
+    "extensions": ["./index.ts"]
   }
 }

extensions/bluebubbles/src/actions.test.ts

@@ -1,511 +0,0 @@
-import { describe, expect, it, vi, beforeEach } from "vitest";
-
-import { bluebubblesMessageActions } from "./actions.js";
-import type { ClawdbotConfig } from "clawdbot/plugin-sdk";
-
-vi.mock("./accounts.js", () => ({
-  resolveBlueBubblesAccount: vi.fn(({ cfg, accountId }) => {
-    const config = cfg?.channels?.bluebubbles ?? {};
-    return {
-      accountId: accountId ?? "default",
-      enabled: config.enabled !== false,
-      configured: Boolean(config.serverUrl && config.password),
-      config,
-    };
-  }),
-}));
-
-vi.mock("./reactions.js", () => ({
-  sendBlueBubblesReaction: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("./send.js", () => ({
-  resolveChatGuidForTarget: vi.fn().mockResolvedValue("iMessage;-;+15551234567"),
-  sendMessageBlueBubbles: vi.fn().mockResolvedValue({ messageId: "msg-123" }),
-}));
-
-vi.mock("./chat.js", () => ({
-  editBlueBubblesMessage: vi.fn().mockResolvedValue(undefined),
-  unsendBlueBubblesMessage: vi.fn().mockResolvedValue(undefined),
-  renameBlueBubblesChat: vi.fn().mockResolvedValue(undefined),
-  setGroupIconBlueBubbles: vi.fn().mockResolvedValue(undefined),
-  addBlueBubblesParticipant: vi.fn().mockResolvedValue(undefined),
-  removeBlueBubblesParticipant: vi.fn().mockResolvedValue(undefined),
-  leaveBlueBubblesChat: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("./attachments.js", () => ({
-  sendBlueBubblesAttachment: vi.fn().mockResolvedValue({ messageId: "att-msg-123" }),
-}));
-
-describe("bluebubblesMessageActions", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  describe("listActions", () => {
-    it("returns empty array when account is not enabled", () => {
-      const cfg: ClawdbotConfig = {
-        channels: { bluebubbles: { enabled: false } },
-      };
-      const actions = bluebubblesMessageActions.listActions({ cfg });
-      expect(actions).toEqual([]);
-    });
-
-    it("returns empty array when account is not configured", () => {
-      const cfg: ClawdbotConfig = {
-        channels: { bluebubbles: { enabled: true } },
-      };
-      const actions = bluebubblesMessageActions.listActions({ cfg });
-      expect(actions).toEqual([]);
-    });
-
-    it("returns react action when enabled and configured", () => {
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            enabled: true,
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      const actions = bluebubblesMessageActions.listActions({ cfg });
-      expect(actions).toContain("react");
-    });
-
-    it("excludes react action when reactions are gated off", () => {
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            enabled: true,
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-            actions: { reactions: false },
-          },
-        },
-      };
-      const actions = bluebubblesMessageActions.listActions({ cfg });
-      expect(actions).not.toContain("react");
-      // Other actions should still be present
-      expect(actions).toContain("edit");
-      expect(actions).toContain("unsend");
-    });
-  });
-
-  describe("supportsAction", () => {
-    it("returns true for react action", () => {
-      expect(bluebubblesMessageActions.supportsAction({ action: "react" })).toBe(true);
-    });
-
-    it("returns true for all supported actions", () => {
-      expect(bluebubblesMessageActions.supportsAction({ action: "edit" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "unsend" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "reply" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "sendWithEffect" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "renameGroup" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "setGroupIcon" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "addParticipant" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "removeParticipant" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "leaveGroup" })).toBe(true);
-      expect(bluebubblesMessageActions.supportsAction({ action: "sendAttachment" })).toBe(true);
-    });
-
-    it("returns false for unsupported actions", () => {
-      expect(bluebubblesMessageActions.supportsAction({ action: "delete" })).toBe(false);
-      expect(bluebubblesMessageActions.supportsAction({ action: "unknown" })).toBe(false);
-    });
-  });
-
-  describe("extractToolSend", () => {
-    it("extracts send params from sendMessage action", () => {
-      const result = bluebubblesMessageActions.extractToolSend({
-        args: {
-          action: "sendMessage",
-          to: "+15551234567",
-          accountId: "test-account",
-        },
-      });
-      expect(result).toEqual({
-        to: "+15551234567",
-        accountId: "test-account",
-      });
-    });
-
-    it("returns null for non-sendMessage action", () => {
-      const result = bluebubblesMessageActions.extractToolSend({
-        args: { action: "react", to: "+15551234567" },
-      });
-      expect(result).toBeNull();
-    });
-
-    it("returns null when to is missing", () => {
-      const result = bluebubblesMessageActions.extractToolSend({
-        args: { action: "sendMessage" },
-      });
-      expect(result).toBeNull();
-    });
-  });
-
-  describe("handleAction", () => {
-    it("throws for unsupported actions", async () => {
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      await expect(
-        bluebubblesMessageActions.handleAction({
-          action: "unknownAction",
-          params: {},
-          cfg,
-          accountId: null,
-        }),
-      ).rejects.toThrow("is not supported");
-    });
-
-    it("throws when emoji is missing for react action", async () => {
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      await expect(
-        bluebubblesMessageActions.handleAction({
-          action: "react",
-          params: { messageId: "msg-123" },
-          cfg,
-          accountId: null,
-        }),
-      ).rejects.toThrow(/emoji/i);
-    });
-
-    it("throws when messageId is missing", async () => {
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      await expect(
-        bluebubblesMessageActions.handleAction({
-          action: "react",
-          params: { emoji: "❤️" },
-          cfg,
-          accountId: null,
-        }),
-      ).rejects.toThrow("messageId");
-    });
-
-    it("throws when chatGuid cannot be resolved", async () => {
-      const { resolveChatGuidForTarget } = await import("./send.js");
-      vi.mocked(resolveChatGuidForTarget).mockResolvedValueOnce(null);
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      await expect(
-        bluebubblesMessageActions.handleAction({
-          action: "react",
-          params: { emoji: "❤️", messageId: "msg-123", to: "+15551234567" },
-          cfg,
-          accountId: null,
-        }),
-      ).rejects.toThrow("chatGuid not found");
-    });
-
-    it("sends reaction successfully with chatGuid", async () => {
-      const { sendBlueBubblesReaction } = await import("./reactions.js");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      const result = await bluebubblesMessageActions.handleAction({
-        action: "react",
-        params: {
-          emoji: "❤️",
-          messageId: "msg-123",
-          chatGuid: "iMessage;-;+15551234567",
-        },
-        cfg,
-        accountId: null,
-      });
-
-      expect(sendBlueBubblesReaction).toHaveBeenCalledWith(
-        expect.objectContaining({
-          chatGuid: "iMessage;-;+15551234567",
-          messageGuid: "msg-123",
-          emoji: "❤️",
-        }),
-      );
-      // jsonResult returns { content: [...], details: payload }
-      expect(result).toMatchObject({
-        details: { ok: true, added: "❤️" },
-      });
-    });
-
-    it("sends reaction removal successfully", async () => {
-      const { sendBlueBubblesReaction } = await import("./reactions.js");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      const result = await bluebubblesMessageActions.handleAction({
-        action: "react",
-        params: {
-          emoji: "❤️",
-          messageId: "msg-123",
-          chatGuid: "iMessage;-;+15551234567",
-          remove: true,
-        },
-        cfg,
-        accountId: null,
-      });
-
-      expect(sendBlueBubblesReaction).toHaveBeenCalledWith(
-        expect.objectContaining({
-          remove: true,
-        }),
-      );
-      // jsonResult returns { content: [...], details: payload }
-      expect(result).toMatchObject({
-        details: { ok: true, removed: true },
-      });
-    });
-
-    it("resolves chatGuid from to parameter", async () => {
-      const { sendBlueBubblesReaction } = await import("./reactions.js");
-      const { resolveChatGuidForTarget } = await import("./send.js");
-      vi.mocked(resolveChatGuidForTarget).mockResolvedValueOnce("iMessage;-;+15559876543");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      await bluebubblesMessageActions.handleAction({
-        action: "react",
-        params: {
-          emoji: "👍",
-          messageId: "msg-456",
-          to: "+15559876543",
-        },
-        cfg,
-        accountId: null,
-      });
-
-      expect(resolveChatGuidForTarget).toHaveBeenCalled();
-      expect(sendBlueBubblesReaction).toHaveBeenCalledWith(
-        expect.objectContaining({
-          chatGuid: "iMessage;-;+15559876543",
-        }),
-      );
-    });
-
-    it("passes partIndex when provided", async () => {
-      const { sendBlueBubblesReaction } = await import("./reactions.js");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-      await bluebubblesMessageActions.handleAction({
-        action: "react",
-        params: {
-          emoji: "😂",
-          messageId: "msg-789",
-          chatGuid: "iMessage;-;chat-guid",
-          partIndex: 2,
-        },
-        cfg,
-        accountId: null,
-      });
-
-      expect(sendBlueBubblesReaction).toHaveBeenCalledWith(
-        expect.objectContaining({
-          partIndex: 2,
-        }),
-      );
-    });
-
-    it("accepts message param for edit action", async () => {
-      const { editBlueBubblesMessage } = await import("./chat.js");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-
-      await bluebubblesMessageActions.handleAction({
-        action: "edit",
-        params: { messageId: "msg-123", message: "updated" },
-        cfg,
-        accountId: null,
-      });
-
-      expect(editBlueBubblesMessage).toHaveBeenCalledWith(
-        "msg-123",
-        "updated",
-        expect.objectContaining({ cfg, accountId: undefined }),
-      );
-    });
-
-    it("accepts message/target aliases for sendWithEffect", async () => {
-      const { sendMessageBlueBubbles } = await import("./send.js");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-
-      const result = await bluebubblesMessageActions.handleAction({
-        action: "sendWithEffect",
-        params: {
-          message: "peekaboo",
-          target: "+15551234567",
-          effect: "invisible ink",
-        },
-        cfg,
-        accountId: null,
-      });
-
-      expect(sendMessageBlueBubbles).toHaveBeenCalledWith(
-        "+15551234567",
-        "peekaboo",
-        expect.objectContaining({ effectId: "invisible ink" }),
-      );
-      expect(result).toMatchObject({
-        details: { ok: true, messageId: "msg-123", effect: "invisible ink" },
-      });
-    });
-
-    it("throws when buffer is missing for setGroupIcon", async () => {
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-
-      await expect(
-        bluebubblesMessageActions.handleAction({
-          action: "setGroupIcon",
-          params: { chatGuid: "iMessage;-;chat-guid" },
-          cfg,
-          accountId: null,
-        }),
-      ).rejects.toThrow(/requires an image/i);
-    });
-
-    it("sets group icon successfully with chatGuid and buffer", async () => {
-      const { setGroupIconBlueBubbles } = await import("./chat.js");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-
-      // Base64 encode a simple test buffer
-      const testBuffer = Buffer.from("fake-image-data");
-      const base64Buffer = testBuffer.toString("base64");
-
-      const result = await bluebubblesMessageActions.handleAction({
-        action: "setGroupIcon",
-        params: {
-          chatGuid: "iMessage;-;chat-guid",
-          buffer: base64Buffer,
-          filename: "group-icon.png",
-          contentType: "image/png",
-        },
-        cfg,
-        accountId: null,
-      });
-
-      expect(setGroupIconBlueBubbles).toHaveBeenCalledWith(
-        "iMessage;-;chat-guid",
-        expect.any(Uint8Array),
-        "group-icon.png",
-        expect.objectContaining({ contentType: "image/png" }),
-      );
-      expect(result).toMatchObject({
-        details: { ok: true, chatGuid: "iMessage;-;chat-guid", iconSet: true },
-      });
-    });
-
-    it("uses default filename when not provided for setGroupIcon", async () => {
-      const { setGroupIconBlueBubbles } = await import("./chat.js");
-
-      const cfg: ClawdbotConfig = {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://localhost:1234",
-            password: "test-password",
-          },
-        },
-      };
-
-      const base64Buffer = Buffer.from("test").toString("base64");
-
-      await bluebubblesMessageActions.handleAction({
-        action: "setGroupIcon",
-        params: {
-          chatGuid: "iMessage;-;chat-guid",
-          buffer: base64Buffer,
-        },
-        cfg,
-        accountId: null,
-      });
-
-      expect(setGroupIconBlueBubbles).toHaveBeenCalledWith(
-        "iMessage;-;chat-guid",
-        expect.any(Uint8Array),
-        "icon.png",
-        expect.anything(),
-      );
-    });
-  });
-});

extensions/bluebubbles/src/actions.ts

@@ -1,7 +1,6 @@
 import {
   createActionGate,
   jsonResult,
-  readBooleanParam,
   readNumberParam,
   readReactionParams,
   readStringParam,
@@ -12,19 +11,8 @@ import {
 } from "clawdbot/plugin-sdk";
 
 import { resolveBlueBubblesAccount } from "./accounts.js";
-import { isMacOS26OrHigher } from "./probe.js";
 import { sendBlueBubblesReaction } from "./reactions.js";
-import { resolveChatGuidForTarget, sendMessageBlueBubbles } from "./send.js";
-import {
-  editBlueBubblesMessage,
-  unsendBlueBubblesMessage,
-  renameBlueBubblesChat,
-  setGroupIconBlueBubbles,
-  addBlueBubblesParticipant,
-  removeBlueBubblesParticipant,
-  leaveBlueBubblesChat,
-} from "./chat.js";
-import { sendBlueBubblesAttachment } from "./attachments.js";
+import { resolveChatGuidForTarget } from "./send.js";
 import { normalizeBlueBubblesHandle, parseBlueBubblesTarget } from "./targets.js";
 import type { BlueBubblesSendTarget } from "./types.js";
 
@@ -44,47 +32,16 @@ function mapTarget(raw: string): BlueBubblesSendTarget {
   };
 }
 
-function readMessageText(params: Record<string, unknown>): string | undefined {
-  return readStringParam(params, "text") ?? readStringParam(params, "message");
-}
-
-/** Supported action names for BlueBubbles */
-const SUPPORTED_ACTIONS = new Set<ChannelMessageActionName>([
-  "react",
-  "edit",
-  "unsend",
-  "reply",
-  "sendWithEffect",
-  "renameGroup",
-  "setGroupIcon",
-  "addParticipant",
-  "removeParticipant",
-  "leaveGroup",
-  "sendAttachment",
-]);
-
 export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
   listActions: ({ cfg }) => {
     const account = resolveBlueBubblesAccount({ cfg: cfg as ClawdbotConfig });
     if (!account.enabled || !account.configured) return [];
     const gate = createActionGate((cfg as ClawdbotConfig).channels?.bluebubbles?.actions);
     const actions = new Set<ChannelMessageActionName>();
-    // Check if running on macOS 26+ (edit not supported)
-    const macOS26 = isMacOS26OrHigher(account.accountId);
     if (gate("reactions")) actions.add("react");
-    if (gate("edit") && !macOS26) actions.add("edit");
-    if (gate("unsend")) actions.add("unsend");
-    if (gate("reply")) actions.add("reply");
-    if (gate("sendWithEffect")) actions.add("sendWithEffect");
-    if (gate("renameGroup")) actions.add("renameGroup");
-    if (gate("setGroupIcon")) actions.add("setGroupIcon");
-    if (gate("addParticipant")) actions.add("addParticipant");
-    if (gate("removeParticipant")) actions.add("removeParticipant");
-    if (gate("leaveGroup")) actions.add("leaveGroup");
-    if (gate("sendAttachment")) actions.add("sendAttachment");
     return Array.from(actions);
   },
-  supportsAction: ({ action }) => SUPPORTED_ACTIONS.has(action),
+  supportsAction: ({ action }) => action === "react",
   extractToolSend: ({ args }): ChannelToolSend | null => {
     const action = typeof args.action === "string" ? args.action.trim() : "";
     if (action !== "sendMessage") return null;
@@ -94,301 +51,71 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
     return { to, accountId };
   },
   handleAction: async ({ action, params, cfg, accountId }) => {
+    if (action !== "react") {
+      throw new Error(`Action ${action} is not supported for provider ${providerId}.`);
+    }
+    const { emoji, remove, isEmpty } = readReactionParams(params, {
+      removeErrorMessage: "Emoji is required to remove a BlueBubbles reaction.",
+    });
+    if (isEmpty && !remove) {
+      throw new Error("Emoji is required to send a BlueBubbles reaction.");
+    }
+    const messageId = readStringParam(params, "messageId", { required: true });
+    const chatGuid = readStringParam(params, "chatGuid");
+    const chatIdentifier = readStringParam(params, "chatIdentifier");
+    const chatId = readNumberParam(params, "chatId", { integer: true });
+    const to = readStringParam(params, "to");
+    const partIndex = readNumberParam(params, "partIndex", { integer: true });
+
     const account = resolveBlueBubblesAccount({
       cfg: cfg as ClawdbotConfig,
       accountId: accountId ?? undefined,
     });
     const baseUrl = account.config.serverUrl?.trim();
     const password = account.config.password?.trim();
-    const opts = { cfg: cfg as ClawdbotConfig, accountId: accountId ?? undefined };
-
-    // Helper to resolve chatGuid from various params
-    const resolveChatGuid = async (): Promise<string> => {
-      const chatGuid = readStringParam(params, "chatGuid");
-      if (chatGuid?.trim()) return chatGuid.trim();
-
-      const chatIdentifier = readStringParam(params, "chatIdentifier");
-      const chatId = readNumberParam(params, "chatId", { integer: true });
-      const to = readStringParam(params, "to");
-
-      const target = chatIdentifier?.trim()
-        ? ({
-            kind: "chat_identifier",
-            chatIdentifier: chatIdentifier.trim(),
-          } as BlueBubblesSendTarget)
-        : typeof chatId === "number"
-          ? ({ kind: "chat_id", chatId } as BlueBubblesSendTarget)
-          : to
-            ? mapTarget(to)
-            : null;
 
+    let resolvedChatGuid = chatGuid?.trim() || "";
+    if (!resolvedChatGuid) {
+      const target =
+        chatIdentifier?.trim()
+          ? ({ kind: "chat_identifier", chatIdentifier: chatIdentifier.trim() } as BlueBubblesSendTarget)
+          : typeof chatId === "number"
+            ? ({ kind: "chat_id", chatId } as BlueBubblesSendTarget)
+            : to
+              ? mapTarget(to)
+              : null;
       if (!target) {
-        throw new Error(`BlueBubbles ${action} requires chatGuid, chatIdentifier, chatId, or to.`);
+        throw new Error("BlueBubbles reaction requires chatGuid, chatIdentifier, chatId, or to.");
       }
       if (!baseUrl || !password) {
-        throw new Error(`BlueBubbles ${action} requires serverUrl and password.`);
+        throw new Error("BlueBubbles reaction requires serverUrl and password.");
       }
-
-      const resolved = await resolveChatGuidForTarget({ baseUrl, password, target });
-      if (!resolved) {
-        throw new Error(`BlueBubbles ${action} failed: chatGuid not found for target.`);
-      }
-      return resolved;
-    };
-
-    // Handle react action
-    if (action === "react") {
-      const { emoji, remove, isEmpty } = readReactionParams(params, {
-        removeErrorMessage: "Emoji is required to remove a BlueBubbles reaction.",
-      });
-      if (isEmpty && !remove) {
-        throw new Error(
-          "BlueBubbles react requires emoji parameter. Use action=react with emoji=<emoji> and messageId=<message_guid>.",
-        );
-      }
-      const messageId = readStringParam(params, "messageId");
-      if (!messageId) {
-        throw new Error(
-          "BlueBubbles react requires messageId parameter (the message GUID to react to). " +
-            "Use action=react with messageId=<message_guid>, emoji=<emoji>, and to/chatGuid to identify the chat.",
-        );
-      }
-      const partIndex = readNumberParam(params, "partIndex", { integer: true });
-      const resolvedChatGuid = await resolveChatGuid();
-
-      await sendBlueBubblesReaction({
-        chatGuid: resolvedChatGuid,
-        messageGuid: messageId,
-        emoji,
-        remove: remove || undefined,
-        partIndex: typeof partIndex === "number" ? partIndex : undefined,
-        opts,
-      });
-
-      return jsonResult({ ok: true, ...(remove ? { removed: true } : { added: emoji }) });
+      resolvedChatGuid =
+        (await resolveChatGuidForTarget({
+          baseUrl,
+          password,
+          target,
+        })) ?? "";
+    }
+    if (!resolvedChatGuid) {
+      throw new Error("BlueBubbles reaction failed: chatGuid not found for target.");
     }
 
-    // Handle edit action
-    if (action === "edit") {
-      // Edit is not supported on macOS 26+
-      if (isMacOS26OrHigher(accountId ?? undefined)) {
-        throw new Error(
-          "BlueBubbles edit is not supported on macOS 26 or higher. " +
-            "Apple removed the ability to edit iMessages in this version.",
-        );
-      }
-      const messageId = readStringParam(params, "messageId");
-      const newText =
-        readStringParam(params, "text") ??
-        readStringParam(params, "newText") ??
-        readStringParam(params, "message");
-      if (!messageId || !newText) {
-        const missing: string[] = [];
-        if (!messageId) missing.push("messageId (the message GUID to edit)");
-        if (!newText) missing.push("text (the new message content)");
-        throw new Error(
-          `BlueBubbles edit requires: ${missing.join(", ")}. ` +
-            `Use action=edit with messageId=<message_guid>, text=<new_content>.`,
-        );
-      }
-      const partIndex = readNumberParam(params, "partIndex", { integer: true });
-      const backwardsCompatMessage = readStringParam(params, "backwardsCompatMessage");
+    await sendBlueBubblesReaction({
+      chatGuid: resolvedChatGuid,
+      messageGuid: messageId,
+      emoji,
+      remove: remove || undefined,
+      partIndex: typeof partIndex === "number" ? partIndex : undefined,
+      opts: {
+        cfg: cfg as ClawdbotConfig,
+        accountId: accountId ?? undefined,
+      },
+    });
 
-      await editBlueBubblesMessage(messageId, newText, {
-        ...opts,
-        partIndex: typeof partIndex === "number" ? partIndex : undefined,
-        backwardsCompatMessage: backwardsCompatMessage ?? undefined,
-      });
-
-      return jsonResult({ ok: true, edited: messageId });
+    if (!remove) {
+      return jsonResult({ ok: true, added: emoji });
     }
-
-    // Handle unsend action
-    if (action === "unsend") {
-      const messageId = readStringParam(params, "messageId");
-      if (!messageId) {
-        throw new Error(
-          "BlueBubbles unsend requires messageId parameter (the message GUID to unsend). " +
-            "Use action=unsend with messageId=<message_guid>.",
-        );
-      }
-      const partIndex = readNumberParam(params, "partIndex", { integer: true });
-
-      await unsendBlueBubblesMessage(messageId, {
-        ...opts,
-        partIndex: typeof partIndex === "number" ? partIndex : undefined,
-      });
-
-      return jsonResult({ ok: true, unsent: messageId });
-    }
-
-    // Handle reply action
-    if (action === "reply") {
-      const messageId = readStringParam(params, "messageId");
-      const text = readMessageText(params);
-      const to = readStringParam(params, "to") ?? readStringParam(params, "target");
-      if (!messageId || !text || !to) {
-        const missing: string[] = [];
-        if (!messageId) missing.push("messageId (the message GUID to reply to)");
-        if (!text) missing.push("text or message (the reply message content)");
-        if (!to) missing.push("to or target (the chat target)");
-        throw new Error(
-          `BlueBubbles reply requires: ${missing.join(", ")}. ` +
-            `Use action=reply with messageId=<message_guid>, message=<your reply>, target=<chat_target>.`,
-        );
-      }
-      const partIndex = readNumberParam(params, "partIndex", { integer: true });
-
-      const result = await sendMessageBlueBubbles(to, text, {
-        ...opts,
-        replyToMessageGuid: messageId,
-        replyToPartIndex: typeof partIndex === "number" ? partIndex : undefined,
-      });
-
-      return jsonResult({ ok: true, messageId: result.messageId, repliedTo: messageId });
-    }
-
-    // Handle sendWithEffect action
-    if (action === "sendWithEffect") {
-      const text = readMessageText(params);
-      const to = readStringParam(params, "to") ?? readStringParam(params, "target");
-      const effectId = readStringParam(params, "effectId") ?? readStringParam(params, "effect");
-      if (!text || !to || !effectId) {
-        const missing: string[] = [];
-        if (!text) missing.push("text or message (the message content)");
-        if (!to) missing.push("to or target (the chat target)");
-        if (!effectId)
-          missing.push(
-            "effectId or effect (e.g., slam, loud, gentle, invisible-ink, confetti, lasers, fireworks, balloons, heart)",
-          );
-        throw new Error(
-          `BlueBubbles sendWithEffect requires: ${missing.join(", ")}. ` +
-            `Use action=sendWithEffect with message=<message>, target=<chat_target>, effectId=<effect_name>.`,
-        );
-      }
-
-      const result = await sendMessageBlueBubbles(to, text, {
-        ...opts,
-        effectId,
-      });
-
-      return jsonResult({ ok: true, messageId: result.messageId, effect: effectId });
-    }
-
-    // Handle renameGroup action
-    if (action === "renameGroup") {
-      const resolvedChatGuid = await resolveChatGuid();
-      const displayName = readStringParam(params, "displayName") ?? readStringParam(params, "name");
-      if (!displayName) {
-        throw new Error("BlueBubbles renameGroup requires displayName or name parameter.");
-      }
-
-      await renameBlueBubblesChat(resolvedChatGuid, displayName, opts);
-
-      return jsonResult({ ok: true, renamed: resolvedChatGuid, displayName });
-    }
-
-    // Handle setGroupIcon action
-    if (action === "setGroupIcon") {
-      const resolvedChatGuid = await resolveChatGuid();
-      const base64Buffer = readStringParam(params, "buffer");
-      const filename =
-        readStringParam(params, "filename") ??
-        readStringParam(params, "name") ??
-        "icon.png";
-      const contentType =
-        readStringParam(params, "contentType") ?? readStringParam(params, "mimeType");
-
-      if (!base64Buffer) {
-        throw new Error(
-          "BlueBubbles setGroupIcon requires an image. " +
-            "Use action=setGroupIcon with media=<image_url> or path=<local_file_path> to set the group icon.",
-        );
-      }
-
-      // Decode base64 to buffer
-      const buffer = Uint8Array.from(atob(base64Buffer), (c) => c.charCodeAt(0));
-
-      await setGroupIconBlueBubbles(resolvedChatGuid, buffer, filename, {
-        ...opts,
-        contentType: contentType ?? undefined,
-      });
-
-      return jsonResult({ ok: true, chatGuid: resolvedChatGuid, iconSet: true });
-    }
-
-    // Handle addParticipant action
-    if (action === "addParticipant") {
-      const resolvedChatGuid = await resolveChatGuid();
-      const address = readStringParam(params, "address") ?? readStringParam(params, "participant");
-      if (!address) {
-        throw new Error("BlueBubbles addParticipant requires address or participant parameter.");
-      }
-
-      await addBlueBubblesParticipant(resolvedChatGuid, address, opts);
-
-      return jsonResult({ ok: true, added: address, chatGuid: resolvedChatGuid });
-    }
-
-    // Handle removeParticipant action
-    if (action === "removeParticipant") {
-      const resolvedChatGuid = await resolveChatGuid();
-      const address = readStringParam(params, "address") ?? readStringParam(params, "participant");
-      if (!address) {
-        throw new Error("BlueBubbles removeParticipant requires address or participant parameter.");
-      }
-
-      await removeBlueBubblesParticipant(resolvedChatGuid, address, opts);
-
-      return jsonResult({ ok: true, removed: address, chatGuid: resolvedChatGuid });
-    }
-
-    // Handle leaveGroup action
-    if (action === "leaveGroup") {
-      const resolvedChatGuid = await resolveChatGuid();
-
-      await leaveBlueBubblesChat(resolvedChatGuid, opts);
-
-      return jsonResult({ ok: true, left: resolvedChatGuid });
-    }
-
-    // Handle sendAttachment action
-    if (action === "sendAttachment") {
-      const to = readStringParam(params, "to", { required: true });
-      const filename = readStringParam(params, "filename", { required: true });
-      const caption = readStringParam(params, "caption");
-      const contentType =
-        readStringParam(params, "contentType") ?? readStringParam(params, "mimeType");
-
-      // Buffer can come from params.buffer (base64) or params.path (file path)
-      const base64Buffer = readStringParam(params, "buffer");
-      const filePath = readStringParam(params, "path") ?? readStringParam(params, "filePath");
-
-      let buffer: Uint8Array;
-      if (base64Buffer) {
-        // Decode base64 to buffer
-        buffer = Uint8Array.from(atob(base64Buffer), (c) => c.charCodeAt(0));
-      } else if (filePath) {
-        // Read file from path (will be handled by caller providing buffer)
-        throw new Error(
-          "BlueBubbles sendAttachment: filePath not supported in action, provide buffer as base64.",
-        );
-      } else {
-        throw new Error("BlueBubbles sendAttachment requires buffer (base64) parameter.");
-      }
-
-      const result = await sendBlueBubblesAttachment({
-        to,
-        buffer,
-        filename,
-        contentType: contentType ?? undefined,
-        caption: caption ?? undefined,
-        opts,
-      });
-
-      return jsonResult({ ok: true, messageId: result.messageId });
-    }
-
-    throw new Error(`Action ${action} is not supported for provider ${providerId}.`);
+    return jsonResult({ ok: true, removed: true });
   },
 };

extensions/bluebubbles/src/attachments.test.ts

@@ -1,240 +0,0 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
-
-import { downloadBlueBubblesAttachment } from "./attachments.js";
-import type { BlueBubblesAttachment } from "./types.js";
-
-vi.mock("./accounts.js", () => ({
-  resolveBlueBubblesAccount: vi.fn(({ cfg, accountId }) => {
-    const config = cfg?.channels?.bluebubbles ?? {};
-    return {
-      accountId: accountId ?? "default",
-      enabled: config.enabled !== false,
-      configured: Boolean(config.serverUrl && config.password),
-      config,
-    };
-  }),
-}));
-
-const mockFetch = vi.fn();
-
-describe("downloadBlueBubblesAttachment", () => {
-  beforeEach(() => {
-    vi.stubGlobal("fetch", mockFetch);
-    mockFetch.mockReset();
-  });
-
-  afterEach(() => {
-    vi.unstubAllGlobals();
-  });
-
-  it("throws when guid is missing", async () => {
-    const attachment: BlueBubblesAttachment = {};
-    await expect(
-      downloadBlueBubblesAttachment(attachment, {
-        serverUrl: "http://localhost:1234",
-        password: "test-password",
-      }),
-    ).rejects.toThrow("guid is required");
-  });
-
-  it("throws when guid is empty string", async () => {
-    const attachment: BlueBubblesAttachment = { guid: "  " };
-    await expect(
-      downloadBlueBubblesAttachment(attachment, {
-        serverUrl: "http://localhost:1234",
-        password: "test-password",
-      }),
-    ).rejects.toThrow("guid is required");
-  });
-
-  it("throws when serverUrl is missing", async () => {
-    const attachment: BlueBubblesAttachment = { guid: "att-123" };
-    await expect(downloadBlueBubblesAttachment(attachment, {})).rejects.toThrow(
-      "serverUrl is required",
-    );
-  });
-
-  it("throws when password is missing", async () => {
-    const attachment: BlueBubblesAttachment = { guid: "att-123" };
-    await expect(
-      downloadBlueBubblesAttachment(attachment, {
-        serverUrl: "http://localhost:1234",
-      }),
-    ).rejects.toThrow("password is required");
-  });
-
-  it("downloads attachment successfully", async () => {
-    const mockBuffer = new Uint8Array([1, 2, 3, 4]);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers({ "content-type": "image/png" }),
-      arrayBuffer: () => Promise.resolve(mockBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = { guid: "att-123" };
-    const result = await downloadBlueBubblesAttachment(attachment, {
-      serverUrl: "http://localhost:1234",
-      password: "test-password",
-    });
-
-    expect(result.buffer).toEqual(mockBuffer);
-    expect(result.contentType).toBe("image/png");
-    expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining("/api/v1/attachment/att-123/download"),
-      expect.objectContaining({ method: "GET" }),
-    );
-  });
-
-  it("includes password in URL query", async () => {
-    const mockBuffer = new Uint8Array([1, 2, 3, 4]);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers({ "content-type": "image/jpeg" }),
-      arrayBuffer: () => Promise.resolve(mockBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = { guid: "att-456" };
-    await downloadBlueBubblesAttachment(attachment, {
-      serverUrl: "http://localhost:1234",
-      password: "my-secret-password",
-    });
-
-    const calledUrl = mockFetch.mock.calls[0][0] as string;
-    expect(calledUrl).toContain("password=my-secret-password");
-  });
-
-  it("encodes guid in URL", async () => {
-    const mockBuffer = new Uint8Array([1]);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers(),
-      arrayBuffer: () => Promise.resolve(mockBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = { guid: "att/with/special chars" };
-    await downloadBlueBubblesAttachment(attachment, {
-      serverUrl: "http://localhost:1234",
-      password: "test",
-    });
-
-    const calledUrl = mockFetch.mock.calls[0][0] as string;
-    expect(calledUrl).toContain("att%2Fwith%2Fspecial%20chars");
-  });
-
-  it("throws on non-ok response", async () => {
-    mockFetch.mockResolvedValueOnce({
-      ok: false,
-      status: 404,
-      text: () => Promise.resolve("Attachment not found"),
-    });
-
-    const attachment: BlueBubblesAttachment = { guid: "att-missing" };
-    await expect(
-      downloadBlueBubblesAttachment(attachment, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      }),
-    ).rejects.toThrow("download failed (404): Attachment not found");
-  });
-
-  it("throws when attachment exceeds max bytes", async () => {
-    const largeBuffer = new Uint8Array(10 * 1024 * 1024);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers(),
-      arrayBuffer: () => Promise.resolve(largeBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = { guid: "att-large" };
-    await expect(
-      downloadBlueBubblesAttachment(attachment, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-        maxBytes: 5 * 1024 * 1024,
-      }),
-    ).rejects.toThrow("too large");
-  });
-
-  it("uses default max bytes when not specified", async () => {
-    const largeBuffer = new Uint8Array(9 * 1024 * 1024);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers(),
-      arrayBuffer: () => Promise.resolve(largeBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = { guid: "att-large" };
-    await expect(
-      downloadBlueBubblesAttachment(attachment, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      }),
-    ).rejects.toThrow("too large");
-  });
-
-  it("uses attachment mimeType as fallback when response has no content-type", async () => {
-    const mockBuffer = new Uint8Array([1, 2, 3]);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers(),
-      arrayBuffer: () => Promise.resolve(mockBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = {
-      guid: "att-789",
-      mimeType: "video/mp4",
-    };
-    const result = await downloadBlueBubblesAttachment(attachment, {
-      serverUrl: "http://localhost:1234",
-      password: "test",
-    });
-
-    expect(result.contentType).toBe("video/mp4");
-  });
-
-  it("prefers response content-type over attachment mimeType", async () => {
-    const mockBuffer = new Uint8Array([1, 2, 3]);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers({ "content-type": "image/webp" }),
-      arrayBuffer: () => Promise.resolve(mockBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = {
-      guid: "att-xyz",
-      mimeType: "image/png",
-    };
-    const result = await downloadBlueBubblesAttachment(attachment, {
-      serverUrl: "http://localhost:1234",
-      password: "test",
-    });
-
-    expect(result.contentType).toBe("image/webp");
-  });
-
-  it("resolves credentials from config when opts not provided", async () => {
-    const mockBuffer = new Uint8Array([1]);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      headers: new Headers(),
-      arrayBuffer: () => Promise.resolve(mockBuffer.buffer),
-    });
-
-    const attachment: BlueBubblesAttachment = { guid: "att-config" };
-    const result = await downloadBlueBubblesAttachment(attachment, {
-      cfg: {
-        channels: {
-          bluebubbles: {
-            serverUrl: "http://config-server:5678",
-            password: "config-password",
-          },
-        },
-      },
-    });
-
-    const calledUrl = mockFetch.mock.calls[0][0] as string;
-    expect(calledUrl).toContain("config-server:5678");
-    expect(calledUrl).toContain("password=config-password");
-    expect(result.buffer).toEqual(new Uint8Array([1]));
-  });
-});

extensions/bluebubbles/src/attachments.ts

@@ -1,13 +1,9 @@
-import crypto from "node:crypto";
 import type { ClawdbotConfig } from "clawdbot/plugin-sdk";
 import { resolveBlueBubblesAccount } from "./accounts.js";
-import { resolveChatGuidForTarget } from "./send.js";
-import { parseBlueBubblesTarget, normalizeBlueBubblesHandle } from "./targets.js";
 import {
   blueBubblesFetchWithTimeout,
   buildBlueBubblesApiUrl,
   type BlueBubblesAttachment,
-  type BlueBubblesSendTarget,
 } from "./types.js";
 
 export type BlueBubblesAttachmentOpts = {
@@ -59,168 +55,3 @@ export async function downloadBlueBubblesAttachment(
   }
   return { buffer: buf, contentType: contentType ?? attachment.mimeType ?? undefined };
 }
-
-export type SendBlueBubblesAttachmentResult = {
-  messageId: string;
-};
-
-function resolveSendTarget(raw: string): BlueBubblesSendTarget {
-  const parsed = parseBlueBubblesTarget(raw);
-  if (parsed.kind === "handle") {
-    return {
-      kind: "handle",
-      address: normalizeBlueBubblesHandle(parsed.to),
-      service: parsed.service,
-    };
-  }
-  if (parsed.kind === "chat_id") {
-    return { kind: "chat_id", chatId: parsed.chatId };
-  }
-  if (parsed.kind === "chat_guid") {
-    return { kind: "chat_guid", chatGuid: parsed.chatGuid };
-  }
-  return { kind: "chat_identifier", chatIdentifier: parsed.chatIdentifier };
-}
-
-function extractMessageId(payload: unknown): string {
-  if (!payload || typeof payload !== "object") return "unknown";
-  const record = payload as Record<string, unknown>;
-  const data = record.data && typeof record.data === "object" ? (record.data as Record<string, unknown>) : null;
-  const candidates = [
-    record.messageId,
-    record.guid,
-    record.id,
-    data?.messageId,
-    data?.guid,
-    data?.id,
-  ];
-  for (const candidate of candidates) {
-    if (typeof candidate === "string" && candidate.trim()) return candidate.trim();
-    if (typeof candidate === "number" && Number.isFinite(candidate)) return String(candidate);
-  }
-  return "unknown";
-}
-
-/**
- * Send an attachment via BlueBubbles API.
- * Supports sending media files (images, videos, audio, documents) to a chat.
- */
-export async function sendBlueBubblesAttachment(params: {
-  to: string;
-  buffer: Uint8Array;
-  filename: string;
-  contentType?: string;
-  caption?: string;
-  replyToMessageGuid?: string;
-  replyToPartIndex?: number;
-  opts?: BlueBubblesAttachmentOpts;
-}): Promise<SendBlueBubblesAttachmentResult> {
-  const { to, buffer, filename, contentType, caption, replyToMessageGuid, replyToPartIndex, opts = {} } =
-    params;
-  const { baseUrl, password } = resolveAccount(opts);
-
-  const target = resolveSendTarget(to);
-  const chatGuid = await resolveChatGuidForTarget({
-    baseUrl,
-    password,
-    timeoutMs: opts.timeoutMs,
-    target,
-  });
-  if (!chatGuid) {
-    throw new Error(
-      "BlueBubbles attachment send failed: chatGuid not found for target. Use a chat_guid target or ensure the chat exists.",
-    );
-  }
-
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: "/api/v1/message/attachment",
-    password,
-  });
-
-  // Build FormData with the attachment
-  const boundary = `----BlueBubblesFormBoundary${crypto.randomUUID().replace(/-/g, "")}`;
-  const parts: Uint8Array[] = [];
-  const encoder = new TextEncoder();
-
-  // Helper to add a form field
-  const addField = (name: string, value: string) => {
-    parts.push(encoder.encode(`--${boundary}\r\n`));
-    parts.push(encoder.encode(`Content-Disposition: form-data; name="${name}"\r\n\r\n`));
-    parts.push(encoder.encode(`${value}\r\n`));
-  };
-
-  // Helper to add a file field
-  const addFile = (name: string, fileBuffer: Uint8Array, fileName: string, mimeType?: string) => {
-    parts.push(encoder.encode(`--${boundary}\r\n`));
-    parts.push(
-      encoder.encode(
-        `Content-Disposition: form-data; name="${name}"; filename="${fileName}"\r\n`,
-      ),
-    );
-    parts.push(encoder.encode(`Content-Type: ${mimeType ?? "application/octet-stream"}\r\n\r\n`));
-    parts.push(fileBuffer);
-    parts.push(encoder.encode("\r\n"));
-  };
-
-  // Add required fields
-  addFile("attachment", buffer, filename, contentType);
-  addField("chatGuid", chatGuid);
-  addField("name", filename);
-  addField("tempGuid", `temp-${Date.now()}-${crypto.randomUUID().slice(0, 8)}`);
-  addField("method", "private-api");
-
-  const trimmedReplyTo = replyToMessageGuid?.trim();
-  if (trimmedReplyTo) {
-    addField("selectedMessageGuid", trimmedReplyTo);
-    addField(
-      "partIndex",
-      typeof replyToPartIndex === "number" ? String(replyToPartIndex) : "0",
-    );
-  }
-
-  // Add optional caption
-  if (caption) {
-    addField("message", caption);
-    addField("text", caption);
-    addField("caption", caption);
-  }
-
-  // Close the multipart body
-  parts.push(encoder.encode(`--${boundary}--\r\n`));
-
-  // Combine all parts into a single buffer
-  const totalLength = parts.reduce((acc, part) => acc + part.length, 0);
-  const body = new Uint8Array(totalLength);
-  let offset = 0;
-  for (const part of parts) {
-    body.set(part, offset);
-    offset += part.length;
-  }
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": `multipart/form-data; boundary=${boundary}`,
-      },
-      body,
-    },
-    opts.timeoutMs ?? 60_000, // longer timeout for file uploads
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text();
-    throw new Error(`BlueBubbles attachment send failed (${res.status}): ${errorText || "unknown"}`);
-  }
-
-  const responseBody = await res.text();
-  if (!responseBody) return { messageId: "ok" };
-  try {
-    const parsed = JSON.parse(responseBody) as unknown;
-    return { messageId: extractMessageId(parsed) };
-  } catch {
-    return { messageId: "ok" };
-  }
-}

extensions/bluebubbles/src/channel.ts

@@ -2,14 +2,12 @@ import type { ChannelAccountSnapshot, ChannelPlugin, ClawdbotConfig } from "claw
 import {
   applyAccountNameToChannelSection,
   buildChannelConfigSchema,
-  collectBlueBubblesStatusIssues,
   DEFAULT_ACCOUNT_ID,
   deleteAccountFromConfigSection,
   formatPairingApproveHint,
   migrateBaseNameToDefaultAccount,
   normalizeAccountId,
   PAIRING_APPROVED_MESSAGE,
-  resolveBlueBubblesGroupRequireMention,
   setAccountEnabledInConfigSection,
 } from "clawdbot/plugin-sdk";
 
@@ -20,30 +18,20 @@ import {
   resolveDefaultBlueBubblesAccountId,
 } from "./accounts.js";
 import { BlueBubblesConfigSchema } from "./config-schema.js";
-import { probeBlueBubbles, type BlueBubblesProbe } from "./probe.js";
+import { probeBlueBubbles } from "./probe.js";
 import { sendMessageBlueBubbles } from "./send.js";
-import {
-  looksLikeBlueBubblesTargetId,
-  normalizeBlueBubblesHandle,
-  normalizeBlueBubblesMessagingTarget,
-} from "./targets.js";
+import { normalizeBlueBubblesHandle } from "./targets.js";
 import { bluebubblesMessageActions } from "./actions.js";
 import { monitorBlueBubblesProvider, resolveWebhookPathFromConfig } from "./monitor.js";
-import { blueBubblesOnboardingAdapter } from "./onboarding.js";
-import { sendBlueBubblesMedia } from "./media-send.js";
 
 const meta = {
   id: "bluebubbles",
   label: "BlueBubbles",
   selectionLabel: "BlueBubbles (macOS app)",
-  detailLabel: "BlueBubbles",
   docsPath: "/channels/bluebubbles",
   docsLabel: "bluebubbles",
   blurb: "iMessage via the BlueBubbles mac app + REST API.",
-  systemImage: "bubble.left.and.text.bubble.right",
-  aliases: ["bb"],
   order: 75,
-  preferOver: ["imessage"],
 };
 
 export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
@@ -51,27 +39,11 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
   meta,
   capabilities: {
     chatTypes: ["direct", "group"],
-    media: true,
+    media: false,
     reactions: true,
-    edit: true,
-    unsend: true,
-    reply: true,
-    effects: true,
-    groupManagement: true,
-  },
-  groups: {
-    resolveRequireMention: resolveBlueBubblesGroupRequireMention,
-  },
-  threading: {
-    buildToolContext: ({ context, hasRepliedRef }) => ({
-      currentChannelId: context.To?.trim() || undefined,
-      currentThreadTs: context.ReplyToId,
-      hasRepliedRef,
-    }),
   },
   reload: { configPrefixes: ["channels.bluebubbles"] },
   configSchema: buildChannelConfigSchema(BlueBubblesConfigSchema),
-  onboarding: blueBubblesOnboardingAdapter,
   config: {
     listAccountIds: (cfg) => listBlueBubblesAccountIds(cfg as ClawdbotConfig),
     resolveAccount: (cfg, accountId) =>
@@ -139,13 +111,6 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
       ];
     },
   },
-  messaging: {
-    normalizeTarget: normalizeBlueBubblesMessagingTarget,
-    targetResolver: {
-      looksLikeId: looksLikeBlueBubblesTargetId,
-      hint: "<handle|chat_guid:GUID|chat_id:ID|chat_identifier:ID>",
-    },
-  },
   setup: {
     resolveAccountId: ({ accountId }) => normalizeAccountId(accountId),
     applyAccountName: ({ cfg, accountId, name }) =>
@@ -187,7 +152,6 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
               enabled: true,
               ...(input.httpUrl ? { serverUrl: input.httpUrl } : {}),
               ...(input.password ? { password: input.password } : {}),
-              ...(input.webhookPath ? { webhookPath: input.webhookPath } : {}),
             },
           },
         } as ClawdbotConfig;
@@ -206,7 +170,6 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
                 enabled: true,
                 ...(input.httpUrl ? { serverUrl: input.httpUrl } : {}),
                 ...(input.password ? { password: input.password } : {}),
-                ...(input.webhookPath ? { webhookPath: input.webhookPath } : {}),
               },
             },
           },
@@ -236,39 +199,15 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
       }
       return { ok: true, to: trimmed };
     },
-    sendText: async ({ cfg, to, text, accountId, replyToId }) => {
-      const replyToMessageGuid = typeof replyToId === "string" ? replyToId.trim() : "";
+    sendText: async ({ cfg, to, text, accountId }) => {
       const result = await sendMessageBlueBubbles(to, text, {
         cfg: cfg as ClawdbotConfig,
         accountId: accountId ?? undefined,
-        replyToMessageGuid: replyToMessageGuid || undefined,
       });
       return { channel: "bluebubbles", ...result };
     },
-    sendMedia: async (ctx) => {
-      const { cfg, to, text, mediaUrl, accountId, replyToId } = ctx;
-      const { mediaPath, mediaBuffer, contentType, filename, caption } = ctx as {
-        mediaPath?: string;
-        mediaBuffer?: Uint8Array;
-        contentType?: string;
-        filename?: string;
-        caption?: string;
-      };
-      const resolvedCaption = caption ?? text;
-      const result = await sendBlueBubblesMedia({
-        cfg: cfg as ClawdbotConfig,
-        to,
-        mediaUrl,
-        mediaPath,
-        mediaBuffer,
-        contentType,
-        filename,
-        caption: resolvedCaption ?? undefined,
-        replyToId: replyToId ?? null,
-        accountId: accountId ?? undefined,
-      });
-
-      return { channel: "bluebubbles", ...result };
+    sendMedia: async () => {
+      throw new Error("BlueBubbles media delivery is not supported yet.");
     },
   },
   status: {
@@ -279,7 +218,19 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
       lastStopAt: null,
       lastError: null,
     },
-    collectStatusIssues: collectBlueBubblesStatusIssues,
+    collectStatusIssues: (accounts) =>
+      accounts.flatMap((account) => {
+        const lastError = typeof account.lastError === "string" ? account.lastError.trim() : "";
+        if (!lastError) return [];
+        return [
+          {
+            channel: "bluebubbles",
+            accountId: account.accountId,
+            kind: "runtime",
+            message: `Channel error: ${lastError}`,
+          },
+        ];
+      }),
     buildChannelSummary: ({ snapshot }) => ({
       configured: snapshot.configured ?? false,
       baseUrl: snapshot.baseUrl ?? null,
@@ -296,25 +247,20 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
         password: account.config.password ?? null,
         timeoutMs,
       }),
-    buildAccountSnapshot: ({ account, runtime, probe }) => {
-      const running = runtime?.running ?? false;
-      const probeOk = (probe as BlueBubblesProbe | undefined)?.ok;
-      return {
-        accountId: account.accountId,
-        name: account.name,
-        enabled: account.enabled,
-        configured: account.configured,
-        baseUrl: account.baseUrl,
-        running,
-        connected: probeOk ?? running,
-        lastStartAt: runtime?.lastStartAt ?? null,
-        lastStopAt: runtime?.lastStopAt ?? null,
-        lastError: runtime?.lastError ?? null,
-        probe,
-        lastInboundAt: runtime?.lastInboundAt ?? null,
-        lastOutboundAt: runtime?.lastOutboundAt ?? null,
-      };
-    },
+    buildAccountSnapshot: ({ account, runtime, probe }) => ({
+      accountId: account.accountId,
+      name: account.name,
+      enabled: account.enabled,
+      configured: account.configured,
+      baseUrl: account.baseUrl,
+      running: runtime?.running ?? false,
+      lastStartAt: runtime?.lastStartAt ?? null,
+      lastStopAt: runtime?.lastStopAt ?? null,
+      lastError: runtime?.lastError ?? null,
+      probe,
+      lastInboundAt: runtime?.lastInboundAt ?? null,
+      lastOutboundAt: runtime?.lastOutboundAt ?? null,
+    }),
   },
   gateway: {
     startAccount: async (ctx) => {

extensions/bluebubbles/src/chat.test.ts

@@ -1,462 +0,0 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
-
-import { markBlueBubblesChatRead, sendBlueBubblesTyping, setGroupIconBlueBubbles } from "./chat.js";
-
-vi.mock("./accounts.js", () => ({
-  resolveBlueBubblesAccount: vi.fn(({ cfg, accountId }) => {
-    const config = cfg?.channels?.bluebubbles ?? {};
-    return {
-      accountId: accountId ?? "default",
-      enabled: config.enabled !== false,
-      configured: Boolean(config.serverUrl && config.password),
-      config,
-    };
-  }),
-}));
-
-const mockFetch = vi.fn();
-
-describe("chat", () => {
-  beforeEach(() => {
-    vi.stubGlobal("fetch", mockFetch);
-    mockFetch.mockReset();
-  });
-
-  afterEach(() => {
-    vi.unstubAllGlobals();
-  });
-
-  describe("markBlueBubblesChatRead", () => {
-    it("does nothing when chatGuid is empty", async () => {
-      await markBlueBubblesChatRead("", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-      expect(mockFetch).not.toHaveBeenCalled();
-    });
-
-    it("does nothing when chatGuid is whitespace", async () => {
-      await markBlueBubblesChatRead("   ", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-      expect(mockFetch).not.toHaveBeenCalled();
-    });
-
-    it("throws when serverUrl is missing", async () => {
-      await expect(markBlueBubblesChatRead("chat-guid", {})).rejects.toThrow(
-        "serverUrl is required",
-      );
-    });
-
-    it("throws when password is missing", async () => {
-      await expect(
-        markBlueBubblesChatRead("chat-guid", {
-          serverUrl: "http://localhost:1234",
-        }),
-      ).rejects.toThrow("password is required");
-    });
-
-    it("marks chat as read successfully", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await markBlueBubblesChatRead("iMessage;-;+15551234567", {
-        serverUrl: "http://localhost:1234",
-        password: "test-password",
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        expect.stringContaining("/api/v1/chat/iMessage%3B-%3B%2B15551234567/read"),
-        expect.objectContaining({ method: "POST" }),
-      );
-    });
-
-    it("includes password in URL query", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await markBlueBubblesChatRead("chat-123", {
-        serverUrl: "http://localhost:1234",
-        password: "my-secret",
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("password=my-secret");
-    });
-
-    it("throws on non-ok response", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: false,
-        status: 404,
-        text: () => Promise.resolve("Chat not found"),
-      });
-
-      await expect(
-        markBlueBubblesChatRead("missing-chat", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("read failed (404): Chat not found");
-    });
-
-    it("trims chatGuid before using", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await markBlueBubblesChatRead("  chat-with-spaces  ", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("/api/v1/chat/chat-with-spaces/read");
-      expect(calledUrl).not.toContain("%20chat");
-    });
-
-    it("resolves credentials from config", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await markBlueBubblesChatRead("chat-123", {
-        cfg: {
-          channels: {
-            bluebubbles: {
-              serverUrl: "http://config-server:9999",
-              password: "config-pass",
-            },
-          },
-        },
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("config-server:9999");
-      expect(calledUrl).toContain("password=config-pass");
-    });
-  });
-
-  describe("sendBlueBubblesTyping", () => {
-    it("does nothing when chatGuid is empty", async () => {
-      await sendBlueBubblesTyping("", true, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-      expect(mockFetch).not.toHaveBeenCalled();
-    });
-
-    it("does nothing when chatGuid is whitespace", async () => {
-      await sendBlueBubblesTyping("   ", false, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-      expect(mockFetch).not.toHaveBeenCalled();
-    });
-
-    it("throws when serverUrl is missing", async () => {
-      await expect(sendBlueBubblesTyping("chat-guid", true, {})).rejects.toThrow(
-        "serverUrl is required",
-      );
-    });
-
-    it("throws when password is missing", async () => {
-      await expect(
-        sendBlueBubblesTyping("chat-guid", true, {
-          serverUrl: "http://localhost:1234",
-        }),
-      ).rejects.toThrow("password is required");
-    });
-
-    it("sends typing start with POST method", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesTyping("iMessage;-;+15551234567", true, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        expect.stringContaining("/api/v1/chat/iMessage%3B-%3B%2B15551234567/typing"),
-        expect.objectContaining({ method: "POST" }),
-      );
-    });
-
-    it("sends typing stop with DELETE method", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesTyping("iMessage;-;+15551234567", false, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        expect.stringContaining("/api/v1/chat/iMessage%3B-%3B%2B15551234567/typing"),
-        expect.objectContaining({ method: "DELETE" }),
-      );
-    });
-
-    it("includes password in URL query", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesTyping("chat-123", true, {
-        serverUrl: "http://localhost:1234",
-        password: "typing-secret",
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("password=typing-secret");
-    });
-
-    it("throws on non-ok response", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: false,
-        status: 500,
-        text: () => Promise.resolve("Internal error"),
-      });
-
-      await expect(
-        sendBlueBubblesTyping("chat-123", true, {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("typing failed (500): Internal error");
-    });
-
-    it("trims chatGuid before using", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesTyping("  trimmed-chat  ", true, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("/api/v1/chat/trimmed-chat/typing");
-    });
-
-    it("encodes special characters in chatGuid", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesTyping("iMessage;+;group@chat.com", true, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("iMessage%3B%2B%3Bgroup%40chat.com");
-    });
-
-    it("resolves credentials from config", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesTyping("chat-123", true, {
-        cfg: {
-          channels: {
-            bluebubbles: {
-              serverUrl: "http://typing-server:8888",
-              password: "typing-pass",
-            },
-          },
-        },
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("typing-server:8888");
-      expect(calledUrl).toContain("password=typing-pass");
-    });
-
-    it("can start and stop typing in sequence", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve(""),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve(""),
-        });
-
-      await sendBlueBubblesTyping("chat-123", true, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-      await sendBlueBubblesTyping("chat-123", false, {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(mockFetch).toHaveBeenCalledTimes(2);
-      expect(mockFetch.mock.calls[0][1].method).toBe("POST");
-      expect(mockFetch.mock.calls[1][1].method).toBe("DELETE");
-    });
-  });
-
-  describe("setGroupIconBlueBubbles", () => {
-    it("throws when chatGuid is empty", async () => {
-      await expect(
-        setGroupIconBlueBubbles("", new Uint8Array([1, 2, 3]), "icon.png", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("chatGuid");
-    });
-
-    it("throws when buffer is empty", async () => {
-      await expect(
-        setGroupIconBlueBubbles("chat-guid", new Uint8Array(0), "icon.png", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("image buffer");
-    });
-
-    it("throws when serverUrl is missing", async () => {
-      await expect(
-        setGroupIconBlueBubbles("chat-guid", new Uint8Array([1, 2, 3]), "icon.png", {}),
-      ).rejects.toThrow("serverUrl is required");
-    });
-
-    it("throws when password is missing", async () => {
-      await expect(
-        setGroupIconBlueBubbles("chat-guid", new Uint8Array([1, 2, 3]), "icon.png", {
-          serverUrl: "http://localhost:1234",
-        }),
-      ).rejects.toThrow("password is required");
-    });
-
-    it("sets group icon successfully", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47]); // PNG magic bytes
-      await setGroupIconBlueBubbles("iMessage;-;chat-guid", buffer, "icon.png", {
-        serverUrl: "http://localhost:1234",
-        password: "test-password",
-        contentType: "image/png",
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        expect.stringContaining("/api/v1/chat/iMessage%3B-%3Bchat-guid/icon"),
-        expect.objectContaining({
-          method: "POST",
-          headers: expect.objectContaining({
-            "Content-Type": expect.stringContaining("multipart/form-data"),
-          }),
-        }),
-      );
-    });
-
-    it("includes password in URL query", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await setGroupIconBlueBubbles("chat-123", new Uint8Array([1, 2, 3]), "icon.png", {
-        serverUrl: "http://localhost:1234",
-        password: "my-secret",
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("password=my-secret");
-    });
-
-    it("throws on non-ok response", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: false,
-        status: 500,
-        text: () => Promise.resolve("Internal error"),
-      });
-
-      await expect(
-        setGroupIconBlueBubbles("chat-123", new Uint8Array([1, 2, 3]), "icon.png", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("setGroupIcon failed (500): Internal error");
-    });
-
-    it("trims chatGuid before using", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await setGroupIconBlueBubbles("  chat-with-spaces  ", new Uint8Array([1]), "icon.png", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("/api/v1/chat/chat-with-spaces/icon");
-      expect(calledUrl).not.toContain("%20chat");
-    });
-
-    it("resolves credentials from config", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await setGroupIconBlueBubbles("chat-123", new Uint8Array([1]), "icon.png", {
-        cfg: {
-          channels: {
-            bluebubbles: {
-              serverUrl: "http://config-server:9999",
-              password: "config-pass",
-            },
-          },
-        },
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("config-server:9999");
-      expect(calledUrl).toContain("password=config-pass");
-    });
-
-    it("includes filename in multipart body", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await setGroupIconBlueBubbles("chat-123", new Uint8Array([1, 2, 3]), "custom-icon.jpg", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-        contentType: "image/jpeg",
-      });
-
-      const body = mockFetch.mock.calls[0][1].body as Uint8Array;
-      const bodyString = new TextDecoder().decode(body);
-      expect(bodyString).toContain('filename="custom-icon.jpg"');
-      expect(bodyString).toContain("image/jpeg");
-    });
-  });
-});

extensions/bluebubbles/src/chat.ts

@@ -1,4 +1,3 @@
-import crypto from "node:crypto";
 import { resolveBlueBubblesAccount } from "./accounts.js";
 import type { ClawdbotConfig } from "clawdbot/plugin-sdk";
 import { blueBubblesFetchWithTimeout, buildBlueBubblesApiUrl } from "./types.js";
@@ -65,290 +64,3 @@ export async function sendBlueBubblesTyping(
     throw new Error(`BlueBubbles typing failed (${res.status}): ${errorText || "unknown"}`);
   }
 }
-
-/**
- * Edit a message via BlueBubbles API.
- * Requires macOS 13 (Ventura) or higher with Private API enabled.
- */
-export async function editBlueBubblesMessage(
-  messageGuid: string,
-  newText: string,
-  opts: BlueBubblesChatOpts & { partIndex?: number; backwardsCompatMessage?: string } = {},
-): Promise<void> {
-  const trimmedGuid = messageGuid.trim();
-  if (!trimmedGuid) throw new Error("BlueBubbles edit requires messageGuid");
-  const trimmedText = newText.trim();
-  if (!trimmedText) throw new Error("BlueBubbles edit requires newText");
-
-  const { baseUrl, password } = resolveAccount(opts);
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: `/api/v1/message/${encodeURIComponent(trimmedGuid)}/edit`,
-    password,
-  });
-
-  const payload = {
-    editedMessage: trimmedText,
-    backwardsCompatibilityMessage: opts.backwardsCompatMessage ?? `Edited to: ${trimmedText}`,
-    partIndex: typeof opts.partIndex === "number" ? opts.partIndex : 0,
-  };
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(payload),
-    },
-    opts.timeoutMs,
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => "");
-    throw new Error(`BlueBubbles edit failed (${res.status}): ${errorText || "unknown"}`);
-  }
-}
-
-/**
- * Unsend (retract) a message via BlueBubbles API.
- * Requires macOS 13 (Ventura) or higher with Private API enabled.
- */
-export async function unsendBlueBubblesMessage(
-  messageGuid: string,
-  opts: BlueBubblesChatOpts & { partIndex?: number } = {},
-): Promise<void> {
-  const trimmedGuid = messageGuid.trim();
-  if (!trimmedGuid) throw new Error("BlueBubbles unsend requires messageGuid");
-
-  const { baseUrl, password } = resolveAccount(opts);
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: `/api/v1/message/${encodeURIComponent(trimmedGuid)}/unsend`,
-    password,
-  });
-
-  const payload = {
-    partIndex: typeof opts.partIndex === "number" ? opts.partIndex : 0,
-  };
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(payload),
-    },
-    opts.timeoutMs,
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => "");
-    throw new Error(`BlueBubbles unsend failed (${res.status}): ${errorText || "unknown"}`);
-  }
-}
-
-/**
- * Rename a group chat via BlueBubbles API.
- */
-export async function renameBlueBubblesChat(
-  chatGuid: string,
-  displayName: string,
-  opts: BlueBubblesChatOpts = {},
-): Promise<void> {
-  const trimmedGuid = chatGuid.trim();
-  if (!trimmedGuid) throw new Error("BlueBubbles rename requires chatGuid");
-
-  const { baseUrl, password } = resolveAccount(opts);
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: `/api/v1/chat/${encodeURIComponent(trimmedGuid)}`,
-    password,
-  });
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    {
-      method: "PUT",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ displayName }),
-    },
-    opts.timeoutMs,
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => "");
-    throw new Error(`BlueBubbles rename failed (${res.status}): ${errorText || "unknown"}`);
-  }
-}
-
-/**
- * Add a participant to a group chat via BlueBubbles API.
- */
-export async function addBlueBubblesParticipant(
-  chatGuid: string,
-  address: string,
-  opts: BlueBubblesChatOpts = {},
-): Promise<void> {
-  const trimmedGuid = chatGuid.trim();
-  if (!trimmedGuid) throw new Error("BlueBubbles addParticipant requires chatGuid");
-  const trimmedAddress = address.trim();
-  if (!trimmedAddress) throw new Error("BlueBubbles addParticipant requires address");
-
-  const { baseUrl, password } = resolveAccount(opts);
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: `/api/v1/chat/${encodeURIComponent(trimmedGuid)}/participant`,
-    password,
-  });
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ address: trimmedAddress }),
-    },
-    opts.timeoutMs,
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => "");
-    throw new Error(`BlueBubbles addParticipant failed (${res.status}): ${errorText || "unknown"}`);
-  }
-}
-
-/**
- * Remove a participant from a group chat via BlueBubbles API.
- */
-export async function removeBlueBubblesParticipant(
-  chatGuid: string,
-  address: string,
-  opts: BlueBubblesChatOpts = {},
-): Promise<void> {
-  const trimmedGuid = chatGuid.trim();
-  if (!trimmedGuid) throw new Error("BlueBubbles removeParticipant requires chatGuid");
-  const trimmedAddress = address.trim();
-  if (!trimmedAddress) throw new Error("BlueBubbles removeParticipant requires address");
-
-  const { baseUrl, password } = resolveAccount(opts);
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: `/api/v1/chat/${encodeURIComponent(trimmedGuid)}/participant`,
-    password,
-  });
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    {
-      method: "DELETE",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ address: trimmedAddress }),
-    },
-    opts.timeoutMs,
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => "");
-    throw new Error(`BlueBubbles removeParticipant failed (${res.status}): ${errorText || "unknown"}`);
-  }
-}
-
-/**
- * Leave a group chat via BlueBubbles API.
- */
-export async function leaveBlueBubblesChat(
-  chatGuid: string,
-  opts: BlueBubblesChatOpts = {},
-): Promise<void> {
-  const trimmedGuid = chatGuid.trim();
-  if (!trimmedGuid) throw new Error("BlueBubbles leaveChat requires chatGuid");
-
-  const { baseUrl, password } = resolveAccount(opts);
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: `/api/v1/chat/${encodeURIComponent(trimmedGuid)}/leave`,
-    password,
-  });
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    { method: "POST" },
-    opts.timeoutMs,
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => "");
-    throw new Error(`BlueBubbles leaveChat failed (${res.status}): ${errorText || "unknown"}`);
-  }
-}
-
-/**
- * Set a group chat's icon/photo via BlueBubbles API.
- * Requires Private API to be enabled.
- */
-export async function setGroupIconBlueBubbles(
-  chatGuid: string,
-  buffer: Uint8Array,
-  filename: string,
-  opts: BlueBubblesChatOpts & { contentType?: string } = {},
-): Promise<void> {
-  const trimmedGuid = chatGuid.trim();
-  if (!trimmedGuid) throw new Error("BlueBubbles setGroupIcon requires chatGuid");
-  if (!buffer || buffer.length === 0) {
-    throw new Error("BlueBubbles setGroupIcon requires image buffer");
-  }
-
-  const { baseUrl, password } = resolveAccount(opts);
-  const url = buildBlueBubblesApiUrl({
-    baseUrl,
-    path: `/api/v1/chat/${encodeURIComponent(trimmedGuid)}/icon`,
-    password,
-  });
-
-  // Build multipart form-data
-  const boundary = `----BlueBubblesFormBoundary${crypto.randomUUID().replace(/-/g, "")}`;
-  const parts: Uint8Array[] = [];
-  const encoder = new TextEncoder();
-
-  // Add file field named "icon" as per API spec
-  parts.push(encoder.encode(`--${boundary}\r\n`));
-  parts.push(
-    encoder.encode(
-      `Content-Disposition: form-data; name="icon"; filename="${filename}"\r\n`,
-    ),
-  );
-  parts.push(
-    encoder.encode(`Content-Type: ${opts.contentType ?? "application/octet-stream"}\r\n\r\n`),
-  );
-  parts.push(buffer);
-  parts.push(encoder.encode("\r\n"));
-
-  // Close multipart body
-  parts.push(encoder.encode(`--${boundary}--\r\n`));
-
-  // Combine into single buffer
-  const totalLength = parts.reduce((acc, part) => acc + part.length, 0);
-  const body = new Uint8Array(totalLength);
-  let offset = 0;
-  for (const part of parts) {
-    body.set(part, offset);
-    offset += part.length;
-  }
-
-  const res = await blueBubblesFetchWithTimeout(
-    url,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": `multipart/form-data; boundary=${boundary}`,
-      },
-      body,
-    },
-    opts.timeoutMs ?? 60_000, // longer timeout for file uploads
-  );
-
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => "");
-    throw new Error(`BlueBubbles setGroupIcon failed (${res.status}): ${errorText || "unknown"}`);
-  }
-}

extensions/bluebubbles/src/config-schema.ts

@@ -4,24 +4,10 @@ const allowFromEntry = z.union([z.string(), z.number()]);
 
 const bluebubblesActionSchema = z
   .object({
-    reactions: z.boolean().default(true),
-    edit: z.boolean().default(true),
-    unsend: z.boolean().default(true),
-    reply: z.boolean().default(true),
-    sendWithEffect: z.boolean().default(true),
-    renameGroup: z.boolean().default(true),
-    setGroupIcon: z.boolean().default(true),
-    addParticipant: z.boolean().default(true),
-    removeParticipant: z.boolean().default(true),
-    leaveGroup: z.boolean().default(true),
-    sendAttachment: z.boolean().default(true),
+    reactions: z.boolean().optional(),
   })
   .optional();
 
-const bluebubblesGroupConfigSchema = z.object({
-  requireMention: z.boolean().optional(),
-});
-
 const bluebubblesAccountSchema = z.object({
   name: z.string().optional(),
   enabled: z.boolean().optional(),
@@ -36,9 +22,6 @@ const bluebubblesAccountSchema = z.object({
   dmHistoryLimit: z.number().int().min(0).optional(),
   textChunkLimit: z.number().int().positive().optional(),
   mediaMaxMb: z.number().int().positive().optional(),
-  sendReadReceipts: z.boolean().optional(),
-  blockStreaming: z.boolean().optional(),
-  groups: z.object({}).catchall(bluebubblesGroupConfigSchema).optional(),
 });
 
 export const BlueBubblesConfigSchema = bluebubblesAccountSchema.extend({

extensions/bluebubbles/src/media-send.ts

@@ -1,159 +0,0 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-import { resolveChannelMediaMaxBytes, type ClawdbotConfig } from "clawdbot/plugin-sdk";
-
-import { sendBlueBubblesAttachment } from "./attachments.js";
-import { sendMessageBlueBubbles } from "./send.js";
-import { getBlueBubblesRuntime } from "./runtime.js";
-
-const HTTP_URL_RE = /^https?:\/\//i;
-const MB = 1024 * 1024;
-
-function assertMediaWithinLimit(sizeBytes: number, maxBytes?: number): void {
-  if (typeof maxBytes !== "number" || maxBytes <= 0) return;
-  if (sizeBytes <= maxBytes) return;
-  const maxLabel = (maxBytes / MB).toFixed(0);
-  const sizeLabel = (sizeBytes / MB).toFixed(2);
-  throw new Error(`Media exceeds ${maxLabel}MB limit (got ${sizeLabel}MB)`);
-}
-
-function resolveLocalMediaPath(source: string): string {
-  if (!source.startsWith("file://")) return source;
-  try {
-    return fileURLToPath(source);
-  } catch {
-    throw new Error(`Invalid file:// URL: ${source}`);
-  }
-}
-
-function resolveFilenameFromSource(source?: string): string | undefined {
-  if (!source) return undefined;
-  if (source.startsWith("file://")) {
-    try {
-      return path.basename(fileURLToPath(source)) || undefined;
-    } catch {
-      return undefined;
-    }
-  }
-  if (HTTP_URL_RE.test(source)) {
-    try {
-      return path.basename(new URL(source).pathname) || undefined;
-    } catch {
-      return undefined;
-    }
-  }
-  const base = path.basename(source);
-  return base || undefined;
-}
-
-export async function sendBlueBubblesMedia(params: {
-  cfg: ClawdbotConfig;
-  to: string;
-  mediaUrl?: string;
-  mediaPath?: string;
-  mediaBuffer?: Uint8Array;
-  contentType?: string;
-  filename?: string;
-  caption?: string;
-  replyToId?: string | null;
-  accountId?: string;
-}) {
-  const {
-    cfg,
-    to,
-    mediaUrl,
-    mediaPath,
-    mediaBuffer,
-    contentType,
-    filename,
-    caption,
-    replyToId,
-    accountId,
-  } = params;
-  const core = getBlueBubblesRuntime();
-  const maxBytes = resolveChannelMediaMaxBytes({
-    cfg,
-    resolveChannelLimitMb: ({ cfg, accountId }) =>
-      cfg.channels?.bluebubbles?.accounts?.[accountId]?.mediaMaxMb ??
-      cfg.channels?.bluebubbles?.mediaMaxMb,
-    accountId,
-  });
-
-  let buffer: Uint8Array;
-  let resolvedContentType = contentType ?? undefined;
-  let resolvedFilename = filename ?? undefined;
-
-  if (mediaBuffer) {
-    assertMediaWithinLimit(mediaBuffer.byteLength, maxBytes);
-    buffer = mediaBuffer;
-    if (!resolvedContentType) {
-      const hint = mediaPath ?? mediaUrl;
-      const detected = await core.media.detectMime({
-        buffer: Buffer.isBuffer(mediaBuffer) ? mediaBuffer : Buffer.from(mediaBuffer),
-        filePath: hint,
-      });
-      resolvedContentType = detected ?? undefined;
-    }
-    if (!resolvedFilename) {
-      resolvedFilename = resolveFilenameFromSource(mediaPath ?? mediaUrl);
-    }
-  } else {
-    const source = mediaPath ?? mediaUrl;
-    if (!source) {
-      throw new Error("BlueBubbles media delivery requires mediaUrl, mediaPath, or mediaBuffer.");
-    }
-    if (HTTP_URL_RE.test(source)) {
-      const fetched = await core.channel.media.fetchRemoteMedia({
-        url: source,
-        maxBytes: typeof maxBytes === "number" && maxBytes > 0 ? maxBytes : undefined,
-      });
-      buffer = fetched.buffer;
-      resolvedContentType = resolvedContentType ?? fetched.contentType ?? undefined;
-      resolvedFilename = resolvedFilename ?? fetched.fileName;
-    } else {
-      const localPath = resolveLocalMediaPath(source);
-      const fs = await import("node:fs/promises");
-      if (typeof maxBytes === "number" && maxBytes > 0) {
-        const stats = await fs.stat(localPath);
-        assertMediaWithinLimit(stats.size, maxBytes);
-      }
-      const data = await fs.readFile(localPath);
-      assertMediaWithinLimit(data.byteLength, maxBytes);
-      buffer = new Uint8Array(data);
-      if (!resolvedContentType) {
-        const detected = await core.media.detectMime({
-          buffer: data,
-          filePath: localPath,
-        });
-        resolvedContentType = detected ?? undefined;
-      }
-      if (!resolvedFilename) {
-        resolvedFilename = resolveFilenameFromSource(localPath);
-      }
-    }
-  }
-
-  const attachmentResult = await sendBlueBubblesAttachment({
-    to,
-    buffer,
-    filename: resolvedFilename ?? "attachment",
-    contentType: resolvedContentType ?? undefined,
-    replyToMessageGuid: replyToId?.trim() || undefined,
-    opts: {
-      cfg,
-      accountId,
-    },
-  });
-
-  const trimmedCaption = caption?.trim();
-  if (trimmedCaption) {
-    await sendMessageBlueBubbles(to, trimmedCaption, {
-      cfg,
-      accountId,
-      replyToMessageGuid: replyToId?.trim() || undefined,
-    });
-  }
-
-  return attachmentResult;
-}

extensions/bluebubbles/src/monitor.ts

@@ -5,13 +5,9 @@ import { markBlueBubblesChatRead, sendBlueBubblesTyping } from "./chat.js";
 import { resolveChatGuidForTarget, sendMessageBlueBubbles } from "./send.js";
 import { downloadBlueBubblesAttachment } from "./attachments.js";
 import { formatBlueBubblesChatTarget, isAllowedBlueBubblesSender, normalizeBlueBubblesHandle } from "./targets.js";
-import { resolveAckReaction } from "../../../src/agents/identity.js";
-import { sendBlueBubblesMedia } from "./media-send.js";
 import type { BlueBubblesAccountConfig, BlueBubblesAttachment } from "./types.js";
 import type { ResolvedBlueBubblesAccount } from "./accounts.js";
 import { getBlueBubblesRuntime } from "./runtime.js";
-import { normalizeBlueBubblesReactionInput, sendBlueBubblesReaction } from "./reactions.js";
-import { fetchBlueBubblesServerInfo } from "./probe.js";
 
 export type BlueBubblesRuntimeEnv = {
   log?: (message: string) => void;
@@ -29,7 +25,6 @@ export type BlueBubblesMonitorOptions = {
 
 const DEFAULT_WEBHOOK_PATH = "/bluebubbles-webhook";
 const DEFAULT_TEXT_LIMIT = 4000;
-const invalidAckReactions = new Set<string>();
 
 type BlueBubblesCoreRuntime = ReturnType<typeof getBlueBubblesRuntime>;
 
@@ -39,35 +34,6 @@ function logVerbose(core: BlueBubblesCoreRuntime, runtime: BlueBubblesRuntimeEnv
   }
 }
 
-function logGroupAllowlistHint(params: {
-  runtime: BlueBubblesRuntimeEnv;
-  reason: string;
-  entry: string | null;
-  chatName?: string;
-  accountId?: string;
-}): void {
-  const log = params.runtime.log ?? console.log;
-  const nameHint = params.chatName ? ` (group name: ${params.chatName})` : "";
-  const accountHint = params.accountId
-    ? ` (or channels.bluebubbles.accounts.${params.accountId}.groupAllowFrom)`
-    : "";
-  if (params.entry) {
-    log(
-      `[bluebubbles] group message blocked (${params.reason}). Allow this group by adding ` +
-        `"${params.entry}" to channels.bluebubbles.groupAllowFrom${nameHint}.`,
-    );
-    log(
-      `[bluebubbles] add to config: channels.bluebubbles.groupAllowFrom=["${params.entry}"]${accountHint}.`,
-    );
-    return;
-  }
-  log(
-    `[bluebubbles] group message blocked (${params.reason}). Allow groups by setting ` +
-      `channels.bluebubbles.groupPolicy="open" or adding a group id to ` +
-      `channels.bluebubbles.groupAllowFrom${accountHint}${nameHint}.`,
-  );
-}
-
 type WebhookTarget = {
   account: ResolvedBlueBubblesAccount;
   config: ClawdbotConfig;
@@ -217,21 +183,6 @@ function buildMessagePlaceholder(message: NormalizedWebhookMessage): string {
   return "";
 }
 
-function formatReplyContext(message: {
-  replyToId?: string;
-  replyToBody?: string;
-  replyToSender?: string;
-}): string | null {
-  if (!message.replyToId && !message.replyToBody && !message.replyToSender) return null;
-  const sender = message.replyToSender?.trim() || "unknown sender";
-  const idPart = message.replyToId ? ` id:${message.replyToId}` : "";
-  const body = message.replyToBody?.trim();
-  if (!body) {
-    return `[Replying to ${sender}${idPart}]\n[/Replying]`;
-  }
-  return `[Replying to ${sender}${idPart}]\n${body}\n[/Replying]`;
-}
-
 function readNumberLike(record: Record<string, unknown> | null, key: string): number | undefined {
   if (!record) return undefined;
   const value = record[key];
@@ -243,77 +194,6 @@ function readNumberLike(record: Record<string, unknown> | null, key: string): nu
   return undefined;
 }
 
-function extractReplyMetadata(message: Record<string, unknown>): {
-  replyToId?: string;
-  replyToBody?: string;
-  replyToSender?: string;
-} {
-  const replyRaw =
-    message["replyTo"] ??
-    message["reply_to"] ??
-    message["replyToMessage"] ??
-    message["reply_to_message"] ??
-    message["repliedMessage"] ??
-    message["quotedMessage"] ??
-    message["associatedMessage"] ??
-    message["reply"];
-  const replyRecord = asRecord(replyRaw);
-  const replyHandle = asRecord(replyRecord?.["handle"]) ?? asRecord(replyRecord?.["sender"]) ?? null;
-  const replySenderRaw =
-    readString(replyHandle, "address") ??
-    readString(replyHandle, "handle") ??
-    readString(replyHandle, "id") ??
-    readString(replyRecord, "senderId") ??
-    readString(replyRecord, "sender") ??
-    readString(replyRecord, "from");
-  const normalizedSender = replySenderRaw
-    ? normalizeBlueBubblesHandle(replySenderRaw) || replySenderRaw.trim()
-    : undefined;
-
-  const replyToBody =
-    readString(replyRecord, "text") ??
-    readString(replyRecord, "body") ??
-    readString(replyRecord, "message") ??
-    readString(replyRecord, "subject") ??
-    undefined;
-
-  const directReplyId =
-    readString(message, "replyToMessageGuid") ??
-    readString(message, "replyToGuid") ??
-    readString(message, "replyGuid") ??
-    readString(message, "selectedMessageGuid") ??
-    readString(message, "selectedMessageId") ??
-    readString(message, "replyToMessageId") ??
-    readString(message, "replyId") ??
-    readString(replyRecord, "guid") ??
-    readString(replyRecord, "id") ??
-    readString(replyRecord, "messageId");
-
-  const associatedType =
-    readNumberLike(message, "associatedMessageType") ??
-    readNumberLike(message, "associated_message_type");
-  const associatedGuid =
-    readString(message, "associatedMessageGuid") ??
-    readString(message, "associated_message_guid") ??
-    readString(message, "associatedMessageId");
-  const isReactionAssociation =
-    typeof associatedType === "number" && REACTION_TYPE_MAP.has(associatedType);
-
-  const replyToId = directReplyId ?? (!isReactionAssociation ? associatedGuid : undefined);
-  const threadOriginatorGuid = readString(message, "threadOriginatorGuid");
-  const messageGuid = readString(message, "guid");
-  const fallbackReplyId =
-    !replyToId && threadOriginatorGuid && threadOriginatorGuid !== messageGuid
-      ? threadOriginatorGuid
-      : undefined;
-
-  return {
-    replyToId: (replyToId ?? fallbackReplyId)?.trim() || undefined,
-    replyToBody: replyToBody?.trim() || undefined,
-    replyToSender: normalizedSender || undefined,
-  };
-}
-
 function readFirstChatRecord(message: Record<string, unknown>): Record<string, unknown> | null {
   const chats = message["chats"];
   if (!Array.isArray(chats) || chats.length === 0) return null;
@@ -321,108 +201,6 @@ function readFirstChatRecord(message: Record<string, unknown>): Record<string, u
   return asRecord(first);
 }
 
-function normalizeParticipantEntry(entry: unknown): BlueBubblesParticipant | null {
-  if (typeof entry === "string" || typeof entry === "number") {
-    const raw = String(entry).trim();
-    if (!raw) return null;
-    const normalized = normalizeBlueBubblesHandle(raw) || raw;
-    return normalized ? { id: normalized } : null;
-  }
-  const record = asRecord(entry);
-  if (!record) return null;
-  const nestedHandle =
-    asRecord(record["handle"]) ?? asRecord(record["sender"]) ?? asRecord(record["contact"]) ?? null;
-  const idRaw =
-    readString(record, "address") ??
-    readString(record, "handle") ??
-    readString(record, "id") ??
-    readString(record, "phoneNumber") ??
-    readString(record, "phone_number") ??
-    readString(record, "email") ??
-    readString(nestedHandle, "address") ??
-    readString(nestedHandle, "handle") ??
-    readString(nestedHandle, "id");
-  const nameRaw =
-    readString(record, "displayName") ??
-    readString(record, "name") ??
-    readString(record, "title") ??
-    readString(nestedHandle, "displayName") ??
-    readString(nestedHandle, "name");
-  const normalizedId = idRaw ? normalizeBlueBubblesHandle(idRaw) || idRaw.trim() : "";
-  if (!normalizedId) return null;
-  const name = nameRaw?.trim() || undefined;
-  return { id: normalizedId, name };
-}
-
-function normalizeParticipantList(raw: unknown): BlueBubblesParticipant[] {
-  if (!Array.isArray(raw) || raw.length === 0) return [];
-  const seen = new Set<string>();
-  const output: BlueBubblesParticipant[] = [];
-  for (const entry of raw) {
-    const normalized = normalizeParticipantEntry(entry);
-    if (!normalized?.id) continue;
-    const key = normalized.id.toLowerCase();
-    if (seen.has(key)) continue;
-    seen.add(key);
-    output.push(normalized);
-  }
-  return output;
-}
-
-function formatGroupMembers(params: {
-  participants?: BlueBubblesParticipant[];
-  fallback?: BlueBubblesParticipant;
-}): string | undefined {
-  const seen = new Set<string>();
-  const ordered: BlueBubblesParticipant[] = [];
-  for (const entry of params.participants ?? []) {
-    if (!entry?.id) continue;
-    const key = entry.id.toLowerCase();
-    if (seen.has(key)) continue;
-    seen.add(key);
-    ordered.push(entry);
-  }
-  if (ordered.length === 0 && params.fallback?.id) {
-    ordered.push(params.fallback);
-  }
-  if (ordered.length === 0) return undefined;
-  return ordered
-    .map((entry) => (entry.name ? `${entry.name} (${entry.id})` : entry.id))
-    .join(", ");
-}
-
-function resolveGroupFlagFromChatGuid(chatGuid?: string | null): boolean | undefined {
-  const guid = chatGuid?.trim();
-  if (!guid) return undefined;
-  const parts = guid.split(";");
-  if (parts.length >= 3) {
-    if (parts[1] === "+") return true;
-    if (parts[1] === "-") return false;
-  }
-  if (guid.includes(";+;")) return true;
-  if (guid.includes(";-;")) return false;
-  return undefined;
-}
-
-function formatGroupAllowlistEntry(params: {
-  chatGuid?: string;
-  chatId?: number;
-  chatIdentifier?: string;
-}): string | null {
-  const guid = params.chatGuid?.trim();
-  if (guid) return `chat_guid:${guid}`;
-  const chatId = params.chatId;
-  if (typeof chatId === "number" && Number.isFinite(chatId)) return `chat_id:${chatId}`;
-  const identifier = params.chatIdentifier?.trim();
-  if (identifier) return `chat_identifier:${identifier}`;
-  return null;
-}
-
-type BlueBubblesParticipant = {
-  id: string;
-  name?: string;
-};
-
 type NormalizedWebhookMessage = {
   text: string;
   senderId: string;
@@ -437,10 +215,6 @@ type NormalizedWebhookMessage = {
   fromMe?: boolean;
   attachments?: BlueBubblesAttachment[];
   balloonBundleId?: string;
-  participants?: BlueBubblesParticipant[];
-  replyToId?: string;
-  replyToBody?: string;
-  replyToSender?: string;
 };
 
 type NormalizedWebhookReaction = {
@@ -478,31 +252,6 @@ function maskSecret(value: string): string {
   return `${value.slice(0, 2)}***${value.slice(-2)}`;
 }
 
-function resolveBlueBubblesAckReaction(params: {
-  cfg: ClawdbotConfig;
-  agentId: string;
-  core: BlueBubblesCoreRuntime;
-  runtime: BlueBubblesRuntimeEnv;
-}): string | null {
-  const raw = resolveAckReaction(params.cfg, params.agentId).trim();
-  if (!raw) return null;
-  try {
-    normalizeBlueBubblesReactionInput(raw);
-    return raw;
-  } catch {
-    const key = raw.toLowerCase();
-    if (!invalidAckReactions.has(key)) {
-      invalidAckReactions.add(key);
-      logVerbose(
-        params.core,
-        params.runtime,
-        `ack reaction skipped (unsupported for BlueBubbles): ${raw}`,
-      );
-    }
-    return null;
-  }
-}
-
 function extractMessagePayload(payload: Record<string, unknown>): Record<string, unknown> | null {
   const dataRaw = payload.data ?? payload.payload ?? payload.event;
   const data =
@@ -582,18 +331,13 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
       : Array.isArray(chatsParticipants)
         ? chatsParticipants
         : [];
-  const normalizedParticipants = normalizeParticipantList(participants);
   const participantsCount = participants.length;
-  const groupFromChatGuid = resolveGroupFlagFromChatGuid(chatGuid);
-  const explicitIsGroup =
+  const isGroup =
     readBoolean(message, "isGroup") ??
     readBoolean(message, "is_group") ??
     readBoolean(chat, "isGroup") ??
-    readBoolean(message, "group");
-  const isGroup =
-    typeof groupFromChatGuid === "boolean"
-      ? groupFromChatGuid
-      : explicitIsGroup ?? (participantsCount > 2 ? true : false);
+    readBoolean(message, "group") ??
+    (participantsCount > 2 ? true : false);
 
   const fromMe = readBoolean(message, "isFromMe") ?? readBoolean(message, "is_from_me");
   const messageId =
@@ -616,7 +360,6 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
 
   const normalizedSender = normalizeBlueBubblesHandle(senderId);
   if (!normalizedSender) return null;
-  const replyMetadata = extractReplyMetadata(message);
 
   return {
     text,
@@ -632,10 +375,6 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
     fromMe,
     attachments: extractAttachments(message),
     balloonBundleId,
-    participants: normalizedParticipants,
-    replyToId: replyMetadata.replyToId,
-    replyToBody: replyMetadata.replyToBody,
-    replyToSender: replyMetadata.replyToSender,
   };
 }
 
@@ -712,16 +451,12 @@ function normalizeWebhookReaction(payload: Record<string, unknown>): NormalizedW
         ? chatsParticipants
         : [];
   const participantsCount = participants.length;
-  const groupFromChatGuid = resolveGroupFlagFromChatGuid(chatGuid);
-  const explicitIsGroup =
+  const isGroup =
     readBoolean(message, "isGroup") ??
     readBoolean(message, "is_group") ??
     readBoolean(chat, "isGroup") ??
-    readBoolean(message, "group");
-  const isGroup =
-    typeof groupFromChatGuid === "boolean"
-      ? groupFromChatGuid
-      : explicitIsGroup ?? (participantsCount > 2 ? true : false);
+    readBoolean(message, "group") ??
+    (participantsCount > 2 ? true : false);
 
   const fromMe = readBoolean(message, "isFromMe") ?? readBoolean(message, "is_from_me");
   const timestampRaw =
@@ -902,8 +637,6 @@ async function processMessage(
 ): Promise<void> {
   const { account, config, runtime, core, statusSink } = target;
   if (message.fromMe) return;
-  const groupFlag = resolveGroupFlagFromChatGuid(message.chatGuid);
-  const isGroup = typeof groupFlag === "boolean" ? groupFlag : message.isGroup;
 
   const text = message.text.trim();
   const attachments = message.attachments ?? [];
@@ -915,7 +648,7 @@ async function processMessage(
   logVerbose(
     core,
     runtime,
-    `msg sender=${message.senderId} group=${isGroup} textLen=${text.length} attachments=${attachments.length} chatGuid=${message.chatGuid ?? ""} chatId=${message.chatId ?? ""}`,
+    `msg sender=${message.senderId} group=${message.isGroup} textLen=${text.length} attachments=${attachments.length} chatGuid=${message.chatGuid ?? ""} chatId=${message.chatId ?? ""}`,
   );
 
   const dmPolicy = account.config.dmPolicy ?? "pairing";
@@ -934,35 +667,15 @@ async function processMessage(
   ]
     .map((entry) => String(entry).trim())
     .filter(Boolean);
-  const groupAllowEntry = formatGroupAllowlistEntry({
-    chatGuid: message.chatGuid,
-    chatId: message.chatId ?? undefined,
-    chatIdentifier: message.chatIdentifier ?? undefined,
-  });
-  const groupName = message.chatName?.trim() || undefined;
 
-  if (isGroup) {
+  if (message.isGroup) {
     if (groupPolicy === "disabled") {
       logVerbose(core, runtime, "Blocked BlueBubbles group message (groupPolicy=disabled)");
-      logGroupAllowlistHint({
-        runtime,
-        reason: "groupPolicy=disabled",
-        entry: groupAllowEntry,
-        chatName: groupName,
-        accountId: account.accountId,
-      });
       return;
     }
     if (groupPolicy === "allowlist") {
       if (effectiveGroupAllowFrom.length === 0) {
         logVerbose(core, runtime, "Blocked BlueBubbles group message (no allowlist)");
-        logGroupAllowlistHint({
-          runtime,
-          reason: "groupPolicy=allowlist (empty allowlist)",
-          entry: groupAllowEntry,
-          chatName: groupName,
-          accountId: account.accountId,
-        });
         return;
       }
       const allowed = isAllowedBlueBubblesSender({
@@ -983,13 +696,6 @@ async function processMessage(
           runtime,
           `drop: group sender not allowed sender=${message.senderId} allowFrom=${effectiveGroupAllowFrom.join(",")}`,
         );
-        logGroupAllowlistHint({
-          runtime,
-          reason: "groupPolicy=allowlist (not allowlisted)",
-          entry: groupAllowEntry,
-          chatName: groupName,
-          accountId: account.accountId,
-        });
         return;
       }
     }
@@ -1061,7 +767,7 @@ async function processMessage(
   const chatId = message.chatId ?? undefined;
   const chatGuid = message.chatGuid ?? undefined;
   const chatIdentifier = message.chatIdentifier ?? undefined;
-  const peerId = isGroup
+  const peerId = message.isGroup
     ? chatGuid ?? chatIdentifier ?? (chatId ? String(chatId) : "group")
     : message.senderId;
 
@@ -1070,84 +776,11 @@ async function processMessage(
     channel: "bluebubbles",
     accountId: account.accountId,
     peer: {
-      kind: isGroup ? "group" : "dm",
+      kind: message.isGroup ? "group" : "dm",
       id: peerId,
     },
   });
 
-  // Mention gating for group chats (parity with iMessage/WhatsApp)
-  const messageText = text;
-  const mentionRegexes = core.channel.mentions.buildMentionRegexes(config, route.agentId);
-  const wasMentioned = isGroup
-    ? core.channel.mentions.matchesMentionPatterns(messageText, mentionRegexes)
-    : true;
-  const canDetectMention = mentionRegexes.length > 0;
-  const requireMention = core.channel.groups.resolveRequireMention({
-    cfg: config,
-    channel: "bluebubbles",
-    groupId: peerId,
-    accountId: account.accountId,
-  });
-
-  // Command gating (parity with iMessage/WhatsApp)
-  const useAccessGroups = config.commands?.useAccessGroups !== false;
-  const hasControlCmd = core.channel.text.hasControlCommand(messageText, config);
-  const ownerAllowedForCommands =
-    effectiveAllowFrom.length > 0
-      ? isAllowedBlueBubblesSender({
-          allowFrom: effectiveAllowFrom,
-          sender: message.senderId,
-          chatId: message.chatId ?? undefined,
-          chatGuid: message.chatGuid ?? undefined,
-          chatIdentifier: message.chatIdentifier ?? undefined,
-        })
-      : false;
-  const groupAllowedForCommands =
-    effectiveGroupAllowFrom.length > 0
-      ? isAllowedBlueBubblesSender({
-          allowFrom: effectiveGroupAllowFrom,
-          sender: message.senderId,
-          chatId: message.chatId ?? undefined,
-          chatGuid: message.chatGuid ?? undefined,
-          chatIdentifier: message.chatIdentifier ?? undefined,
-        })
-      : false;
-  const dmAuthorized = dmPolicy === "open" || ownerAllowedForCommands;
-  const commandAuthorized = isGroup
-    ? core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
-        useAccessGroups,
-        authorizers: [
-          { configured: effectiveAllowFrom.length > 0, allowed: ownerAllowedForCommands },
-          { configured: effectiveGroupAllowFrom.length > 0, allowed: groupAllowedForCommands },
-        ],
-      })
-    : dmAuthorized;
-
-  // Block control commands from unauthorized senders in groups
-  if (isGroup && hasControlCmd && !commandAuthorized) {
-    logVerbose(
-      core,
-      runtime,
-      `bluebubbles: drop control command from unauthorized sender ${message.senderId}`,
-    );
-    return;
-  }
-
-  // Allow control commands to bypass mention gating when authorized (parity with iMessage)
-  const shouldBypassMention =
-    isGroup &&
-    requireMention &&
-    !wasMentioned &&
-    commandAuthorized &&
-    hasControlCmd;
-  const effectiveWasMentioned = wasMentioned || shouldBypassMention;
-
-  // Skip group messages that require mention but weren't mentioned
-  if (isGroup && requireMention && canDetectMention && !wasMentioned && !shouldBypassMention) {
-    logVerbose(core, runtime, `bluebubbles: skipping group message (no mention)`);
-    return;
-  }
-
   const baseUrl = account.config.serverUrl?.trim();
   const password = account.config.password?.trim();
   const maxBytes =
@@ -1200,18 +833,9 @@ async function processMessage(
     }
   }
   const rawBody = text.trim() || placeholder;
-  const replyContext = formatReplyContext(message);
-  const baseBody = replyContext ? `${rawBody}\n\n${replyContext}` : rawBody;
-  const fromLabel = isGroup
+  const fromLabel = message.isGroup
     ? `group:${peerId}`
     : message.senderName || `user:${message.senderId}`;
-  const groupSubject = isGroup ? message.chatName?.trim() || undefined : undefined;
-  const groupMembers = isGroup
-    ? formatGroupMembers({
-        participants: message.participants,
-        fallback: message.senderId ? { id: message.senderId, name: message.senderName } : undefined,
-      })
-    : undefined;
   const storePath = core.channel.session.resolveStorePath(config.session?.store, {
     agentId: route.agentId,
   });
@@ -1226,12 +850,12 @@ async function processMessage(
     timestamp: message.timestamp,
     previousTimestamp,
     envelope: envelopeOptions,
-    body: baseBody,
+    body: rawBody,
   });
   let chatGuidForActions = chatGuid;
   if (!chatGuidForActions && baseUrl && password) {
-  const target =
-      isGroup && (chatId || chatIdentifier)
+    const target =
+      message.isGroup && (chatId || chatIdentifier)
         ? chatId
           ? { kind: "chat_id", chatId }
           : { kind: "chat_identifier", chatIdentifier: chatIdentifier ?? "" }
@@ -1246,51 +870,7 @@ async function processMessage(
     }
   }
 
-  const ackReactionScope = config.messages?.ackReactionScope ?? "group-mentions";
-  const removeAckAfterReply = config.messages?.removeAckAfterReply ?? false;
-  const ackReactionValue = resolveBlueBubblesAckReaction({
-    cfg: config,
-    agentId: route.agentId,
-    core,
-    runtime,
-  });
-  const shouldAckReaction = () => {
-    if (!ackReactionValue) return false;
-    if (ackReactionScope === "all") return true;
-    if (ackReactionScope === "direct") return !isGroup;
-    if (ackReactionScope === "group-all") return isGroup;
-    if (ackReactionScope === "group-mentions") {
-      if (!isGroup) return false;
-      if (!requireMention) return false;
-      if (!canDetectMention) return false;
-      return effectiveWasMentioned;
-    }
-    return false;
-  };
-  const ackMessageId = message.messageId?.trim() || "";
-  const ackReactionPromise =
-    shouldAckReaction() && ackMessageId && chatGuidForActions && ackReactionValue
-      ? sendBlueBubblesReaction({
-          chatGuid: chatGuidForActions,
-          messageGuid: ackMessageId,
-          emoji: ackReactionValue,
-          opts: { cfg: config, accountId: account.accountId },
-        }).then(
-          () => true,
-          (err) => {
-            logVerbose(
-              core,
-              runtime,
-              `ack reaction failed chatGuid=${chatGuidForActions} msg=${ackMessageId}: ${String(err)}`,
-            );
-            return false;
-          },
-        )
-      : null;
-
-  // Respect sendReadReceipts config (parity with WhatsApp)
-  const sendReadReceipts = account.config.sendReadReceipts !== false;
-  if (chatGuidForActions && baseUrl && password && sendReadReceipts) {
+  if (chatGuidForActions && baseUrl && password) {
     try {
       await markBlueBubblesChatRead(chatGuidForActions, {
         cfg: config,
@@ -1300,13 +880,11 @@ async function processMessage(
     } catch (err) {
       runtime.error?.(`[bluebubbles] mark read failed: ${String(err)}`);
     }
-  } else if (!sendReadReceipts) {
-    logVerbose(core, runtime, "mark read skipped (sendReadReceipts=false)");
   } else {
     logVerbose(core, runtime, "mark read skipped (missing chatGuid or credentials)");
   }
 
-  const outboundTarget = isGroup
+  const outboundTarget = message.isGroup
     ? formatBlueBubblesChatTarget({
         chatId,
         chatGuid: chatGuidForActions ?? chatGuid,
@@ -1316,15 +894,6 @@ async function processMessage(
       ? formatBlueBubblesChatTarget({ chatGuid: chatGuidForActions })
       : message.senderId;
 
-  const maybeEnqueueOutboundMessageId = (messageId?: string) => {
-    const trimmed = messageId?.trim();
-    if (!trimmed || trimmed === "ok" || trimmed === "unknown") return;
-    core.system.enqueueSystemEvent(`BlueBubbles sent message id: ${trimmed}`, {
-      sessionKey: route.sessionKey,
-      contextKey: `bluebubbles:outbound:${outboundTarget}:${trimmed}`,
-    });
-  };
-
   const ctxPayload = {
     Body: body,
     BodyForAgent: body,
@@ -1337,17 +906,12 @@ async function processMessage(
     MediaPaths: mediaPaths.length > 0 ? mediaPaths : undefined,
     MediaType: mediaTypes[0],
     MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined,
-    From: isGroup ? `group:${peerId}` : `bluebubbles:${message.senderId}`,
+    From: message.isGroup ? `group:${peerId}` : `bluebubbles:${message.senderId}`,
     To: `bluebubbles:${outboundTarget}`,
     SessionKey: route.sessionKey,
     AccountId: route.accountId,
-    ChatType: isGroup ? "group" : "direct",
+    ChatType: message.isGroup ? "group" : "direct",
     ConversationLabel: fromLabel,
-    ReplyToId: message.replyToId,
-    ReplyToBody: message.replyToBody,
-    ReplyToSender: message.replyToSender,
-    GroupSubject: groupSubject,
-    GroupMembers: groupMembers,
     SenderName: message.senderName || undefined,
     SenderId: message.senderId,
     Provider: "bluebubbles",
@@ -1356,42 +920,26 @@ async function processMessage(
     Timestamp: message.timestamp,
     OriginatingChannel: "bluebubbles",
     OriginatingTo: `bluebubbles:${outboundTarget}`,
-    WasMentioned: effectiveWasMentioned,
-    CommandAuthorized: commandAuthorized,
   };
 
-  let sentMessage = false;
+  if (chatGuidForActions && baseUrl && password) {
+    logVerbose(core, runtime, `typing start (pre-dispatch) chatGuid=${chatGuidForActions}`);
+    try {
+      await sendBlueBubblesTyping(chatGuidForActions, true, {
+        cfg: config,
+        accountId: account.accountId,
+      });
+    } catch (err) {
+      runtime.error?.(`[bluebubbles] typing start failed: ${String(err)}`);
+    }
+  }
+
   try {
     await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
       ctx: ctxPayload,
       cfg: config,
       dispatcherOptions: {
         deliver: async (payload) => {
-          const mediaList = payload.mediaUrls?.length
-            ? payload.mediaUrls
-            : payload.mediaUrl
-              ? [payload.mediaUrl]
-              : [];
-          if (mediaList.length > 0) {
-            let first = true;
-            for (const mediaUrl of mediaList) {
-              const caption = first ? payload.text : undefined;
-              first = false;
-              const result = await sendBlueBubblesMedia({
-                cfg: config,
-                to: outboundTarget,
-                mediaUrl,
-                caption: caption ?? undefined,
-                replyToId: payload.replyToId ?? null,
-                accountId: account.accountId,
-              });
-              maybeEnqueueOutboundMessageId(result.messageId);
-              sentMessage = true;
-              statusSink?.({ lastOutboundAt: Date.now() });
-            }
-            return;
-          }
-
           const textLimit =
             account.config.textChunkLimit && account.config.textChunkLimit > 0
               ? account.config.textChunkLimit
@@ -1400,15 +948,10 @@ async function processMessage(
           if (!chunks.length && payload.text) chunks.push(payload.text);
           if (!chunks.length) return;
           for (const chunk of chunks) {
-            const replyToMessageGuid =
-              typeof payload.replyToId === "string" ? payload.replyToId.trim() : "";
-            const result = await sendMessageBlueBubbles(outboundTarget, chunk, {
+            await sendMessageBlueBubbles(outboundTarget, chunk, {
               cfg: config,
               accountId: account.accountId,
-              replyToMessageGuid: replyToMessageGuid || undefined,
             });
-            maybeEnqueueOutboundMessageId(result.messageId);
-            sentMessage = true;
             statusSink?.({ lastOutboundAt: Date.now() });
           }
         },
@@ -1426,48 +969,31 @@ async function processMessage(
           }
         },
         onIdle: () => {
-          // BlueBubbles typing stop (DELETE) does not clear bubbles reliably; wait for timeout.
+          if (!chatGuidForActions) return;
+          if (!baseUrl || !password) return;
+          logVerbose(core, runtime, `typing stop chatGuid=${chatGuidForActions}`);
+          void sendBlueBubblesTyping(chatGuidForActions, false, {
+            cfg: config,
+            accountId: account.accountId,
+          }).catch((err) => {
+            runtime.error?.(`[bluebubbles] typing stop failed: ${String(err)}`);
+          });
         },
         onError: (err, info) => {
           runtime.error?.(`BlueBubbles ${info.kind} reply failed: ${String(err)}`);
         },
       },
-      replyOptions: {
-        disableBlockStreaming:
-          typeof account.config.blockStreaming === "boolean"
-            ? !account.config.blockStreaming
-            : undefined,
-      },
     });
   } finally {
-    if (
-      removeAckAfterReply &&
-      sentMessage &&
-      ackReactionPromise &&
-      ackReactionValue &&
-      chatGuidForActions &&
-      ackMessageId
-    ) {
-      void ackReactionPromise.then((didAck) => {
-        if (!didAck) return;
-        sendBlueBubblesReaction({
-          chatGuid: chatGuidForActions,
-          messageGuid: ackMessageId,
-          emoji: ackReactionValue,
-          remove: true,
-          opts: { cfg: config, accountId: account.accountId },
-        }).catch((err) => {
-          logVerbose(
-            core,
-            runtime,
-            `ack reaction removal failed chatGuid=${chatGuidForActions} msg=${ackMessageId}: ${String(err)}`,
-          );
-        });
+    if (chatGuidForActions && baseUrl && password) {
+      logVerbose(core, runtime, `typing stop (finalize) chatGuid=${chatGuidForActions}`);
+      void sendBlueBubblesTyping(chatGuidForActions, false, {
+        cfg: config,
+        accountId: account.accountId,
+      }).catch((err) => {
+        runtime.error?.(`[bluebubbles] typing stop failed: ${String(err)}`);
       });
     }
-    if (chatGuidForActions && baseUrl && password && !sentMessage) {
-      // BlueBubbles typing stop (DELETE) does not clear bubbles reliably; wait for timeout.
-    }
   }
 }
 
@@ -1551,22 +1077,11 @@ async function processReaction(
 
 export async function monitorBlueBubblesProvider(
   options: BlueBubblesMonitorOptions,
-): Promise<void> {
+): Promise<{ stop: () => void }> {
   const { account, config, runtime, abortSignal, statusSink } = options;
   const core = getBlueBubblesRuntime();
   const path = options.webhookPath?.trim() || DEFAULT_WEBHOOK_PATH;
 
-  // Fetch and cache server info (for macOS version detection in action gating)
-  const serverInfo = await fetchBlueBubblesServerInfo({
-    baseUrl: account.baseUrl,
-    password: account.config.password,
-    accountId: account.accountId,
-    timeoutMs: 5000,
-  }).catch(() => null);
-  if (serverInfo?.os_version) {
-    runtime.log?.(`[${account.accountId}] BlueBubbles server macOS ${serverInfo.os_version}`);
-  }
-
   const unregister = registerBlueBubblesWebhookTarget({
     account,
     config,
@@ -1576,22 +1091,21 @@ export async function monitorBlueBubblesProvider(
     statusSink,
   });
 
-  return await new Promise((resolve) => {
-    const stop = () => {
-      unregister();
-      resolve();
-    };
-
-    if (abortSignal?.aborted) {
-      stop();
-      return;
-    }
+  const stop = () => {
+    unregister();
+  };
 
+  if (abortSignal?.aborted) {
+    stop();
+  } else {
     abortSignal?.addEventListener("abort", stop, { once: true });
-    runtime.log?.(
-      `[${account.accountId}] BlueBubbles webhook listening on ${normalizeWebhookPath(path)}`,
-    );
-  });
+  }
+
+  runtime.log?.(
+    `[${account.accountId}] BlueBubbles webhook listening on ${normalizeWebhookPath(path)}`,
+  );
+
+  return { stop };
 }
 
 export function resolveWebhookPathFromConfig(config?: BlueBubblesAccountConfig): string {

extensions/bluebubbles/src/onboarding.ts

@@ -1,334 +0,0 @@
-import type { ClawdbotConfig, DmPolicy, WizardPrompter } from "clawdbot/plugin-sdk";
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "clawdbot/plugin-sdk";
-import type {
-  ChannelOnboardingAdapter,
-  ChannelOnboardingDmPolicy,
-} from "../../../src/channels/plugins/onboarding-types.js";
-import { addWildcardAllowFrom, promptAccountId } from "../../../src/channels/plugins/onboarding/helpers.js";
-import { formatDocsLink } from "../../../src/terminal/links.js";
-import {
-  listBlueBubblesAccountIds,
-  resolveBlueBubblesAccount,
-  resolveDefaultBlueBubblesAccountId,
-} from "./accounts.js";
-import { normalizeBlueBubblesServerUrl } from "./types.js";
-import { parseBlueBubblesAllowTarget, normalizeBlueBubblesHandle } from "./targets.js";
-
-const channel = "bluebubbles" as const;
-
-function setBlueBubblesDmPolicy(cfg: ClawdbotConfig, dmPolicy: DmPolicy): ClawdbotConfig {
-  const allowFrom =
-    dmPolicy === "open" ? addWildcardAllowFrom(cfg.channels?.bluebubbles?.allowFrom) : undefined;
-  return {
-    ...cfg,
-    channels: {
-      ...cfg.channels,
-      bluebubbles: {
-        ...cfg.channels?.bluebubbles,
-        dmPolicy,
-        ...(allowFrom ? { allowFrom } : {}),
-      },
-    },
-  };
-}
-
-function setBlueBubblesAllowFrom(
-  cfg: ClawdbotConfig,
-  accountId: string,
-  allowFrom: string[],
-): ClawdbotConfig {
-  if (accountId === DEFAULT_ACCOUNT_ID) {
-    return {
-      ...cfg,
-      channels: {
-        ...cfg.channels,
-        bluebubbles: {
-          ...cfg.channels?.bluebubbles,
-          allowFrom,
-        },
-      },
-    };
-  }
-  return {
-    ...cfg,
-    channels: {
-      ...cfg.channels,
-      bluebubbles: {
-        ...cfg.channels?.bluebubbles,
-        accounts: {
-          ...cfg.channels?.bluebubbles?.accounts,
-          [accountId]: {
-            ...cfg.channels?.bluebubbles?.accounts?.[accountId],
-            allowFrom,
-          },
-        },
-      },
-    },
-  };
-}
-
-function parseBlueBubblesAllowFromInput(raw: string): string[] {
-  return raw
-    .split(/[\n,]+/g)
-    .map((entry) => entry.trim())
-    .filter(Boolean);
-}
-
-async function promptBlueBubblesAllowFrom(params: {
-  cfg: ClawdbotConfig;
-  prompter: WizardPrompter;
-  accountId?: string;
-}): Promise<ClawdbotConfig> {
-  const accountId =
-    params.accountId && normalizeAccountId(params.accountId)
-      ? (normalizeAccountId(params.accountId) ?? DEFAULT_ACCOUNT_ID)
-      : resolveDefaultBlueBubblesAccountId(params.cfg);
-  const resolved = resolveBlueBubblesAccount({ cfg: params.cfg, accountId });
-  const existing = resolved.config.allowFrom ?? [];
-  await params.prompter.note(
-    [
-      "Allowlist BlueBubbles DMs by handle or chat target.",
-      "Examples:",
-      "- +15555550123",
-      "- user@example.com",
-      "- chat_id:123",
-      "- chat_guid:iMessage;-;+15555550123",
-      "Multiple entries: comma- or newline-separated.",
-      `Docs: ${formatDocsLink("/channels/bluebubbles", "bluebubbles")}`,
-    ].join("\n"),
-    "BlueBubbles allowlist",
-  );
-  const entry = await params.prompter.text({
-    message: "BlueBubbles allowFrom (handle or chat_id)",
-    placeholder: "+15555550123, user@example.com, chat_id:123",
-    initialValue: existing[0] ? String(existing[0]) : undefined,
-    validate: (value) => {
-      const raw = String(value ?? "").trim();
-      if (!raw) return "Required";
-      const parts = parseBlueBubblesAllowFromInput(raw);
-      for (const part of parts) {
-        if (part === "*") continue;
-        const parsed = parseBlueBubblesAllowTarget(part);
-        if (parsed.kind === "handle" && !parsed.handle) {
-          return `Invalid entry: ${part}`;
-        }
-      }
-      return undefined;
-    },
-  });
-  const parts = parseBlueBubblesAllowFromInput(String(entry));
-  const unique = [...new Set(parts)];
-  return setBlueBubblesAllowFrom(params.cfg, accountId, unique);
-}
-
-const dmPolicy: ChannelOnboardingDmPolicy = {
-  label: "BlueBubbles",
-  channel,
-  policyKey: "channels.bluebubbles.dmPolicy",
-  allowFromKey: "channels.bluebubbles.allowFrom",
-  getCurrent: (cfg) => cfg.channels?.bluebubbles?.dmPolicy ?? "pairing",
-  setPolicy: (cfg, policy) => setBlueBubblesDmPolicy(cfg, policy),
-  promptAllowFrom: promptBlueBubblesAllowFrom,
-};
-
-export const blueBubblesOnboardingAdapter: ChannelOnboardingAdapter = {
-  channel,
-  getStatus: async ({ cfg }) => {
-    const configured = listBlueBubblesAccountIds(cfg).some((accountId) => {
-      const account = resolveBlueBubblesAccount({ cfg, accountId });
-      return account.configured;
-    });
-    return {
-      channel,
-      configured,
-      statusLines: [`BlueBubbles: ${configured ? "configured" : "needs setup"}`],
-      selectionHint: configured ? "configured" : "iMessage via BlueBubbles app",
-      quickstartScore: configured ? 1 : 0,
-    };
-  },
-  configure: async ({ cfg, prompter, accountOverrides, shouldPromptAccountIds }) => {
-    const blueBubblesOverride = accountOverrides.bluebubbles?.trim();
-    const defaultAccountId = resolveDefaultBlueBubblesAccountId(cfg);
-    let accountId = blueBubblesOverride
-      ? normalizeAccountId(blueBubblesOverride)
-      : defaultAccountId;
-    if (shouldPromptAccountIds && !blueBubblesOverride) {
-      accountId = await promptAccountId({
-        cfg,
-        prompter,
-        label: "BlueBubbles",
-        currentId: accountId,
-        listAccountIds: listBlueBubblesAccountIds,
-        defaultAccountId,
-      });
-    }
-
-    let next = cfg;
-    const resolvedAccount = resolveBlueBubblesAccount({ cfg: next, accountId });
-
-    // Prompt for server URL
-    let serverUrl = resolvedAccount.config.serverUrl?.trim();
-    if (!serverUrl) {
-      await prompter.note(
-        [
-          "Enter the BlueBubbles server URL (e.g., http://192.168.1.100:1234).",
-          "Find this in the BlueBubbles Server app under Connection.",
-          `Docs: ${formatDocsLink("/channels/bluebubbles", "bluebubbles")}`,
-        ].join("\n"),
-        "BlueBubbles server URL",
-      );
-      const entered = await prompter.text({
-        message: "BlueBubbles server URL",
-        placeholder: "http://192.168.1.100:1234",
-        validate: (value) => {
-          const trimmed = String(value ?? "").trim();
-          if (!trimmed) return "Required";
-          try {
-            const normalized = normalizeBlueBubblesServerUrl(trimmed);
-            new URL(normalized);
-            return undefined;
-          } catch {
-            return "Invalid URL format";
-          }
-        },
-      });
-      serverUrl = String(entered).trim();
-    } else {
-      const keepUrl = await prompter.confirm({
-        message: `BlueBubbles server URL already set (${serverUrl}). Keep it?`,
-        initialValue: true,
-      });
-      if (!keepUrl) {
-        const entered = await prompter.text({
-          message: "BlueBubbles server URL",
-          placeholder: "http://192.168.1.100:1234",
-          initialValue: serverUrl,
-          validate: (value) => {
-            const trimmed = String(value ?? "").trim();
-            if (!trimmed) return "Required";
-            try {
-              const normalized = normalizeBlueBubblesServerUrl(trimmed);
-              new URL(normalized);
-              return undefined;
-            } catch {
-              return "Invalid URL format";
-            }
-          },
-        });
-        serverUrl = String(entered).trim();
-      }
-    }
-
-    // Prompt for password
-    let password = resolvedAccount.config.password?.trim();
-    if (!password) {
-      await prompter.note(
-        [
-          "Enter the BlueBubbles server password.",
-          "Find this in the BlueBubbles Server app under Settings.",
-        ].join("\n"),
-        "BlueBubbles password",
-      );
-      const entered = await prompter.text({
-        message: "BlueBubbles password",
-        validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
-      });
-      password = String(entered).trim();
-    } else {
-      const keepPassword = await prompter.confirm({
-        message: "BlueBubbles password already set. Keep it?",
-        initialValue: true,
-      });
-      if (!keepPassword) {
-        const entered = await prompter.text({
-          message: "BlueBubbles password",
-          validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
-        });
-        password = String(entered).trim();
-      }
-    }
-
-    // Prompt for webhook path (optional)
-    const existingWebhookPath = resolvedAccount.config.webhookPath?.trim();
-    const wantsWebhook = await prompter.confirm({
-      message: "Configure a custom webhook path? (default: /bluebubbles-webhook)",
-      initialValue: Boolean(existingWebhookPath && existingWebhookPath !== "/bluebubbles-webhook"),
-    });
-    let webhookPath = "/bluebubbles-webhook";
-    if (wantsWebhook) {
-      const entered = await prompter.text({
-        message: "Webhook path",
-        placeholder: "/bluebubbles-webhook",
-        initialValue: existingWebhookPath || "/bluebubbles-webhook",
-        validate: (value) => {
-          const trimmed = String(value ?? "").trim();
-          if (!trimmed) return "Required";
-          if (!trimmed.startsWith("/")) return "Path must start with /";
-          return undefined;
-        },
-      });
-      webhookPath = String(entered).trim();
-    }
-
-    // Apply config
-    if (accountId === DEFAULT_ACCOUNT_ID) {
-      next = {
-        ...next,
-        channels: {
-          ...next.channels,
-          bluebubbles: {
-            ...next.channels?.bluebubbles,
-            enabled: true,
-            serverUrl,
-            password,
-            webhookPath,
-          },
-        },
-      };
-    } else {
-      next = {
-        ...next,
-        channels: {
-          ...next.channels,
-          bluebubbles: {
-            ...next.channels?.bluebubbles,
-            enabled: true,
-            accounts: {
-              ...next.channels?.bluebubbles?.accounts,
-              [accountId]: {
-                ...next.channels?.bluebubbles?.accounts?.[accountId],
-                enabled: next.channels?.bluebubbles?.accounts?.[accountId]?.enabled ?? true,
-                serverUrl,
-                password,
-                webhookPath,
-              },
-            },
-          },
-        },
-      };
-    }
-
-    await prompter.note(
-      [
-        "Configure the webhook URL in BlueBubbles Server:",
-        "1. Open BlueBubbles Server → Settings → Webhooks",
-        "2. Add your Clawdbot gateway URL + webhook path",
-        "   Example: https://your-gateway-host:3000/bluebubbles-webhook",
-        "3. Enable the webhook and save",
-        "",
-        `Docs: ${formatDocsLink("/channels/bluebubbles", "bluebubbles")}`,
-      ].join("\n"),
-      "BlueBubbles next steps",
-    );
-
-    return { cfg: next, accountId };
-  },
-  dmPolicy,
-  disable: (cfg) => ({
-    ...cfg,
-    channels: {
-      ...cfg.channels,
-      bluebubbles: { ...cfg.channels?.bluebubbles, enabled: false },
-    },
-  }),
-};

extensions/bluebubbles/src/probe.ts

@@ -6,97 +6,6 @@ export type BlueBubblesProbe = {
   error?: string | null;
 };
 
-export type BlueBubblesServerInfo = {
-  os_version?: string;
-  server_version?: string;
-  private_api?: boolean;
-  helper_connected?: boolean;
-  proxy_service?: string;
-  detected_icloud?: string;
-  computer_id?: string;
-};
-
-/** Cache server info by account ID to avoid repeated API calls */
-const serverInfoCache = new Map<string, { info: BlueBubblesServerInfo; expires: number }>();
-const CACHE_TTL_MS = 10 * 60 * 1000; // 10 minutes
-
-function buildCacheKey(accountId?: string): string {
-  return accountId?.trim() || "default";
-}
-
-/**
- * Fetch server info from BlueBubbles API and cache it.
- * Returns cached result if available and not expired.
- */
-export async function fetchBlueBubblesServerInfo(params: {
-  baseUrl?: string | null;
-  password?: string | null;
-  accountId?: string;
-  timeoutMs?: number;
-}): Promise<BlueBubblesServerInfo | null> {
-  const baseUrl = params.baseUrl?.trim();
-  const password = params.password?.trim();
-  if (!baseUrl || !password) return null;
-
-  const cacheKey = buildCacheKey(params.accountId);
-  const cached = serverInfoCache.get(cacheKey);
-  if (cached && cached.expires > Date.now()) {
-    return cached.info;
-  }
-
-  const url = buildBlueBubblesApiUrl({ baseUrl, path: "/api/v1/server/info", password });
-  try {
-    const res = await blueBubblesFetchWithTimeout(url, { method: "GET" }, params.timeoutMs ?? 5000);
-    if (!res.ok) return null;
-    const payload = (await res.json().catch(() => null)) as Record<string, unknown> | null;
-    const data = payload?.data as BlueBubblesServerInfo | undefined;
-    if (data) {
-      serverInfoCache.set(cacheKey, { info: data, expires: Date.now() + CACHE_TTL_MS });
-    }
-    return data ?? null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Get cached server info synchronously (for use in listActions).
- * Returns null if not cached or expired.
- */
-export function getCachedBlueBubblesServerInfo(accountId?: string): BlueBubblesServerInfo | null {
-  const cacheKey = buildCacheKey(accountId);
-  const cached = serverInfoCache.get(cacheKey);
-  if (cached && cached.expires > Date.now()) {
-    return cached.info;
-  }
-  return null;
-}
-
-/**
- * Parse macOS version string (e.g., "15.0.1" or "26.0") into major version number.
- */
-export function parseMacOSMajorVersion(version?: string | null): number | null {
-  if (!version) return null;
-  const match = /^(\d+)/.exec(version.trim());
-  return match ? Number.parseInt(match[1], 10) : null;
-}
-
-/**
- * Check if the cached server info indicates macOS 26 or higher.
- * Returns false if no cached info is available (fail open for action listing).
- */
-export function isMacOS26OrHigher(accountId?: string): boolean {
-  const info = getCachedBlueBubblesServerInfo(accountId);
-  if (!info?.os_version) return false;
-  const major = parseMacOSMajorVersion(info.os_version);
-  return major !== null && major >= 26;
-}
-
-/** Clear the server info cache (for testing) */
-export function clearServerInfoCache(): void {
-  serverInfoCache.clear();
-}
-
 export async function probeBlueBubbles(params: {
   baseUrl?: string | null;
   password?: string | null;

extensions/bluebubbles/src/reactions.test.ts

@@ -1,393 +0,0 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
-
-import { sendBlueBubblesReaction } from "./reactions.js";
-
-vi.mock("./accounts.js", () => ({
-  resolveBlueBubblesAccount: vi.fn(({ cfg, accountId }) => {
-    const config = cfg?.channels?.bluebubbles ?? {};
-    return {
-      accountId: accountId ?? "default",
-      enabled: config.enabled !== false,
-      configured: Boolean(config.serverUrl && config.password),
-      config,
-    };
-  }),
-}));
-
-const mockFetch = vi.fn();
-
-describe("reactions", () => {
-  beforeEach(() => {
-    vi.stubGlobal("fetch", mockFetch);
-    mockFetch.mockReset();
-  });
-
-  afterEach(() => {
-    vi.unstubAllGlobals();
-  });
-
-  describe("sendBlueBubblesReaction", () => {
-    it("throws when chatGuid is empty", async () => {
-      await expect(
-        sendBlueBubblesReaction({
-          chatGuid: "",
-          messageGuid: "msg-123",
-          emoji: "love",
-          opts: {
-            serverUrl: "http://localhost:1234",
-            password: "test",
-          },
-        }),
-      ).rejects.toThrow("chatGuid");
-    });
-
-    it("throws when messageGuid is empty", async () => {
-      await expect(
-        sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "",
-          emoji: "love",
-          opts: {
-            serverUrl: "http://localhost:1234",
-            password: "test",
-          },
-        }),
-      ).rejects.toThrow("messageGuid");
-    });
-
-    it("throws when emoji is empty", async () => {
-      await expect(
-        sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "msg-123",
-          emoji: "",
-          opts: {
-            serverUrl: "http://localhost:1234",
-            password: "test",
-          },
-        }),
-      ).rejects.toThrow("emoji or name");
-    });
-
-    it("throws when serverUrl is missing", async () => {
-      await expect(
-        sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "msg-123",
-          emoji: "love",
-          opts: {},
-        }),
-      ).rejects.toThrow("serverUrl is required");
-    });
-
-    it("throws when password is missing", async () => {
-      await expect(
-        sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "msg-123",
-          emoji: "love",
-          opts: {
-            serverUrl: "http://localhost:1234",
-          },
-        }),
-      ).rejects.toThrow("password is required");
-    });
-
-    it("throws for unsupported reaction type", async () => {
-      await expect(
-        sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "msg-123",
-          emoji: "unsupported",
-          opts: {
-            serverUrl: "http://localhost:1234",
-            password: "test",
-          },
-        }),
-      ).rejects.toThrow("Unsupported BlueBubbles reaction");
-    });
-
-    describe("reaction type normalization", () => {
-      const testCases = [
-        { input: "love", expected: "love" },
-        { input: "like", expected: "like" },
-        { input: "dislike", expected: "dislike" },
-        { input: "laugh", expected: "laugh" },
-        { input: "emphasize", expected: "emphasize" },
-        { input: "question", expected: "question" },
-        { input: "heart", expected: "love" },
-        { input: "thumbs_up", expected: "like" },
-        { input: "thumbs-down", expected: "dislike" },
-        { input: "thumbs_down", expected: "dislike" },
-        { input: "haha", expected: "laugh" },
-        { input: "lol", expected: "laugh" },
-        { input: "emphasis", expected: "emphasize" },
-        { input: "exclaim", expected: "emphasize" },
-        { input: "❤️", expected: "love" },
-        { input: "❤", expected: "love" },
-        { input: "♥️", expected: "love" },
-        { input: "😍", expected: "love" },
-        { input: "👍", expected: "like" },
-        { input: "👎", expected: "dislike" },
-        { input: "😂", expected: "laugh" },
-        { input: "🤣", expected: "laugh" },
-        { input: "😆", expected: "laugh" },
-        { input: "‼️", expected: "emphasize" },
-        { input: "‼", expected: "emphasize" },
-        { input: "❗", expected: "emphasize" },
-        { input: "❓", expected: "question" },
-        { input: "❔", expected: "question" },
-        { input: "LOVE", expected: "love" },
-        { input: "Like", expected: "like" },
-      ];
-
-      for (const { input, expected } of testCases) {
-        it(`normalizes "${input}" to "${expected}"`, async () => {
-          mockFetch.mockResolvedValueOnce({
-            ok: true,
-            text: () => Promise.resolve(""),
-          });
-
-          await sendBlueBubblesReaction({
-            chatGuid: "chat-123",
-            messageGuid: "msg-123",
-            emoji: input,
-            opts: {
-              serverUrl: "http://localhost:1234",
-              password: "test",
-            },
-          });
-
-          const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-          expect(body.reaction).toBe(expected);
-        });
-      }
-    });
-
-    it("sends reaction successfully", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesReaction({
-        chatGuid: "iMessage;-;+15551234567",
-        messageGuid: "msg-uuid-123",
-        emoji: "love",
-        opts: {
-          serverUrl: "http://localhost:1234",
-          password: "test-password",
-        },
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        expect.stringContaining("/api/v1/message/react"),
-        expect.objectContaining({
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-        }),
-      );
-
-      const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-      expect(body.chatGuid).toBe("iMessage;-;+15551234567");
-      expect(body.selectedMessageGuid).toBe("msg-uuid-123");
-      expect(body.reaction).toBe("love");
-      expect(body.partIndex).toBe(0);
-    });
-
-    it("includes password in URL query", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesReaction({
-        chatGuid: "chat-123",
-        messageGuid: "msg-123",
-        emoji: "like",
-        opts: {
-          serverUrl: "http://localhost:1234",
-          password: "my-react-password",
-        },
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("password=my-react-password");
-    });
-
-    it("sends reaction removal with dash prefix", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesReaction({
-        chatGuid: "chat-123",
-        messageGuid: "msg-123",
-        emoji: "love",
-        remove: true,
-        opts: {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        },
-      });
-
-      const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-      expect(body.reaction).toBe("-love");
-    });
-
-    it("strips leading dash from emoji when remove flag is set", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesReaction({
-        chatGuid: "chat-123",
-        messageGuid: "msg-123",
-        emoji: "-love",
-        remove: true,
-        opts: {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        },
-      });
-
-      const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-      expect(body.reaction).toBe("-love");
-    });
-
-    it("uses custom partIndex when provided", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesReaction({
-        chatGuid: "chat-123",
-        messageGuid: "msg-123",
-        emoji: "laugh",
-        partIndex: 3,
-        opts: {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        },
-      });
-
-      const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-      expect(body.partIndex).toBe(3);
-    });
-
-    it("throws on non-ok response", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: false,
-        status: 400,
-        text: () => Promise.resolve("Invalid reaction type"),
-      });
-
-      await expect(
-        sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "msg-123",
-          emoji: "like",
-          opts: {
-            serverUrl: "http://localhost:1234",
-            password: "test",
-          },
-        }),
-      ).rejects.toThrow("reaction failed (400): Invalid reaction type");
-    });
-
-    it("resolves credentials from config", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesReaction({
-        chatGuid: "chat-123",
-        messageGuid: "msg-123",
-        emoji: "emphasize",
-        opts: {
-          cfg: {
-            channels: {
-              bluebubbles: {
-                serverUrl: "http://react-server:7777",
-                password: "react-pass",
-              },
-            },
-          },
-        },
-      });
-
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("react-server:7777");
-      expect(calledUrl).toContain("password=react-pass");
-    });
-
-    it("trims chatGuid and messageGuid", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () => Promise.resolve(""),
-      });
-
-      await sendBlueBubblesReaction({
-        chatGuid: "  chat-with-spaces  ",
-        messageGuid: "  msg-with-spaces  ",
-        emoji: "question",
-        opts: {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        },
-      });
-
-      const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-      expect(body.chatGuid).toBe("chat-with-spaces");
-      expect(body.selectedMessageGuid).toBe("msg-with-spaces");
-    });
-
-    describe("reaction removal aliases", () => {
-      it("handles emoji-based removal", async () => {
-        mockFetch.mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve(""),
-        });
-
-        await sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "msg-123",
-          emoji: "👍",
-          remove: true,
-          opts: {
-            serverUrl: "http://localhost:1234",
-            password: "test",
-          },
-        });
-
-        const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-        expect(body.reaction).toBe("-like");
-      });
-
-      it("handles text alias removal", async () => {
-        mockFetch.mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve(""),
-        });
-
-        await sendBlueBubblesReaction({
-          chatGuid: "chat-123",
-          messageGuid: "msg-123",
-          emoji: "haha",
-          remove: true,
-          opts: {
-            serverUrl: "http://localhost:1234",
-            password: "test",
-          },
-        });
-
-        const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-        expect(body.reaction).toBe("-laugh");
-      });
-    });
-  });
-});

extensions/bluebubbles/src/reactions.ts

@@ -60,7 +60,7 @@ function resolveAccount(params: BlueBubblesReactionOpts) {
   return { baseUrl, password };
 }
 
-export function normalizeBlueBubblesReactionInput(emoji: string, remove?: boolean): string {
+function normalizeReactionInput(emoji: string, remove?: boolean): string {
   const trimmed = emoji.trim();
   if (!trimmed) throw new Error("BlueBubbles reaction requires an emoji or name.");
   let raw = trimmed.toLowerCase();
@@ -85,7 +85,7 @@ export async function sendBlueBubblesReaction(params: {
   const messageGuid = params.messageGuid.trim();
   if (!chatGuid) throw new Error("BlueBubbles reaction requires chatGuid.");
   if (!messageGuid) throw new Error("BlueBubbles reaction requires messageGuid.");
-  const reaction = normalizeBlueBubblesReactionInput(params.emoji, params.remove);
+  const reaction = normalizeReactionInput(params.emoji, params.remove);
   const { baseUrl, password } = resolveAccount(params.opts ?? {});
   const url = buildBlueBubblesApiUrl({
     baseUrl,

extensions/bluebubbles/src/send.test.ts

@@ -1,690 +0,0 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
-
-import { sendMessageBlueBubbles, resolveChatGuidForTarget } from "./send.js";
-import type { BlueBubblesSendTarget } from "./types.js";
-
-vi.mock("./accounts.js", () => ({
-  resolveBlueBubblesAccount: vi.fn(({ cfg, accountId }) => {
-    const config = cfg?.channels?.bluebubbles ?? {};
-    return {
-      accountId: accountId ?? "default",
-      enabled: config.enabled !== false,
-      configured: Boolean(config.serverUrl && config.password),
-      config,
-    };
-  }),
-}));
-
-const mockFetch = vi.fn();
-
-describe("send", () => {
-  beforeEach(() => {
-    vi.stubGlobal("fetch", mockFetch);
-    mockFetch.mockReset();
-  });
-
-  afterEach(() => {
-    vi.unstubAllGlobals();
-  });
-
-  describe("resolveChatGuidForTarget", () => {
-    it("returns chatGuid directly for chat_guid target", async () => {
-      const target: BlueBubblesSendTarget = {
-        kind: "chat_guid",
-        chatGuid: "iMessage;-;+15551234567",
-      };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-      expect(result).toBe("iMessage;-;+15551234567");
-      expect(mockFetch).not.toHaveBeenCalled();
-    });
-
-    it("queries chats to resolve chat_id target", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            data: [
-              { id: 123, guid: "iMessage;-;chat123", participants: [] },
-              { id: 456, guid: "iMessage;-;chat456", participants: [] },
-            ],
-          }),
-      });
-
-      const target: BlueBubblesSendTarget = { kind: "chat_id", chatId: 456 };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBe("iMessage;-;chat456");
-      expect(mockFetch).toHaveBeenCalledWith(
-        expect.stringContaining("/api/v1/chat/query"),
-        expect.objectContaining({ method: "POST" }),
-      );
-    });
-
-    it("queries chats to resolve chat_identifier target", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            data: [
-              {
-                identifier: "chat123@group.imessage",
-                guid: "iMessage;-;chat123",
-                participants: [],
-              },
-            ],
-          }),
-      });
-
-      const target: BlueBubblesSendTarget = {
-        kind: "chat_identifier",
-        chatIdentifier: "chat123@group.imessage",
-      };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBe("iMessage;-;chat123");
-    });
-
-    it("resolves handle target by matching participant", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            data: [
-              {
-                guid: "iMessage;-;+15559999999",
-                participants: [{ address: "+15559999999" }],
-              },
-              {
-                guid: "iMessage;-;+15551234567",
-                participants: [{ address: "+15551234567" }],
-              },
-            ],
-          }),
-      });
-
-      const target: BlueBubblesSendTarget = {
-        kind: "handle",
-        address: "+15551234567",
-        service: "imessage",
-      };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBe("iMessage;-;+15551234567");
-    });
-
-    it("prefers direct chat guid when handle also appears in a group chat", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            data: [
-              {
-                guid: "iMessage;+;group-123",
-                participants: [{ address: "+15551234567" }, { address: "+15550001111" }],
-              },
-              {
-                guid: "iMessage;-;+15551234567",
-                participants: [{ address: "+15551234567" }],
-              },
-            ],
-          }),
-      });
-
-      const target: BlueBubblesSendTarget = {
-        kind: "handle",
-        address: "+15551234567",
-        service: "imessage",
-      };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBe("iMessage;-;+15551234567");
-    });
-
-    it("returns null when chat not found", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () => Promise.resolve({ data: [] }),
-      });
-
-      const target: BlueBubblesSendTarget = { kind: "chat_id", chatId: 999 };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBeNull();
-    });
-
-    it("handles API error gracefully", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: false,
-        status: 500,
-      });
-
-      const target: BlueBubblesSendTarget = { kind: "chat_id", chatId: 123 };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBeNull();
-    });
-
-    it("paginates through chats to find match", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: Array(500)
-                .fill(null)
-                .map((_, i) => ({
-                  id: i,
-                  guid: `chat-${i}`,
-                  participants: [],
-                })),
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [{ id: 555, guid: "found-chat", participants: [] }],
-            }),
-        });
-
-      const target: BlueBubblesSendTarget = { kind: "chat_id", chatId: 555 };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBe("found-chat");
-      expect(mockFetch).toHaveBeenCalledTimes(2);
-    });
-
-    it("normalizes handle addresses for matching", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            data: [
-              {
-                guid: "iMessage;-;test@example.com",
-                participants: [{ address: "Test@Example.COM" }],
-              },
-            ],
-          }),
-      });
-
-      const target: BlueBubblesSendTarget = {
-        kind: "handle",
-        address: "test@example.com",
-        service: "auto",
-      };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBe("iMessage;-;test@example.com");
-    });
-
-    it("extracts guid from various response formats", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            data: [
-              {
-                chatGuid: "format1-guid",
-                id: 100,
-                participants: [],
-              },
-            ],
-          }),
-      });
-
-      const target: BlueBubblesSendTarget = { kind: "chat_id", chatId: 100 };
-      const result = await resolveChatGuidForTarget({
-        baseUrl: "http://localhost:1234",
-        password: "test",
-        target,
-      });
-
-      expect(result).toBe("format1-guid");
-    });
-  });
-
-  describe("sendMessageBlueBubbles", () => {
-    beforeEach(() => {
-      mockFetch.mockReset();
-    });
-
-    it("throws when text is empty", async () => {
-      await expect(
-        sendMessageBlueBubbles("+15551234567", "", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("requires text");
-    });
-
-    it("throws when text is whitespace only", async () => {
-      await expect(
-        sendMessageBlueBubbles("+15551234567", "   ", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("requires text");
-    });
-
-    it("throws when serverUrl is missing", async () => {
-      await expect(sendMessageBlueBubbles("+15551234567", "Hello", {})).rejects.toThrow(
-        "serverUrl is required",
-      );
-    });
-
-    it("throws when password is missing", async () => {
-      await expect(
-        sendMessageBlueBubbles("+15551234567", "Hello", {
-          serverUrl: "http://localhost:1234",
-        }),
-      ).rejects.toThrow("password is required");
-    });
-
-    it("throws when chatGuid cannot be resolved", async () => {
-      mockFetch.mockResolvedValue({
-        ok: true,
-        json: () => Promise.resolve({ data: [] }),
-      });
-
-      await expect(
-        sendMessageBlueBubbles("+15559999999", "Hello", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("chatGuid not found");
-    });
-
-    it("sends message successfully", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () =>
-            Promise.resolve(
-              JSON.stringify({
-                data: { guid: "msg-uuid-123" },
-              }),
-            ),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Hello world!", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(result.messageId).toBe("msg-uuid-123");
-      expect(mockFetch).toHaveBeenCalledTimes(2);
-
-      const sendCall = mockFetch.mock.calls[1];
-      expect(sendCall[0]).toContain("/api/v1/message/text");
-      const body = JSON.parse(sendCall[1].body);
-      expect(body.chatGuid).toBe("iMessage;-;+15551234567");
-      expect(body.message).toBe("Hello world!");
-      expect(body.method).toBeUndefined();
-    });
-
-    it("uses private-api when reply metadata is present", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () =>
-            Promise.resolve(
-              JSON.stringify({
-                data: { guid: "msg-uuid-124" },
-              }),
-            ),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Replying", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-        replyToMessageGuid: "reply-guid-123",
-        replyToPartIndex: 1,
-      });
-
-      expect(result.messageId).toBe("msg-uuid-124");
-      expect(mockFetch).toHaveBeenCalledTimes(2);
-
-      const sendCall = mockFetch.mock.calls[1];
-      const body = JSON.parse(sendCall[1].body);
-      expect(body.method).toBe("private-api");
-      expect(body.selectedMessageGuid).toBe("reply-guid-123");
-      expect(body.partIndex).toBe(1);
-    });
-
-    it("normalizes effect names and uses private-api for effects", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () =>
-            Promise.resolve(
-              JSON.stringify({
-                data: { guid: "msg-uuid-125" },
-              }),
-            ),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Hello", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-        effectId: "invisible ink",
-      });
-
-      expect(result.messageId).toBe("msg-uuid-125");
-      expect(mockFetch).toHaveBeenCalledTimes(2);
-
-      const sendCall = mockFetch.mock.calls[1];
-      const body = JSON.parse(sendCall[1].body);
-      expect(body.method).toBe("private-api");
-      expect(body.effectId).toBe("com.apple.MobileSMS.expressivesend.invisibleink");
-    });
-
-    it("sends message with chat_guid target directly", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        text: () =>
-          Promise.resolve(
-            JSON.stringify({
-              data: { messageId: "direct-msg-123" },
-            }),
-          ),
-      });
-
-      const result = await sendMessageBlueBubbles(
-        "chat_guid:iMessage;-;direct-chat",
-        "Direct message",
-        {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        },
-      );
-
-      expect(result.messageId).toBe("direct-msg-123");
-      expect(mockFetch).toHaveBeenCalledTimes(1);
-    });
-
-    it("handles send failure", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: false,
-          status: 500,
-          text: () => Promise.resolve("Internal server error"),
-        });
-
-      await expect(
-        sendMessageBlueBubbles("+15551234567", "Hello", {
-          serverUrl: "http://localhost:1234",
-          password: "test",
-        }),
-      ).rejects.toThrow("send failed (500)");
-    });
-
-    it("handles empty response body", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve(""),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Hello", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(result.messageId).toBe("ok");
-    });
-
-    it("handles invalid JSON response body", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve("not valid json"),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Hello", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(result.messageId).toBe("ok");
-    });
-
-    it("extracts messageId from various response formats", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () =>
-            Promise.resolve(
-              JSON.stringify({
-                id: "numeric-id-456",
-              }),
-            ),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Hello", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(result.messageId).toBe("numeric-id-456");
-    });
-
-    it("extracts messageGuid from response payload", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () =>
-            Promise.resolve(
-              JSON.stringify({
-                data: { messageGuid: "msg-guid-789" },
-              }),
-            ),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Hello", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      expect(result.messageId).toBe("msg-guid-789");
-    });
-
-    it("resolves credentials from config", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve(JSON.stringify({ data: { guid: "msg-123" } })),
-        });
-
-      const result = await sendMessageBlueBubbles("+15551234567", "Hello", {
-        cfg: {
-          channels: {
-            bluebubbles: {
-              serverUrl: "http://config-server:5678",
-              password: "config-pass",
-            },
-          },
-        },
-      });
-
-      expect(result.messageId).toBe("msg-123");
-      const calledUrl = mockFetch.mock.calls[0][0] as string;
-      expect(calledUrl).toContain("config-server:5678");
-    });
-
-    it("includes tempGuid in request payload", async () => {
-      mockFetch
-        .mockResolvedValueOnce({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              data: [
-                {
-                  guid: "iMessage;-;+15551234567",
-                  participants: [{ address: "+15551234567" }],
-                },
-              ],
-            }),
-        })
-        .mockResolvedValueOnce({
-          ok: true,
-          text: () => Promise.resolve(JSON.stringify({ data: { guid: "msg" } })),
-        });
-
-      await sendMessageBlueBubbles("+15551234567", "Hello", {
-        serverUrl: "http://localhost:1234",
-        password: "test",
-      });
-
-      const sendCall = mockFetch.mock.calls[1];
-      const body = JSON.parse(sendCall[1].body);
-      expect(body.tempGuid).toBeDefined();
-      expect(typeof body.tempGuid).toBe("string");
-      expect(body.tempGuid.length).toBeGreaterThan(0);
-    });
-  });
-});

extensions/bluebubbles/src/send.ts

@@ -1,11 +1,7 @@
 import crypto from "node:crypto";
 
 import { resolveBlueBubblesAccount } from "./accounts.js";
-import {
-  extractHandleFromChatGuid,
-  normalizeBlueBubblesHandle,
-  parseBlueBubblesTarget,
-} from "./targets.js";
+import { parseBlueBubblesTarget, normalizeBlueBubblesHandle } from "./targets.js";
 import type { ClawdbotConfig } from "clawdbot/plugin-sdk";
 import {
   blueBubblesFetchWithTimeout,
@@ -19,52 +15,12 @@ export type BlueBubblesSendOpts = {
   accountId?: string;
   timeoutMs?: number;
   cfg?: ClawdbotConfig;
-  /** Message GUID to reply to (reply threading) */
-  replyToMessageGuid?: string;
-  /** Part index for reply (default: 0) */
-  replyToPartIndex?: number;
-  /** Effect ID or short name for message effects (e.g., "slam", "balloons") */
-  effectId?: string;
 };
 
 export type BlueBubblesSendResult = {
   messageId: string;
 };
 
-/** Maps short effect names to full Apple effect IDs */
-const EFFECT_MAP: Record<string, string> = {
-  // Bubble effects
-  slam: "com.apple.MobileSMS.expressivesend.impact",
-  loud: "com.apple.MobileSMS.expressivesend.loud",
-  gentle: "com.apple.MobileSMS.expressivesend.gentle",
-  invisible: "com.apple.MobileSMS.expressivesend.invisibleink",
-  "invisible-ink": "com.apple.MobileSMS.expressivesend.invisibleink",
-  "invisible ink": "com.apple.MobileSMS.expressivesend.invisibleink",
-  invisibleink: "com.apple.MobileSMS.expressivesend.invisibleink",
-  // Screen effects
-  echo: "com.apple.messages.effect.CKEchoEffect",
-  spotlight: "com.apple.messages.effect.CKSpotlightEffect",
-  balloons: "com.apple.messages.effect.CKHappyBirthdayEffect",
-  confetti: "com.apple.messages.effect.CKConfettiEffect",
-  love: "com.apple.messages.effect.CKHeartEffect",
-  heart: "com.apple.messages.effect.CKHeartEffect",
-  hearts: "com.apple.messages.effect.CKHeartEffect",
-  lasers: "com.apple.messages.effect.CKLasersEffect",
-  fireworks: "com.apple.messages.effect.CKFireworksEffect",
-  celebration: "com.apple.messages.effect.CKSparklesEffect",
-};
-
-function resolveEffectId(raw?: string): string | undefined {
-  if (!raw) return undefined;
-  const trimmed = raw.trim().toLowerCase();
-  if (EFFECT_MAP[trimmed]) return EFFECT_MAP[trimmed];
-  const normalized = trimmed.replace(/[\s_]+/g, "-");
-  if (EFFECT_MAP[normalized]) return EFFECT_MAP[normalized];
-  const compact = trimmed.replace(/[\s_-]+/g, "");
-  if (EFFECT_MAP[compact]) return EFFECT_MAP[compact];
-  return raw;
-}
-
 function resolveSendTarget(raw: string): BlueBubblesSendTarget {
   const parsed = parseBlueBubblesTarget(raw);
   if (parsed.kind === "handle") {
@@ -86,18 +42,12 @@ function resolveSendTarget(raw: string): BlueBubblesSendTarget {
 function extractMessageId(payload: unknown): string {
   if (!payload || typeof payload !== "object") return "unknown";
   const record = payload as Record<string, unknown>;
-  const data =
-    record.data && typeof record.data === "object" ? (record.data as Record<string, unknown>) : null;
+  const data = record.data && typeof record.data === "object" ? (record.data as Record<string, unknown>) : null;
   const candidates = [
     record.messageId,
-    record.messageGuid,
-    record.message_guid,
     record.guid,
     record.id,
     data?.messageId,
-    data?.messageGuid,
-    data?.message_guid,
-    data?.message_id,
     data?.guid,
     data?.id,
   ];
@@ -204,7 +154,6 @@ export async function resolveChatGuidForTarget(params: {
     params.target.kind === "chat_identifier" ? params.target.chatIdentifier : null;
 
   const limit = 500;
-  let participantMatch: string | null = null;
   for (let offset = 0; offset < 5000; offset += limit) {
     const chats = await queryChats({
       baseUrl: params.baseUrl,
@@ -235,23 +184,16 @@ export async function resolveChatGuidForTarget(params: {
         if (identifier && identifier === targetChatIdentifier) return extractChatGuid(chat);
       }
       if (normalizedHandle) {
-        const guid = extractChatGuid(chat);
-        const directHandle = guid ? extractHandleFromChatGuid(guid) : null;
-        if (directHandle && directHandle === normalizedHandle) {
-          return guid;
-        }
-        if (!participantMatch && guid) {
-          const participants = extractParticipantAddresses(chat).map((entry) =>
-            normalizeBlueBubblesHandle(entry),
-          );
-          if (participants.includes(normalizedHandle)) {
-            participantMatch = guid;
-          }
+        const participants = extractParticipantAddresses(chat).map((entry) =>
+          normalizeBlueBubblesHandle(entry),
+        );
+        if (participants.includes(normalizedHandle)) {
+          return extractChatGuid(chat);
         }
       }
     }
   }
-  return participantMatch;
+  return null;
 }
 
 export async function sendMessageBlueBubbles(
@@ -285,27 +227,12 @@ export async function sendMessageBlueBubbles(
       "BlueBubbles send failed: chatGuid not found for target. Use a chat_guid target or ensure the chat exists.",
     );
   }
-  const effectId = resolveEffectId(opts.effectId);
-  const needsPrivateApi = Boolean(opts.replyToMessageGuid || effectId);
   const payload: Record<string, unknown> = {
     chatGuid,
     tempGuid: crypto.randomUUID(),
     message: trimmedText,
+    method: "apple-script",
   };
-  if (needsPrivateApi) {
-    payload.method = "private-api";
-  }
-
-  // Add reply threading support
-  if (opts.replyToMessageGuid) {
-    payload.selectedMessageGuid = opts.replyToMessageGuid;
-    payload.partIndex = typeof opts.replyToPartIndex === "number" ? opts.replyToPartIndex : 0;
-  }
-
-  // Add message effects support
-  if (effectId) {
-    payload.effectId = effectId;
-  }
 
   const url = buildBlueBubblesApiUrl({
     baseUrl,

extensions/bluebubbles/src/targets.test.ts

@@ -1,184 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  looksLikeBlueBubblesTargetId,
-  normalizeBlueBubblesMessagingTarget,
-  parseBlueBubblesTarget,
-  parseBlueBubblesAllowTarget,
-} from "./targets.js";
-
-describe("normalizeBlueBubblesMessagingTarget", () => {
-  it("normalizes chat_guid targets", () => {
-    expect(normalizeBlueBubblesMessagingTarget("chat_guid:ABC-123")).toBe("chat_guid:ABC-123");
-  });
-
-  it("normalizes group numeric targets to chat_id", () => {
-    expect(normalizeBlueBubblesMessagingTarget("group:123")).toBe("chat_id:123");
-  });
-
-  it("strips provider prefix and normalizes handles", () => {
-    expect(normalizeBlueBubblesMessagingTarget("bluebubbles:imessage:User@Example.com")).toBe(
-      "imessage:user@example.com",
-    );
-  });
-
-  it("extracts handle from DM chat_guid for cross-context matching", () => {
-    // DM format: service;-;handle
-    expect(normalizeBlueBubblesMessagingTarget("chat_guid:iMessage;-;+19257864429")).toBe(
-      "+19257864429",
-    );
-    expect(normalizeBlueBubblesMessagingTarget("chat_guid:SMS;-;+15551234567")).toBe(
-      "+15551234567",
-    );
-    // Email handles
-    expect(normalizeBlueBubblesMessagingTarget("chat_guid:iMessage;-;user@example.com")).toBe(
-      "user@example.com",
-    );
-  });
-
-  it("preserves group chat_guid format", () => {
-    // Group format: service;+;groupId
-    expect(normalizeBlueBubblesMessagingTarget("chat_guid:iMessage;+;chat123456789")).toBe(
-      "chat_guid:iMessage;+;chat123456789",
-    );
-  });
-
-  it("normalizes raw chat_guid values", () => {
-    expect(normalizeBlueBubblesMessagingTarget("iMessage;+;chat660250192681427962")).toBe(
-      "chat_guid:iMessage;+;chat660250192681427962",
-    );
-    expect(normalizeBlueBubblesMessagingTarget("iMessage;-;+19257864429")).toBe("+19257864429");
-  });
-
-  it("normalizes chat<digits> pattern to chat_identifier format", () => {
-    expect(normalizeBlueBubblesMessagingTarget("chat660250192681427962")).toBe(
-      "chat_identifier:chat660250192681427962",
-    );
-    expect(normalizeBlueBubblesMessagingTarget("chat123")).toBe("chat_identifier:chat123");
-    expect(normalizeBlueBubblesMessagingTarget("Chat456789")).toBe("chat_identifier:Chat456789");
-  });
-
-  it("normalizes UUID/hex chat identifiers", () => {
-    expect(normalizeBlueBubblesMessagingTarget("8b9c1a10536d4d86a336ea03ab7151cc")).toBe(
-      "chat_identifier:8b9c1a10536d4d86a336ea03ab7151cc",
-    );
-    expect(normalizeBlueBubblesMessagingTarget("1C2D3E4F-1234-5678-9ABC-DEF012345678")).toBe(
-      "chat_identifier:1C2D3E4F-1234-5678-9ABC-DEF012345678",
-    );
-  });
-});
-
-describe("looksLikeBlueBubblesTargetId", () => {
-  it("accepts chat targets", () => {
-    expect(looksLikeBlueBubblesTargetId("chat_guid:ABC-123")).toBe(true);
-  });
-
-  it("accepts email handles", () => {
-    expect(looksLikeBlueBubblesTargetId("user@example.com")).toBe(true);
-  });
-
-  it("accepts phone numbers with punctuation", () => {
-    expect(looksLikeBlueBubblesTargetId("+1 (555) 123-4567")).toBe(true);
-  });
-
-  it("accepts raw chat_guid values", () => {
-    expect(looksLikeBlueBubblesTargetId("iMessage;+;chat660250192681427962")).toBe(true);
-  });
-
-  it("accepts chat<digits> pattern as chat_id", () => {
-    expect(looksLikeBlueBubblesTargetId("chat660250192681427962")).toBe(true);
-    expect(looksLikeBlueBubblesTargetId("chat123")).toBe(true);
-    expect(looksLikeBlueBubblesTargetId("Chat456789")).toBe(true);
-  });
-
-  it("accepts UUID/hex chat identifiers", () => {
-    expect(looksLikeBlueBubblesTargetId("8b9c1a10536d4d86a336ea03ab7151cc")).toBe(true);
-    expect(looksLikeBlueBubblesTargetId("1C2D3E4F-1234-5678-9ABC-DEF012345678")).toBe(true);
-  });
-
-  it("rejects display names", () => {
-    expect(looksLikeBlueBubblesTargetId("Jane Doe")).toBe(false);
-  });
-});
-
-describe("parseBlueBubblesTarget", () => {
-  it("parses chat<digits> pattern as chat_identifier", () => {
-    expect(parseBlueBubblesTarget("chat660250192681427962")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "chat660250192681427962",
-    });
-    expect(parseBlueBubblesTarget("chat123")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "chat123",
-    });
-    expect(parseBlueBubblesTarget("Chat456789")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "Chat456789",
-    });
-  });
-
-  it("parses UUID/hex chat identifiers as chat_identifier", () => {
-    expect(parseBlueBubblesTarget("8b9c1a10536d4d86a336ea03ab7151cc")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "8b9c1a10536d4d86a336ea03ab7151cc",
-    });
-    expect(parseBlueBubblesTarget("1C2D3E4F-1234-5678-9ABC-DEF012345678")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "1C2D3E4F-1234-5678-9ABC-DEF012345678",
-    });
-  });
-
-  it("parses explicit chat_id: prefix", () => {
-    expect(parseBlueBubblesTarget("chat_id:123")).toEqual({ kind: "chat_id", chatId: 123 });
-  });
-
-  it("parses phone numbers as handles", () => {
-    expect(parseBlueBubblesTarget("+19257864429")).toEqual({
-      kind: "handle",
-      to: "+19257864429",
-      service: "auto",
-    });
-  });
-
-  it("parses raw chat_guid format", () => {
-    expect(parseBlueBubblesTarget("iMessage;+;chat660250192681427962")).toEqual({
-      kind: "chat_guid",
-      chatGuid: "iMessage;+;chat660250192681427962",
-    });
-  });
-});
-
-describe("parseBlueBubblesAllowTarget", () => {
-  it("parses chat<digits> pattern as chat_identifier", () => {
-    expect(parseBlueBubblesAllowTarget("chat660250192681427962")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "chat660250192681427962",
-    });
-    expect(parseBlueBubblesAllowTarget("chat123")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "chat123",
-    });
-  });
-
-  it("parses UUID/hex chat identifiers as chat_identifier", () => {
-    expect(parseBlueBubblesAllowTarget("8b9c1a10536d4d86a336ea03ab7151cc")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "8b9c1a10536d4d86a336ea03ab7151cc",
-    });
-    expect(parseBlueBubblesAllowTarget("1C2D3E4F-1234-5678-9ABC-DEF012345678")).toEqual({
-      kind: "chat_identifier",
-      chatIdentifier: "1C2D3E4F-1234-5678-9ABC-DEF012345678",
-    });
-  });
-
-  it("parses explicit chat_id: prefix", () => {
-    expect(parseBlueBubblesAllowTarget("chat_id:456")).toEqual({ kind: "chat_id", chatId: 456 });
-  });
-
-  it("parses phone numbers as handles", () => {
-    expect(parseBlueBubblesAllowTarget("+19257864429")).toEqual({
-      kind: "handle",
-      handle: "+19257864429",
-    });
-  });
-});

extensions/bluebubbles/src/targets.ts

@@ -20,41 +20,11 @@ const SERVICE_PREFIXES: Array<{ prefix: string; service: BlueBubblesService }> =
   { prefix: "sms:", service: "sms" },
   { prefix: "auto:", service: "auto" },
 ];
-const CHAT_IDENTIFIER_UUID_RE =
-  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-const CHAT_IDENTIFIER_HEX_RE = /^[0-9a-f]{24,64}$/i;
-
-function parseRawChatGuid(value: string): string | null {
-  const trimmed = value.trim();
-  if (!trimmed) return null;
-  const parts = trimmed.split(";");
-  if (parts.length !== 3) return null;
-  const service = parts[0]?.trim();
-  const separator = parts[1]?.trim();
-  const identifier = parts[2]?.trim();
-  if (!service || !identifier) return null;
-  if (separator !== "+" && separator !== "-") return null;
-  return `${service};${separator};${identifier}`;
-}
 
 function stripPrefix(value: string, prefix: string): string {
   return value.slice(prefix.length).trim();
 }
 
-function stripBlueBubblesPrefix(value: string): string {
-  const trimmed = value.trim();
-  if (!trimmed) return "";
-  if (!trimmed.toLowerCase().startsWith("bluebubbles:")) return trimmed;
-  return trimmed.slice("bluebubbles:".length).trim();
-}
-
-function looksLikeRawChatIdentifier(value: string): boolean {
-  const trimmed = value.trim();
-  if (!trimmed) return false;
-  if (/^chat\d+$/i.test(trimmed)) return true;
-  return CHAT_IDENTIFIER_UUID_RE.test(trimmed) || CHAT_IDENTIFIER_HEX_RE.test(trimmed);
-}
-
 export function normalizeBlueBubblesHandle(raw: string): string {
   const trimmed = raw.trim();
   if (!trimmed) return "";
@@ -66,83 +36,8 @@ export function normalizeBlueBubblesHandle(raw: string): string {
   return trimmed.replace(/\s+/g, "");
 }
 
-/**
- * Extracts the handle from a chat_guid if it's a DM (1:1 chat).
- * BlueBubbles chat_guid format for DM: "service;-;handle" (e.g., "iMessage;-;+19257864429")
- * Group chat format: "service;+;groupId" (has "+" instead of "-")
- */
-export function extractHandleFromChatGuid(chatGuid: string): string | null {
-  const parts = chatGuid.split(";");
-  // DM format: service;-;handle (3 parts, middle is "-")
-  if (parts.length === 3 && parts[1] === "-") {
-    const handle = parts[2]?.trim();
-    if (handle) return normalizeBlueBubblesHandle(handle);
-  }
-  return null;
-}
-
-export function normalizeBlueBubblesMessagingTarget(raw: string): string | undefined {
-  let trimmed = raw.trim();
-  if (!trimmed) return undefined;
-  trimmed = stripBlueBubblesPrefix(trimmed);
-  if (!trimmed) return undefined;
-  try {
-    const parsed = parseBlueBubblesTarget(trimmed);
-    if (parsed.kind === "chat_id") return `chat_id:${parsed.chatId}`;
-    if (parsed.kind === "chat_guid") {
-      // For DM chat_guids, normalize to just the handle for easier comparison.
-      // This allows "chat_guid:iMessage;-;+1234567890" to match "+1234567890".
-      const handle = extractHandleFromChatGuid(parsed.chatGuid);
-      if (handle) return handle;
-      // For group chats or unrecognized formats, keep the full chat_guid
-      return `chat_guid:${parsed.chatGuid}`;
-    }
-    if (parsed.kind === "chat_identifier") return `chat_identifier:${parsed.chatIdentifier}`;
-    const handle = normalizeBlueBubblesHandle(parsed.to);
-    if (!handle) return undefined;
-    return parsed.service === "auto" ? handle : `${parsed.service}:${handle}`;
-  } catch {
-    return trimmed;
-  }
-}
-
-export function looksLikeBlueBubblesTargetId(raw: string, normalized?: string): boolean {
-  const trimmed = raw.trim();
-  if (!trimmed) return false;
-  const candidate = stripBlueBubblesPrefix(trimmed);
-  if (!candidate) return false;
-  if (parseRawChatGuid(candidate)) return true;
-  const lowered = candidate.toLowerCase();
-  if (/^(imessage|sms|auto):/.test(lowered)) return true;
-  if (
-    /^(chat_id|chatid|chat|chat_guid|chatguid|guid|chat_identifier|chatidentifier|chatident|group):/.test(
-      lowered,
-    )
-  ) {
-    return true;
-  }
-  // Recognize chat<digits> patterns (e.g., "chat660250192681427962") as chat IDs
-  if (/^chat\d+$/i.test(candidate)) return true;
-  if (looksLikeRawChatIdentifier(candidate)) return true;
-  if (candidate.includes("@")) return true;
-  const digitsOnly = candidate.replace(/[\s().-]/g, "");
-  if (/^\+?\d{3,}$/.test(digitsOnly)) return true;
-  if (normalized) {
-    const normalizedTrimmed = normalized.trim();
-    if (!normalizedTrimmed) return false;
-    const normalizedLower = normalizedTrimmed.toLowerCase();
-    if (
-      /^(imessage|sms|auto):/.test(normalizedLower) ||
-      /^(chat_id|chat_guid|chat_identifier):/.test(normalizedLower)
-    ) {
-      return true;
-    }
-  }
-  return false;
-}
-
 export function parseBlueBubblesTarget(raw: string): BlueBubblesTarget {
-  const trimmed = stripBlueBubblesPrefix(raw);
+  const trimmed = raw.trim();
   if (!trimmed) throw new Error("BlueBubbles target is required");
   const lower = trimmed.toLowerCase();
 
@@ -200,22 +95,6 @@ export function parseBlueBubblesTarget(raw: string): BlueBubblesTarget {
     return { kind: "chat_guid", chatGuid: value };
   }
 
-  const rawChatGuid = parseRawChatGuid(trimmed);
-  if (rawChatGuid) {
-    return { kind: "chat_guid", chatGuid: rawChatGuid };
-  }
-
-  // Handle chat<digits> pattern (e.g., "chat660250192681427962") as chat_identifier
-  // These are BlueBubbles chat identifiers (the third part of a chat GUID), not numeric IDs
-  if (/^chat\d+$/i.test(trimmed)) {
-    return { kind: "chat_identifier", chatIdentifier: trimmed };
-  }
-
-  // Handle UUID/hex chat identifiers (e.g., "8b9c1a10536d4d86a336ea03ab7151cc")
-  if (looksLikeRawChatIdentifier(trimmed)) {
-    return { kind: "chat_identifier", chatIdentifier: trimmed };
-  }
-
   return { kind: "handle", to: trimmed, service: "auto" };
 }
 
@@ -261,17 +140,6 @@ export function parseBlueBubblesAllowTarget(raw: string): BlueBubblesAllowTarget
     if (value) return { kind: "chat_guid", chatGuid: value };
   }
 
-  // Handle chat<digits> pattern (e.g., "chat660250192681427962") as chat_identifier
-  // These are BlueBubbles chat identifiers (the third part of a chat GUID), not numeric IDs
-  if (/^chat\d+$/i.test(trimmed)) {
-    return { kind: "chat_identifier", chatIdentifier: trimmed };
-  }
-
-  // Handle UUID/hex chat identifiers (e.g., "8b9c1a10536d4d86a336ea03ab7151cc")
-  if (looksLikeRawChatIdentifier(trimmed)) {
-    return { kind: "chat_identifier", chatIdentifier: trimmed };
-  }
-
   return { kind: "handle", handle: normalizeBlueBubblesHandle(trimmed) };
 }
 

extensions/bluebubbles/src/types.ts

@@ -1,11 +1,6 @@
 export type DmPolicy = "pairing" | "allowlist" | "open" | "disabled";
 export type GroupPolicy = "open" | "disabled" | "allowlist";
 
-export type BlueBubblesGroupConfig = {
-  /** If true, only respond in this group when mentioned. */
-  requireMention?: boolean;
-};
-
 export type BlueBubblesAccountConfig = {
   /** Optional display name for this account (used in CLI/UI lists). */
   name?: string;
@@ -41,23 +36,10 @@ export type BlueBubblesAccountConfig = {
   blockStreamingCoalesce?: Record<string, unknown>;
   /** Max outbound media size in MB. */
   mediaMaxMb?: number;
-  /** Send read receipts for incoming messages (default: true). */
-  sendReadReceipts?: boolean;
-  /** Per-group configuration keyed by chat GUID or identifier. */
-  groups?: Record<string, BlueBubblesGroupConfig>;
 };
 
 export type BlueBubblesActionConfig = {
   reactions?: boolean;
-  edit?: boolean;
-  unsend?: boolean;
-  reply?: boolean;
-  sendWithEffect?: boolean;
-  renameGroup?: boolean;
-  addParticipant?: boolean;
-  removeParticipant?: boolean;
-  leaveGroup?: boolean;
-  sendAttachment?: boolean;
 };
 
 export type BlueBubblesConfig = {

extensions/copilot-proxy/clawdbot.plugin.json

@@ -1,11 +0,0 @@
-{
-  "id": "copilot-proxy",
-  "providers": [
-    "copilot-proxy"
-  ],
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

extensions/discord/clawdbot.plugin.json

@@ -1,11 +0,0 @@
-{
-  "id": "discord",
-  "channels": [
-    "discord"
-  ],
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

extensions/google-antigravity-auth/clawdbot.plugin.json

@@ -1,11 +0,0 @@
-{
-  "id": "google-antigravity-auth",
-  "providers": [
-    "google-antigravity"
-  ],
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

extensions/google-gemini-cli-auth/clawdbot.plugin.json

@@ -1,11 +0,0 @@
-{
-  "id": "google-gemini-cli-auth",
-  "providers": [
-    "google-gemini-cli"
-  ],
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

extensions/imessage/clawdbot.plugin.json

@@ -1,11 +0,0 @@
-{
-  "id": "imessage",
-  "channels": [
-    "imessage"
-  ],
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

extensions/matrix/clawdbot.plugin.json

@@ -1,11 +0,0 @@
-{
-  "id": "matrix",
-  "channels": [
-    "matrix"
-  ],
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

extensions/matrix/package.json

@@ -6,28 +6,11 @@
   "clawdbot": {
     "extensions": [
       "./index.ts"
-    ],
-    "channel": {
-      "id": "matrix",
-      "label": "Matrix",
-      "selectionLabel": "Matrix (plugin)",
-      "docsPath": "/channels/matrix",
-      "docsLabel": "matrix",
-      "blurb": "open protocol; install the plugin to enable.",
-      "order": 70,
-      "quickstartAllowFrom": true
-    },
-    "install": {
-      "npmSpec": "@clawdbot/matrix",
-      "localPath": "extensions/matrix",
-      "defaultChoice": "npm"
-    }
+    ]
   },
   "dependencies": {
-    "@matrix-org/matrix-sdk-crypto-nodejs": "^0.4.0",
     "clawdbot": "workspace:*",
     "markdown-it": "14.1.0",
-    "matrix-bot-sdk": "0.8.0",
-    "music-metadata": "^11.10.6"
+    "matrix-js-sdk": "40.0.0"
   }
 }

extensions/matrix/src/channel.directory.test.ts

@@ -1,3 +1,4 @@
+import os from "node:os";
 import { beforeEach, describe, expect, it } from "vitest";
 
 import type { PluginRuntime } from "clawdbot/plugin-sdk";
@@ -10,7 +11,7 @@ describe("matrix directory", () => {
   beforeEach(() => {
     setMatrixRuntime({
       state: {
-        resolveStateDir: (_env, homeDir) => homeDir(),
+        resolveStateDir: () => os.tmpdir(),
       },
     } as PluginRuntime);
   });
@@ -20,8 +21,7 @@ describe("matrix directory", () => {
       channels: {
         matrix: {
           dm: { allowFrom: ["matrix:@alice:example.org", "bob"] },
-          groupAllowFrom: ["@dana:example.org"],
-          groups: {
+          rooms: {
             "!room1:example.org": { users: ["@carol:example.org"] },
             "#alias:example.org": { users: [] },
           },
@@ -40,7 +40,6 @@ describe("matrix directory", () => {
         { kind: "user", id: "user:@alice:example.org" },
         { kind: "user", id: "bob", name: "incomplete id; expected @user:server" },
         { kind: "user", id: "user:@carol:example.org" },
-        { kind: "user", id: "user:@dana:example.org" },
       ]),
     );
 

extensions/matrix/src/channel.ts

@@ -46,12 +46,10 @@ const meta = {
 function normalizeMatrixMessagingTarget(raw: string): string | undefined {
   let normalized = raw.trim();
   if (!normalized) return undefined;
-  const lowered = normalized.toLowerCase();
-  if (lowered.startsWith("matrix:")) {
+  if (normalized.toLowerCase().startsWith("matrix:")) {
     normalized = normalized.slice("matrix:".length).trim();
   }
-  const stripped = normalized.replace(/^(room|channel|user):/i, "").trim();
-  return stripped || undefined;
+  return normalized ? normalized.toLowerCase() : undefined;
 }
 
 function buildMatrixConfigUpdate(
@@ -157,11 +155,10 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
     }),
     collectWarnings: ({ account, cfg }) => {
       const defaultGroupPolicy = (cfg as CoreConfig).channels?.defaults?.groupPolicy;
-      const groupPolicy =
-        account.config.groupPolicy ?? defaultGroupPolicy ?? "allowlist";
+      const groupPolicy = account.config.groupPolicy ?? defaultGroupPolicy ?? "allowlist";
       if (groupPolicy !== "open") return [];
       return [
-        "- Matrix rooms: groupPolicy=\"open\" allows any room to trigger (mention-gated). Set channels.matrix.groupPolicy=\"allowlist\" + channels.matrix.groups (and optionally channels.matrix.groupAllowFrom) to restrict rooms.",
+        "- Matrix rooms: groupPolicy=\"open\" allows any room to trigger (mention-gated). Set channels.matrix.groupPolicy=\"allowlist\" + channels.matrix.rooms to restrict rooms.",
       ];
     },
   },
@@ -171,17 +168,6 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
   threading: {
     resolveReplyToMode: ({ cfg }) =>
       (cfg as CoreConfig).channels?.matrix?.replyToMode ?? "off",
-    buildToolContext: ({ context, hasRepliedRef }) => {
-      const currentTarget = context.To;
-      return {
-        currentChannelId: currentTarget?.trim() || undefined,
-        currentThreadTs:
-          context.MessageThreadId != null
-            ? String(context.MessageThreadId)
-            : context.ReplyToId,
-        hasRepliedRef,
-      };
-    },
   },
   messaging: {
     normalizeTarget: normalizeMatrixMessagingTarget,
@@ -208,14 +194,7 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
         ids.add(raw.replace(/^matrix:/i, ""));
       }
 
-      for (const entry of account.config.groupAllowFrom ?? []) {
-        const raw = String(entry).trim();
-        if (!raw || raw === "*") continue;
-        ids.add(raw.replace(/^matrix:/i, ""));
-      }
-
-      const groups = account.config.groups ?? account.config.rooms ?? {};
-      for (const room of Object.values(groups)) {
+      for (const room of Object.values(account.config.rooms ?? {})) {
         for (const entry of room.users ?? []) {
           const raw = String(entry).trim();
           if (!raw || raw === "*") continue;
@@ -247,8 +226,7 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
     listGroups: async ({ cfg, accountId, query, limit }) => {
       const account = resolveMatrixAccount({ cfg: cfg as CoreConfig, accountId });
       const q = query?.trim().toLowerCase() || "";
-      const groups = account.config.groups ?? account.config.rooms ?? {};
-      const ids = Object.keys(groups)
+      const ids = Object.keys(account.config.rooms ?? {})
         .map((raw) => raw.trim())
         .filter((raw) => Boolean(raw) && raw !== "*")
         .map((raw) => raw.replace(/^matrix:/i, ""))
@@ -285,16 +263,10 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
     validateInput: ({ input }) => {
       if (input.useEnv) return null;
       if (!input.homeserver?.trim()) return "Matrix requires --homeserver";
-      const accessToken = input.accessToken?.trim();
-      const password = input.password?.trim();
-      const userId = input.userId?.trim();
-      if (!accessToken && !password) {
+      if (!input.userId?.trim()) return "Matrix requires --user-id";
+      if (!input.accessToken?.trim() && !input.password?.trim()) {
         return "Matrix requires --access-token or --password";
       }
-      if (!accessToken) {
-        if (!userId) return "Matrix requires --user-id when using --password";
-        if (!password) return "Matrix requires --password when using --user-id";
-      }
       return null;
     },
     applyAccountConfig: ({ cfg, input }) => {
@@ -409,7 +381,6 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
         mediaMaxMb: account.config.mediaMaxMb,
         initialSyncLimit: account.config.initialSyncLimit,
         replyToMode: account.config.replyToMode,
-        accountId: account.accountId,
       });
     },
   },

extensions/matrix/src/config-schema.ts

@@ -41,7 +41,6 @@ export const MatrixConfigSchema = z.object({
   password: z.string().optional(),
   deviceName: z.string().optional(),
   initialSyncLimit: z.number().optional(),
-  encryption: z.boolean().optional(),
   allowlistOnly: z.boolean().optional(),
   groupPolicy: z.enum(["open", "disabled", "allowlist"]).optional(),
   replyToMode: z.enum(["off", "first", "all"]).optional(),
@@ -50,9 +49,7 @@ export const MatrixConfigSchema = z.object({
   mediaMaxMb: z.number().optional(),
   autoJoin: z.enum(["always", "allowlist", "off"]).optional(),
   autoJoinAllowlist: z.array(allowFromEntry).optional(),
-  groupAllowFrom: z.array(allowFromEntry).optional(),
   dm: matrixDmSchema,
-  groups: z.object({}).catchall(matrixRoomSchema).optional(),
   rooms: z.object({}).catchall(matrixRoomSchema).optional(),
   actions: matrixActionSchema,
 });

extensions/matrix/src/group-mentions.ts

@@ -20,7 +20,7 @@ export function resolveMatrixGroupRequireMention(params: ChannelGroupContext): b
   const aliases = groupChannel ? [groupChannel] : [];
   const cfg = params.cfg as CoreConfig;
   const resolved = resolveMatrixRoomConfig({
-    rooms: cfg.channels?.matrix?.groups ?? cfg.channels?.matrix?.rooms,
+    rooms: cfg.channels?.matrix?.rooms,
     roomId,
     aliases,
     name: groupChannel || undefined,

extensions/matrix/src/matrix/accounts.test.ts

@@ -1,83 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import type { CoreConfig } from "../types.js";
-import { resolveMatrixAccount } from "./accounts.js";
-
-vi.mock("./credentials.js", () => ({
-  loadMatrixCredentials: () => null,
-  credentialsMatchConfig: () => false,
-}));
-
-const envKeys = [
-  "MATRIX_HOMESERVER",
-  "MATRIX_USER_ID",
-  "MATRIX_ACCESS_TOKEN",
-  "MATRIX_PASSWORD",
-  "MATRIX_DEVICE_NAME",
-];
-
-describe("resolveMatrixAccount", () => {
-  let prevEnv: Record<string, string | undefined> = {};
-
-  beforeEach(() => {
-    prevEnv = {};
-    for (const key of envKeys) {
-      prevEnv[key] = process.env[key];
-      delete process.env[key];
-    }
-  });
-
-  afterEach(() => {
-    for (const key of envKeys) {
-      const value = prevEnv[key];
-      if (value === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
-  });
-
-  it("treats access-token-only config as configured", () => {
-    const cfg: CoreConfig = {
-      channels: {
-        matrix: {
-          homeserver: "https://matrix.example.org",
-          accessToken: "tok-access",
-        },
-      },
-    };
-
-    const account = resolveMatrixAccount({ cfg });
-    expect(account.configured).toBe(true);
-  });
-
-  it("requires userId + password when no access token is set", () => {
-    const cfg: CoreConfig = {
-      channels: {
-        matrix: {
-          homeserver: "https://matrix.example.org",
-          userId: "@bot:example.org",
-        },
-      },
-    };
-
-    const account = resolveMatrixAccount({ cfg });
-    expect(account.configured).toBe(false);
-  });
-
-  it("marks password auth as configured when userId is present", () => {
-    const cfg: CoreConfig = {
-      channels: {
-        matrix: {
-          homeserver: "https://matrix.example.org",
-          userId: "@bot:example.org",
-          password: "secret",
-        },
-      },
-    };
-
-    const account = resolveMatrixAccount({ cfg });
-    expect(account.configured).toBe(true);
-  });
-});

extensions/matrix/src/matrix/accounts.ts

@@ -31,20 +31,18 @@ export function resolveMatrixAccount(params: {
   const base = (params.cfg.channels?.matrix ?? {}) as MatrixConfig;
   const enabled = base.enabled !== false;
   const resolved = resolveMatrixConfig(params.cfg, process.env);
-  const hasHomeserver = Boolean(resolved.homeserver);
-  const hasUserId = Boolean(resolved.userId);
-  const hasAccessToken = Boolean(resolved.accessToken);
-  const hasPassword = Boolean(resolved.password);
-  const hasPasswordAuth = hasUserId && hasPassword;
+  const hasCore = Boolean(resolved.homeserver && resolved.userId);
+  const hasToken = Boolean(resolved.accessToken || resolved.password);
   const stored = loadMatrixCredentials(process.env);
   const hasStored =
-    stored && resolved.homeserver
-      ? credentialsMatchConfig(stored, {
-          homeserver: resolved.homeserver,
-          userId: resolved.userId || "",
-        })
-      : false;
-  const configured = hasHomeserver && (hasAccessToken || hasPasswordAuth || Boolean(hasStored));
+    stored &&
+    resolved.homeserver &&
+    resolved.userId &&
+    credentialsMatchConfig(stored, {
+      homeserver: resolved.homeserver,
+      userId: resolved.userId,
+    });
+  const configured = hasCore && (hasToken || Boolean(hasStored));
   return {
     accountId,
     enabled,

extensions/matrix/src/matrix/actions.ts

@@ -1,4 +1,19 @@
-import type { MatrixClient } from "matrix-bot-sdk";
+import type { MatrixClient, MatrixEvent } from "matrix-js-sdk";
+import {
+  Direction,
+  EventType,
+  MatrixError,
+  MsgType,
+  RelationType,
+} from "matrix-js-sdk";
+import type {
+  ReactionEventContent,
+  RoomMessageEventContent,
+} from "matrix-js-sdk/lib/@types/events.js";
+import type {
+  RoomPinnedEventsEventContent,
+  RoomTopicEventContent,
+} from "matrix-js-sdk/lib/@types/state_events.js";
 
 import { getMatrixRuntime } from "../runtime.js";
 import type { CoreConfig } from "../types.js";
@@ -8,6 +23,7 @@ import {
   isBunRuntime,
   resolveMatrixAuth,
   resolveSharedMatrixClient,
+  waitForMatrixSync,
 } from "./client.js";
 import {
   reactMatrixMessage,
@@ -15,62 +31,6 @@ import {
   sendMessageMatrix,
 } from "./send.js";
 
-// Constants that were previously from matrix-js-sdk
-const MsgType = {
-  Text: "m.text",
-} as const;
-
-const RelationType = {
-  Replace: "m.replace",
-  Annotation: "m.annotation",
-} as const;
-
-const EventType = {
-  RoomMessage: "m.room.message",
-  RoomPinnedEvents: "m.room.pinned_events",
-  RoomTopic: "m.room.topic",
-  Reaction: "m.reaction",
-} as const;
-
-// Type definitions for matrix-bot-sdk event content
-type RoomMessageEventContent = {
-  msgtype: string;
-  body: string;
-  "m.new_content"?: RoomMessageEventContent;
-  "m.relates_to"?: {
-    rel_type?: string;
-    event_id?: string;
-    "m.in_reply_to"?: { event_id?: string };
-  };
-};
-
-type ReactionEventContent = {
-  "m.relates_to": {
-    rel_type: string;
-    event_id: string;
-    key: string;
-  };
-};
-
-type RoomPinnedEventsEventContent = {
-  pinned: string[];
-};
-
-type RoomTopicEventContent = {
-  topic?: string;
-};
-
-type MatrixRawEvent = {
-  event_id: string;
-  sender: string;
-  type: string;
-  origin_server_ts: number;
-  content: Record<string, unknown>;
-  unsigned?: {
-    redacted_because?: unknown;
-  };
-};
-
 export type MatrixActionClientOpts = {
   client?: MatrixClient;
   timeoutMs?: number;
@@ -126,23 +86,19 @@ async function resolveActionClient(opts: MatrixActionClientOpts = {}): Promise<M
     homeserver: auth.homeserver,
     userId: auth.userId,
     accessToken: auth.accessToken,
-    encryption: auth.encryption,
     localTimeoutMs: opts.timeoutMs,
   });
-  if (auth.encryption && client.crypto) {
-    try {
-      const joinedRooms = await client.getJoinedRooms();
-      await client.crypto.prepare(joinedRooms);
-    } catch {
-      // Ignore crypto prep failures for one-off actions.
-    }
-  }
-  await client.start();
+  await client.startClient({
+    initialSyncLimit: 0,
+    lazyLoadMembers: true,
+    threadSupport: true,
+  });
+  await waitForMatrixSync({ client, timeoutMs: opts.timeoutMs });
   return { client, stopOnDone: true };
 }
 
-function summarizeMatrixRawEvent(event: MatrixRawEvent): MatrixMessageSummary {
-  const content = event.content as RoomMessageEventContent;
+function summarizeMatrixEvent(event: MatrixEvent): MatrixMessageSummary {
+  const content = event.getContent<RoomMessageEventContent>();
   const relates = content["m.relates_to"];
   let relType: string | undefined;
   let eventId: string | undefined;
@@ -162,28 +118,27 @@ function summarizeMatrixRawEvent(event: MatrixRawEvent): MatrixMessageSummary {
         }
       : undefined;
   return {
-    eventId: event.event_id,
-    sender: event.sender,
+    eventId: event.getId() ?? undefined,
+    sender: event.getSender() ?? undefined,
     body: content.body,
     msgtype: content.msgtype,
-    timestamp: event.origin_server_ts,
+    timestamp: event.getTs() ?? undefined,
     relatesTo,
   };
 }
 
 async function readPinnedEvents(client: MatrixClient, roomId: string): Promise<string[]> {
   try {
-    const content = (await client.getRoomStateEvent(
+    const content = (await client.getStateEvent(
       roomId,
       EventType.RoomPinnedEvents,
       "",
     )) as RoomPinnedEventsEventContent;
     const pinned = content.pinned;
     return pinned.filter((id) => id.trim().length > 0);
-  } catch (err: unknown) {
-    const errObj = err as { statusCode?: number; body?: { errcode?: string } };
-    const httpStatus = errObj.statusCode;
-    const errcode = errObj.body?.errcode;
+  } catch (err) {
+    const httpStatus = err instanceof MatrixError ? err.httpStatus : undefined;
+    const errcode = err instanceof MatrixError ? err.errcode : undefined;
     if (httpStatus === 404 || errcode === "M_NOT_FOUND") {
       return [];
     }
@@ -196,14 +151,11 @@ async function fetchEventSummary(
   roomId: string,
   eventId: string,
 ): Promise<MatrixMessageSummary | null> {
-  try {
-    const raw = await client.getEvent(roomId, eventId) as MatrixRawEvent;
-    if (raw.unsigned?.redacted_because) return null;
-    return summarizeMatrixRawEvent(raw);
-  } catch (err) {
-    // Event not found, redacted, or inaccessible - return null
-    return null;
-  }
+  const raw = await client.fetchRoomEvent(roomId, eventId);
+  const mapper = client.getEventMapper();
+  const event = mapper(raw);
+  if (event.isRedacted()) return null;
+  return summarizeMatrixEvent(event);
 }
 
 export async function sendMatrixMessage(
@@ -248,10 +200,10 @@ export async function editMatrixMessage(
         event_id: messageId,
       },
     };
-    const eventId = await client.sendMessage(resolvedRoom, payload);
-    return { eventId: eventId ?? null };
+    const response = await client.sendMessage(resolvedRoom, payload);
+    return { eventId: response.event_id ?? null };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -263,9 +215,11 @@ export async function deleteMatrixMessage(
   const { client, stopOnDone } = await resolveActionClient(opts);
   try {
     const resolvedRoom = await resolveMatrixRoomId(client, roomId);
-    await client.redactEvent(resolvedRoom, messageId, opts.reason);
+    await client.redactEvent(resolvedRoom, messageId, undefined, {
+      reason: opts.reason,
+    });
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -288,25 +242,22 @@ export async function readMatrixMessages(
       typeof opts.limit === "number" && Number.isFinite(opts.limit)
         ? Math.max(1, Math.floor(opts.limit))
         : 20;
-    const token = opts.before?.trim() || opts.after?.trim() || undefined;
-    const dir = opts.after ? "f" : "b";
-    // matrix-bot-sdk uses doRequest for room messages
-    const res = await client.doRequest("GET", `/_matrix/client/v3/rooms/${encodeURIComponent(resolvedRoom)}/messages`, {
-      dir,
-      limit,
-      from: token,
-    }) as { chunk: MatrixRawEvent[]; start?: string; end?: string };
-    const messages = res.chunk
-      .filter((event) => event.type === EventType.RoomMessage)
-      .filter((event) => !event.unsigned?.redacted_because)
-      .map(summarizeMatrixRawEvent);
+    const token = opts.before?.trim() || opts.after?.trim() || null;
+    const dir = opts.after ? Direction.Forward : Direction.Backward;
+    const res = await client.createMessagesRequest(resolvedRoom, token, limit, dir);
+    const mapper = client.getEventMapper();
+    const events = res.chunk.map(mapper);
+    const messages = events
+      .filter((event) => event.getType() === EventType.RoomMessage)
+      .filter((event) => !event.isRedacted())
+      .map(summarizeMatrixEvent);
     return {
       messages,
       nextBatch: res.end ?? null,
       prevBatch: res.start ?? null,
     };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -322,18 +273,19 @@ export async function listMatrixReactions(
       typeof opts.limit === "number" && Number.isFinite(opts.limit)
         ? Math.max(1, Math.floor(opts.limit))
         : 100;
-    // matrix-bot-sdk uses doRequest for relations
-    const res = await client.doRequest(
-      "GET",
-      `/_matrix/client/v1/rooms/${encodeURIComponent(resolvedRoom)}/relations/${encodeURIComponent(messageId)}/${RelationType.Annotation}/${EventType.Reaction}`,
-      { dir: "b", limit },
-    ) as { chunk: MatrixRawEvent[] };
+    const res = await client.relations(
+      resolvedRoom,
+      messageId,
+      RelationType.Annotation,
+      EventType.Reaction,
+      { dir: Direction.Backward, limit },
+    );
     const summaries = new Map<string, MatrixReactionSummary>();
-    for (const event of res.chunk) {
-      const content = event.content as ReactionEventContent;
-      const key = content["m.relates_to"]?.key;
+    for (const event of res.events) {
+      const content = event.getContent<ReactionEventContent>();
+      const key = content["m.relates_to"].key;
       if (!key) continue;
-      const sender = event.sender ?? "";
+      const sender = event.getSender() ?? "";
       const entry: MatrixReactionSummary = summaries.get(key) ?? {
         key,
         count: 0,
@@ -347,7 +299,7 @@ export async function listMatrixReactions(
     }
     return Array.from(summaries.values());
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -359,28 +311,30 @@ export async function removeMatrixReactions(
   const { client, stopOnDone } = await resolveActionClient(opts);
   try {
     const resolvedRoom = await resolveMatrixRoomId(client, roomId);
-    const res = await client.doRequest(
-      "GET",
-      `/_matrix/client/v1/rooms/${encodeURIComponent(resolvedRoom)}/relations/${encodeURIComponent(messageId)}/${RelationType.Annotation}/${EventType.Reaction}`,
-      { dir: "b", limit: 200 },
-    ) as { chunk: MatrixRawEvent[] };
-    const userId = await client.getUserId();
+    const res = await client.relations(
+      resolvedRoom,
+      messageId,
+      RelationType.Annotation,
+      EventType.Reaction,
+      { dir: Direction.Backward, limit: 200 },
+    );
+    const userId = client.getUserId();
     if (!userId) return { removed: 0 };
     const targetEmoji = opts.emoji?.trim();
-    const toRemove = res.chunk
-      .filter((event) => event.sender === userId)
+    const toRemove = res.events
+      .filter((event) => event.getSender() === userId)
       .filter((event) => {
         if (!targetEmoji) return true;
-        const content = event.content as ReactionEventContent;
-        return content["m.relates_to"]?.key === targetEmoji;
+        const content = event.getContent<ReactionEventContent>();
+        return content["m.relates_to"].key === targetEmoji;
       })
-      .map((event) => event.event_id)
+      .map((event) => event.getId())
       .filter((id): id is string => Boolean(id));
     if (toRemove.length === 0) return { removed: 0 };
     await Promise.all(toRemove.map((id) => client.redactEvent(resolvedRoom, id)));
     return { removed: toRemove.length };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -395,10 +349,10 @@ export async function pinMatrixMessage(
     const current = await readPinnedEvents(client, resolvedRoom);
     const next = current.includes(messageId) ? current : [...current, messageId];
     const payload: RoomPinnedEventsEventContent = { pinned: next };
-    await client.sendStateEvent(resolvedRoom, EventType.RoomPinnedEvents, "", payload);
+    await client.sendStateEvent(resolvedRoom, EventType.RoomPinnedEvents, payload);
     return { pinned: next };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -413,10 +367,10 @@ export async function unpinMatrixMessage(
     const current = await readPinnedEvents(client, resolvedRoom);
     const next = current.filter((id) => id !== messageId);
     const payload: RoomPinnedEventsEventContent = { pinned: next };
-    await client.sendStateEvent(resolvedRoom, EventType.RoomPinnedEvents, "", payload);
+    await client.sendStateEvent(resolvedRoom, EventType.RoomPinnedEvents, payload);
     return { pinned: next };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -441,7 +395,7 @@ export async function listMatrixPins(
     ).filter((event): event is MatrixMessageSummary => Boolean(event));
     return { pinned, events };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -452,23 +406,20 @@ export async function getMatrixMemberInfo(
   const { client, stopOnDone } = await resolveActionClient(opts);
   try {
     const roomId = opts.roomId ? await resolveMatrixRoomId(client, opts.roomId) : undefined;
-    // matrix-bot-sdk uses getUserProfile
-    const profile = await client.getUserProfile(userId);
-    // Note: matrix-bot-sdk doesn't have getRoom().getMember() like matrix-js-sdk
-    // We'd need to fetch room state separately if needed
+    const profile = await client.getProfileInfo(userId);
+    const member = roomId ? client.getRoom(roomId)?.getMember(userId) : undefined;
     return {
       userId,
       profile: {
         displayName: profile?.displayname ?? null,
         avatarUrl: profile?.avatar_url ?? null,
       },
-      membership: null, // Would need separate room state query
-      powerLevel: null, // Would need separate power levels state query
-      displayName: profile?.displayname ?? null,
-      roomId: roomId ?? null,
+      membership: member?.membership ?? null,
+      powerLevel: member?.powerLevel ?? null,
+      displayName: member?.name ?? null,
     };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 
@@ -476,42 +427,20 @@ export async function getMatrixRoomInfo(roomId: string, opts: MatrixActionClient
   const { client, stopOnDone } = await resolveActionClient(opts);
   try {
     const resolvedRoom = await resolveMatrixRoomId(client, roomId);
-    // matrix-bot-sdk uses getRoomState for state events
-    let name: string | null = null;
-    let topic: string | null = null;
-    let canonicalAlias: string | null = null;
-    let memberCount: number | null = null;
-    
-    try {
-      const nameState = await client.getRoomStateEvent(resolvedRoom, "m.room.name", "");
-      name = nameState?.name ?? null;
-    } catch { /* ignore */ }
-    
-    try {
-      const topicState = await client.getRoomStateEvent(resolvedRoom, EventType.RoomTopic, "");
-      topic = topicState?.topic ?? null;
-    } catch { /* ignore */ }
-    
-    try {
-      const aliasState = await client.getRoomStateEvent(resolvedRoom, "m.room.canonical_alias", "");
-      canonicalAlias = aliasState?.alias ?? null;
-    } catch { /* ignore */ }
-    
-    try {
-      const members = await client.getJoinedRoomMembers(resolvedRoom);
-      memberCount = members.length;
-    } catch { /* ignore */ }
-    
+    const room = client.getRoom(resolvedRoom);
+    const topicEvent = room?.currentState.getStateEvents(EventType.RoomTopic, "");
+    const topicContent = topicEvent?.getContent<RoomTopicEventContent>();
+    const topic = typeof topicContent?.topic === "string" ? topicContent.topic : undefined;
     return {
       roomId: resolvedRoom,
-      name,
-      topic,
-      canonicalAlias,
-      altAliases: [], // Would need separate query
-      memberCount,
+      name: room?.name ?? null,
+      topic: topic ?? null,
+      canonicalAlias: room?.getCanonicalAlias?.() ?? null,
+      altAliases: room?.getAltAliases?.() ?? [],
+      memberCount: room?.getJoinedMemberCount?.() ?? null,
     };
   } finally {
-    if (stopOnDone) client.stop();
+    if (stopOnDone) client.stopClient();
   }
 }
 

extensions/matrix/src/matrix/active-client.ts

@@ -1,4 +1,4 @@
-import type { MatrixClient } from "matrix-bot-sdk";
+import type { MatrixClient } from "matrix-js-sdk";
 
 let activeClient: MatrixClient | null = null;
 

extensions/matrix/src/matrix/client.test.ts

@@ -32,7 +32,6 @@ describe("resolveMatrixConfig", () => {
       password: "cfg-pass",
       deviceName: "CfgDevice",
       initialSyncLimit: 5,
-      encryption: false,
     });
   });
 
@@ -52,6 +51,5 @@ describe("resolveMatrixConfig", () => {
     expect(resolved.password).toBe("env-pass");
     expect(resolved.deviceName).toBe("EnvDevice");
     expect(resolved.initialSyncLimit).toBeUndefined();
-    expect(resolved.encryption).toBe(false);
   });
 });

extensions/matrix/src/matrix/client.ts

@@ -1,16 +1,4 @@
-import crypto from "node:crypto";
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
-
-import {
-  ConsoleLogger,
-  LogService,
-  MatrixClient,
-  SimpleFsStorageProvider,
-  RustSdkCryptoStorageProvider,
-} from "matrix-bot-sdk";
-import type { IStorageProvider, ICryptoStorageProvider } from "matrix-bot-sdk";
+import { ClientEvent, type MatrixClient, SyncState } from "matrix-js-sdk";
 
 import type { CoreConfig } from "../types.js";
 import { getMatrixRuntime } from "../runtime.js";
@@ -22,30 +10,22 @@ export type MatrixResolvedConfig = {
   password?: string;
   deviceName?: string;
   initialSyncLimit?: number;
-  encryption?: boolean;
 };
 
-/**
- * Authenticated Matrix configuration.
- * Note: deviceId is NOT included here because it's implicit in the accessToken.
- * The crypto storage assumes the device ID (and thus access token) does not change
- * between restarts. If the access token becomes invalid or crypto storage is lost,
- * both will need to be recreated together.
- */
 export type MatrixAuth = {
   homeserver: string;
   userId: string;
   accessToken: string;
   deviceName?: string;
   initialSyncLimit?: number;
-  encryption?: boolean;
 };
 
+type MatrixSdk = typeof import("matrix-js-sdk");
+
 type SharedMatrixClientState = {
   client: MatrixClient;
   key: string;
   started: boolean;
-  cryptoReady: boolean;
 };
 
 let sharedClientState: SharedMatrixClientState | null = null;
@@ -57,198 +37,14 @@ export function isBunRuntime(): boolean {
   return typeof versions.bun === "string";
 }
 
-let matrixSdkLoggingConfigured = false;
-const matrixSdkBaseLogger = new ConsoleLogger();
-
-function shouldSuppressMatrixHttpNotFound(
-  module: string,
-  messageOrObject: unknown[],
-): boolean {
-  if (module !== "MatrixHttpClient") return false;
-  return messageOrObject.some((entry) => {
-    if (!entry || typeof entry !== "object") return false;
-    return (entry as { errcode?: string }).errcode === "M_NOT_FOUND";
-  });
-}
-
-function ensureMatrixSdkLoggingConfigured(): void {
-  if (matrixSdkLoggingConfigured) return;
-  matrixSdkLoggingConfigured = true;
-
-  LogService.setLogger({
-    trace: (module, ...messageOrObject) =>
-      matrixSdkBaseLogger.trace(module, ...messageOrObject),
-    debug: (module, ...messageOrObject) =>
-      matrixSdkBaseLogger.debug(module, ...messageOrObject),
-    info: (module, ...messageOrObject) =>
-      matrixSdkBaseLogger.info(module, ...messageOrObject),
-    warn: (module, ...messageOrObject) =>
-      matrixSdkBaseLogger.warn(module, ...messageOrObject),
-    error: (module, ...messageOrObject) => {
-      if (shouldSuppressMatrixHttpNotFound(module, messageOrObject)) return;
-      matrixSdkBaseLogger.error(module, ...messageOrObject);
-    },
-  });
+async function loadMatrixSdk(): Promise<MatrixSdk> {
+  return (await import("matrix-js-sdk")) as MatrixSdk;
 }
 
 function clean(value?: string): string {
   return value?.trim() ?? "";
 }
 
-const DEFAULT_ACCOUNT_KEY = "default";
-const STORAGE_META_FILENAME = "storage-meta.json";
-
-type MatrixStoragePaths = {
-  rootDir: string;
-  storagePath: string;
-  cryptoPath: string;
-  metaPath: string;
-  accountKey: string;
-  tokenHash: string;
-};
-
-function sanitizePathSegment(value: string): string {
-  const cleaned = value
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9._-]+/g, "_")
-    .replace(/^_+|_+$/g, "");
-  return cleaned || "unknown";
-}
-
-function resolveHomeserverKey(homeserver: string): string {
-  try {
-    const url = new URL(homeserver);
-    if (url.host) return sanitizePathSegment(url.host);
-  } catch {
-    // fall through
-  }
-  return sanitizePathSegment(homeserver);
-}
-
-function hashAccessToken(accessToken: string): string {
-  return crypto.createHash("sha256").update(accessToken).digest("hex").slice(0, 16);
-}
-
-function resolveLegacyStoragePaths(env: NodeJS.ProcessEnv = process.env): {
-  storagePath: string;
-  cryptoPath: string;
-} {
-  const stateDir = getMatrixRuntime().state.resolveStateDir(env, os.homedir);
-  return {
-    storagePath: path.join(stateDir, "matrix", "bot-storage.json"),
-    cryptoPath: path.join(stateDir, "matrix", "crypto"),
-  };
-}
-
-function resolveMatrixStoragePaths(params: {
-  homeserver: string;
-  userId: string;
-  accessToken: string;
-  accountId?: string | null;
-  env?: NodeJS.ProcessEnv;
-}): MatrixStoragePaths {
-  const env = params.env ?? process.env;
-  const stateDir = getMatrixRuntime().state.resolveStateDir(env, os.homedir);
-  const accountKey = sanitizePathSegment(params.accountId ?? DEFAULT_ACCOUNT_KEY);
-  const userKey = sanitizePathSegment(params.userId);
-  const serverKey = resolveHomeserverKey(params.homeserver);
-  const tokenHash = hashAccessToken(params.accessToken);
-  const rootDir = path.join(
-    stateDir,
-    "matrix",
-    "accounts",
-    accountKey,
-    `${serverKey}__${userKey}`,
-    tokenHash,
-  );
-  return {
-    rootDir,
-    storagePath: path.join(rootDir, "bot-storage.json"),
-    cryptoPath: path.join(rootDir, "crypto"),
-    metaPath: path.join(rootDir, STORAGE_META_FILENAME),
-    accountKey,
-    tokenHash,
-  };
-}
-
-function maybeMigrateLegacyStorage(params: {
-  storagePaths: MatrixStoragePaths;
-  env?: NodeJS.ProcessEnv;
-}): void {
-  const legacy = resolveLegacyStoragePaths(params.env);
-  const hasLegacyStorage = fs.existsSync(legacy.storagePath);
-  const hasLegacyCrypto = fs.existsSync(legacy.cryptoPath);
-  const hasNewStorage =
-    fs.existsSync(params.storagePaths.storagePath) ||
-    fs.existsSync(params.storagePaths.cryptoPath);
-
-  if (!hasLegacyStorage && !hasLegacyCrypto) return;
-  if (hasNewStorage) return;
-
-  fs.mkdirSync(params.storagePaths.rootDir, { recursive: true });
-  if (hasLegacyStorage) {
-    try {
-      fs.renameSync(legacy.storagePath, params.storagePaths.storagePath);
-    } catch {
-      // Ignore migration failures; new store will be created.
-    }
-  }
-  if (hasLegacyCrypto) {
-    try {
-      fs.renameSync(legacy.cryptoPath, params.storagePaths.cryptoPath);
-    } catch {
-      // Ignore migration failures; new store will be created.
-    }
-  }
-}
-
-function writeStorageMeta(params: {
-  storagePaths: MatrixStoragePaths;
-  homeserver: string;
-  userId: string;
-  accountId?: string | null;
-}): void {
-  try {
-    const payload = {
-      homeserver: params.homeserver,
-      userId: params.userId,
-      accountId: params.accountId ?? DEFAULT_ACCOUNT_KEY,
-      accessTokenHash: params.storagePaths.tokenHash,
-      createdAt: new Date().toISOString(),
-    };
-    fs.mkdirSync(params.storagePaths.rootDir, { recursive: true });
-    fs.writeFileSync(
-      params.storagePaths.metaPath,
-      JSON.stringify(payload, null, 2),
-      "utf-8",
-    );
-  } catch {
-    // ignore meta write failures
-  }
-}
-
-function sanitizeUserIdList(input: unknown, label: string): string[] {
-  if (input == null) return [];
-  if (!Array.isArray(input)) {
-    LogService.warn(
-      "MatrixClientLite",
-      `Expected ${label} list to be an array, got ${typeof input}`,
-    );
-    return [];
-  }
-  const filtered = input.filter(
-    (entry): entry is string => typeof entry === "string" && entry.trim().length > 0,
-  );
-  if (filtered.length !== input.length) {
-    LogService.warn(
-      "MatrixClientLite",
-      `Dropping ${input.length - filtered.length} invalid ${label} entries from sync payload`,
-    );
-  }
-  return filtered;
-}
-
 export function resolveMatrixConfig(
   cfg: CoreConfig = getMatrixRuntime().config.loadConfig() as CoreConfig,
   env: NodeJS.ProcessEnv = process.env,
@@ -265,7 +61,6 @@ export function resolveMatrixConfig(
     typeof matrix.initialSyncLimit === "number"
       ? Math.max(0, Math.floor(matrix.initialSyncLimit))
       : undefined;
-  const encryption = matrix.encryption ?? false;
   return {
     homeserver,
     userId,
@@ -273,7 +68,6 @@ export function resolveMatrixConfig(
     password,
     deviceName,
     initialSyncLimit,
-    encryption,
   };
 }
 
@@ -287,6 +81,9 @@ export async function resolveMatrixAuth(params?: {
   if (!resolved.homeserver) {
     throw new Error("Matrix homeserver is required (matrix.homeserver)");
   }
+  if (!resolved.userId) {
+    throw new Error("Matrix userId is required (matrix.userId)");
+  }
 
   const {
     loadMatrixCredentials,
@@ -300,36 +97,21 @@ export async function resolveMatrixAuth(params?: {
     cached &&
     credentialsMatchConfig(cached, {
       homeserver: resolved.homeserver,
-      userId: resolved.userId || "",
+      userId: resolved.userId,
     })
       ? cached
       : null;
 
-  // If we have an access token, we can fetch userId via whoami if not provided
   if (resolved.accessToken) {
-    let userId = resolved.userId;
-    if (!userId) {
-      // Fetch userId from access token via whoami
-      ensureMatrixSdkLoggingConfigured();
-      const tempClient = new MatrixClient(resolved.homeserver, resolved.accessToken);
-      const whoami = await tempClient.getUserId();
-      userId = whoami;
-      // Save the credentials with the fetched userId
-      saveMatrixCredentials({
-        homeserver: resolved.homeserver,
-        userId,
-        accessToken: resolved.accessToken,
-      });
-    } else if (cachedCredentials && cachedCredentials.accessToken === resolved.accessToken) {
+    if (cachedCredentials && cachedCredentials.accessToken === resolved.accessToken) {
       touchMatrixCredentials(env);
     }
     return {
       homeserver: resolved.homeserver,
-      userId,
+      userId: resolved.userId,
       accessToken: resolved.accessToken,
       deviceName: resolved.deviceName,
       initialSyncLimit: resolved.initialSyncLimit,
-      encryption: resolved.encryption,
     };
   }
 
@@ -341,45 +123,25 @@ export async function resolveMatrixAuth(params?: {
       accessToken: cachedCredentials.accessToken,
       deviceName: resolved.deviceName,
       initialSyncLimit: resolved.initialSyncLimit,
-      encryption: resolved.encryption,
     };
   }
 
-  if (!resolved.userId) {
-    throw new Error(
-      "Matrix userId is required when no access token is configured (matrix.userId)",
-    );
-  }
-
   if (!resolved.password) {
     throw new Error(
-      "Matrix password is required when no access token is configured (matrix.password)",
+      "Matrix access token or password is required (matrix.accessToken or matrix.password)",
     );
   }
 
-  // Login with password using HTTP API
-  const loginResponse = await fetch(`${resolved.homeserver}/_matrix/client/v3/login`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({
-      type: "m.login.password",
-      identifier: { type: "m.id.user", user: resolved.userId },
-      password: resolved.password,
-      initial_device_display_name: resolved.deviceName ?? "Clawdbot Gateway",
-    }),
+  const sdk = await loadMatrixSdk();
+  const loginClient = sdk.createClient({
+    baseUrl: resolved.homeserver,
+  });
+  const login = await loginClient.loginRequest({
+    type: "m.login.password",
+    identifier: { type: "m.id.user", user: resolved.userId },
+    password: resolved.password,
+    initial_device_display_name: resolved.deviceName ?? "Clawdbot Gateway",
   });
-
-  if (!loginResponse.ok) {
-    const errorText = await loginResponse.text();
-    throw new Error(`Matrix login failed: ${errorText}`);
-  }
-
-  const login = (await loginResponse.json()) as {
-    access_token?: string;
-    user_id?: string;
-    device_id?: string;
-  };
-  
   const accessToken = login.access_token?.trim();
   if (!accessToken) {
     throw new Error("Matrix login did not return an access token");
@@ -391,14 +153,12 @@ export async function resolveMatrixAuth(params?: {
     accessToken,
     deviceName: resolved.deviceName,
     initialSyncLimit: resolved.initialSyncLimit,
-    encryption: resolved.encryption,
   };
 
   saveMatrixCredentials({
     homeserver: auth.homeserver,
     userId: auth.userId,
     accessToken: auth.accessToken,
-    deviceId: login.device_id,
   });
 
   return auth;
@@ -408,128 +168,40 @@ export async function createMatrixClient(params: {
   homeserver: string;
   userId: string;
   accessToken: string;
-  encryption?: boolean;
   localTimeoutMs?: number;
-  accountId?: string | null;
 }): Promise<MatrixClient> {
-  ensureMatrixSdkLoggingConfigured();
-  const env = process.env;
-
-  // Create storage provider
-  const storagePaths = resolveMatrixStoragePaths({
-    homeserver: params.homeserver,
+  const sdk = await loadMatrixSdk();
+  const store = new sdk.MemoryStore();
+  return sdk.createClient({
+    baseUrl: params.homeserver,
     userId: params.userId,
     accessToken: params.accessToken,
-    accountId: params.accountId,
-    env,
+    localTimeoutMs: params.localTimeoutMs,
+    store,
   });
-  maybeMigrateLegacyStorage({ storagePaths, env });
-  fs.mkdirSync(storagePaths.rootDir, { recursive: true });
-  const storage: IStorageProvider = new SimpleFsStorageProvider(storagePaths.storagePath);
-
-  // Create crypto storage if encryption is enabled
-  let cryptoStorage: ICryptoStorageProvider | undefined;
-  if (params.encryption) {
-    fs.mkdirSync(storagePaths.cryptoPath, { recursive: true });
-
-    try {
-      const { StoreType } = await import("@matrix-org/matrix-sdk-crypto-nodejs");
-      cryptoStorage = new RustSdkCryptoStorageProvider(
-        storagePaths.cryptoPath,
-        StoreType.Sqlite,
-      );
-    } catch (err) {
-      LogService.warn("MatrixClientLite", "Failed to initialize crypto storage, E2EE disabled:", err);
-    }
-  }
-
-  writeStorageMeta({
-    storagePaths,
-    homeserver: params.homeserver,
-    userId: params.userId,
-    accountId: params.accountId,
-  });
-
-  const client = new MatrixClient(
-    params.homeserver,
-    params.accessToken,
-    storage,
-    cryptoStorage,
-  );
-
-  if (client.crypto) {
-    const originalUpdateSyncData = client.crypto.updateSyncData.bind(client.crypto);
-    client.crypto.updateSyncData = async (
-      toDeviceMessages,
-      otkCounts,
-      unusedFallbackKeyAlgs,
-      changedDeviceLists,
-      leftDeviceLists,
-    ) => {
-      const safeChanged = sanitizeUserIdList(changedDeviceLists, "changed device list");
-      const safeLeft = sanitizeUserIdList(leftDeviceLists, "left device list");
-      try {
-        return await originalUpdateSyncData(
-          toDeviceMessages,
-          otkCounts,
-          unusedFallbackKeyAlgs,
-          safeChanged,
-          safeLeft,
-        );
-      } catch (err) {
-        const message = typeof err === "string" ? err : err instanceof Error ? err.message : "";
-        if (message.includes("Expect value to be String")) {
-          LogService.warn(
-            "MatrixClientLite",
-            "Ignoring malformed device list entries during crypto sync",
-            message,
-          );
-          return;
-        }
-        throw err;
-      }
-    };
-  }
-
-  return client;
 }
 
-function buildSharedClientKey(auth: MatrixAuth, accountId?: string | null): string {
-  return [
-    auth.homeserver,
-    auth.userId,
-    auth.accessToken,
-    auth.encryption ? "e2ee" : "plain",
-    accountId ?? DEFAULT_ACCOUNT_KEY,
-  ].join("|");
+function buildSharedClientKey(auth: MatrixAuth): string {
+  return [auth.homeserver, auth.userId, auth.accessToken].join("|");
 }
 
 async function createSharedMatrixClient(params: {
   auth: MatrixAuth;
   timeoutMs?: number;
-  accountId?: string | null;
 }): Promise<SharedMatrixClientState> {
   const client = await createMatrixClient({
     homeserver: params.auth.homeserver,
     userId: params.auth.userId,
     accessToken: params.auth.accessToken,
-    encryption: params.auth.encryption,
     localTimeoutMs: params.timeoutMs,
-    accountId: params.accountId,
   });
-  return {
-    client,
-    key: buildSharedClientKey(params.auth, params.accountId),
-    started: false,
-    cryptoReady: false,
-  };
+  return { client, key: buildSharedClientKey(params.auth), started: false };
 }
 
 async function ensureSharedClientStarted(params: {
   state: SharedMatrixClientState;
   timeoutMs?: number;
   initialSyncLimit?: number;
-  encryption?: boolean;
 }): Promise<void> {
   if (params.state.started) return;
   if (sharedClientStartPromise) {
@@ -537,22 +209,18 @@ async function ensureSharedClientStarted(params: {
     return;
   }
   sharedClientStartPromise = (async () => {
-    const client = params.state.client;
-    
-    // Initialize crypto if enabled
-    if (params.encryption && !params.state.cryptoReady) {
-      try {
-        const joinedRooms = await client.getJoinedRooms();
-        if (client.crypto) {
-          await client.crypto.prepare(joinedRooms);
-          params.state.cryptoReady = true;
-        }
-      } catch (err) {
-        LogService.warn("MatrixClientLite", "Failed to prepare crypto:", err);
-      }
+    const startOpts: Parameters<MatrixClient["startClient"]>[0] = {
+      lazyLoadMembers: true,
+      threadSupport: true,
+    };
+    if (typeof params.initialSyncLimit === "number") {
+      startOpts.initialSyncLimit = params.initialSyncLimit;
     }
-
-    await client.start();
+    await params.state.client.startClient(startOpts);
+    await waitForMatrixSync({
+      client: params.state.client,
+      timeoutMs: params.timeoutMs,
+    });
     params.state.started = true;
   })();
   try {
@@ -569,11 +237,10 @@ export async function resolveSharedMatrixClient(
     timeoutMs?: number;
     auth?: MatrixAuth;
     startClient?: boolean;
-    accountId?: string | null;
   } = {},
 ): Promise<MatrixClient> {
   const auth = params.auth ?? (await resolveMatrixAuth({ cfg: params.cfg, env: params.env }));
-  const key = buildSharedClientKey(auth, params.accountId);
+  const key = buildSharedClientKey(auth);
   const shouldStart = params.startClient !== false;
 
   if (sharedClientState?.key === key) {
@@ -582,7 +249,6 @@ export async function resolveSharedMatrixClient(
         state: sharedClientState,
         timeoutMs: params.timeoutMs,
         initialSyncLimit: auth.initialSyncLimit,
-        encryption: auth.encryption,
       });
     }
     return sharedClientState.client;
@@ -596,12 +262,11 @@ export async function resolveSharedMatrixClient(
           state: pending,
           timeoutMs: params.timeoutMs,
           initialSyncLimit: auth.initialSyncLimit,
-          encryption: auth.encryption,
         });
       }
       return pending.client;
     }
-    pending.client.stop();
+    pending.client.stopClient();
     sharedClientState = null;
     sharedClientPromise = null;
   }
@@ -609,7 +274,6 @@ export async function resolveSharedMatrixClient(
   sharedClientPromise = createSharedMatrixClient({
     auth,
     timeoutMs: params.timeoutMs,
-    accountId: params.accountId,
   });
   try {
     const created = await sharedClientPromise;
@@ -619,7 +283,6 @@ export async function resolveSharedMatrixClient(
         state: created,
         timeoutMs: params.timeoutMs,
         initialSyncLimit: auth.initialSyncLimit,
-        encryption: auth.encryption,
       });
     }
     return created.client;
@@ -628,18 +291,48 @@ export async function resolveSharedMatrixClient(
   }
 }
 
-export async function waitForMatrixSync(_params: {
+export async function waitForMatrixSync(params: {
   client: MatrixClient;
   timeoutMs?: number;
   abortSignal?: AbortSignal;
 }): Promise<void> {
-  // matrix-bot-sdk handles sync internally in start()
-  // This is kept for API compatibility but is essentially a no-op now
-}
-
-export function stopSharedClient(): void {
-  if (sharedClientState) {
-    sharedClientState.client.stop();
-    sharedClientState = null;
-  }
+  const timeoutMs = Math.max(1000, params.timeoutMs ?? 15_000);
+  if (params.client.getSyncState() === SyncState.Syncing) return;
+  await new Promise<void>((resolve, reject) => {
+    let done = false;
+    let timer: NodeJS.Timeout | undefined;
+    const cleanup = () => {
+      if (done) return;
+      done = true;
+      params.client.removeListener(ClientEvent.Sync, onSync);
+      if (params.abortSignal) {
+        params.abortSignal.removeEventListener("abort", onAbort);
+      }
+      if (timer) {
+        clearTimeout(timer);
+        timer = undefined;
+      }
+    };
+    const onSync = (state: SyncState) => {
+      if (done) return;
+      if (state === SyncState.Prepared || state === SyncState.Syncing) {
+        cleanup();
+        resolve();
+      }
+      if (state === SyncState.Error) {
+        cleanup();
+        reject(new Error("Matrix sync failed"));
+      }
+    };
+    const onAbort = () => {
+      cleanup();
+      reject(new Error("Matrix sync aborted"));
+    };
+    params.client.on(ClientEvent.Sync, onSync);
+    params.abortSignal?.addEventListener("abort", onAbort, { once: true });
+    timer = setTimeout(() => {
+      cleanup();
+      reject(new Error("Matrix sync timed out"));
+    }, timeoutMs);
+  });
 }

extensions/matrix/src/matrix/credentials.ts

@@ -8,7 +8,6 @@ export type MatrixStoredCredentials = {
   homeserver: string;
   userId: string;
   accessToken: string;
-  deviceId?: string;
   createdAt: string;
   lastUsedAt?: string;
 };
@@ -95,9 +94,5 @@ export function credentialsMatchConfig(
   stored: MatrixStoredCredentials,
   config: { homeserver: string; userId: string },
 ): boolean {
-  // If userId is empty (token-based auth), only match homeserver
-  if (!config.userId) {
-    return stored.homeserver === config.homeserver;
-  }
   return stored.homeserver === config.homeserver && stored.userId === config.userId;
 }

extensions/matrix/src/matrix/deps.ts

@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 import type { RuntimeEnv } from "clawdbot/plugin-sdk";
 import { getMatrixRuntime } from "../runtime.js";
 
-const MATRIX_SDK_PACKAGE = "matrix-bot-sdk";
+const MATRIX_SDK_PACKAGE = "matrix-js-sdk";
 
 export function isMatrixSdkAvailable(): boolean {
   try {
@@ -30,9 +30,9 @@ export async function ensureMatrixSdkInstalled(params: {
   if (isMatrixSdkAvailable()) return;
   const confirm = params.confirm;
   if (confirm) {
-    const ok = await confirm("Matrix requires matrix-bot-sdk. Install now?");
+    const ok = await confirm("Matrix requires matrix-js-sdk. Install now?");
     if (!ok) {
-      throw new Error("Matrix requires matrix-bot-sdk (install dependencies first).");
+      throw new Error("Matrix requires matrix-js-sdk (install dependencies first).");
     }
   }
 
@@ -52,6 +52,6 @@ export async function ensureMatrixSdkInstalled(params: {
     );
   }
   if (!isMatrixSdkAvailable()) {
-    throw new Error("Matrix dependency install completed but matrix-bot-sdk is still missing.");
+    throw new Error("Matrix dependency install completed but matrix-js-sdk is still missing.");
   }
 }

extensions/matrix/src/matrix/index.ts

@@ -3,7 +3,6 @@ export { probeMatrix } from "./probe.js";
 export {
   reactMatrixMessage,
   resolveMatrixRoomId,
-  sendReadReceiptMatrix,
   sendMessageMatrix,
   sendPollMatrix,
   sendTypingMatrix,

extensions/matrix/src/matrix/monitor/auto-join.ts

@@ -1,5 +1,5 @@
-import type { MatrixClient } from "matrix-bot-sdk";
-import { AutojoinRoomsMixin } from "matrix-bot-sdk";
+import type { MatrixClient, MatrixEvent, RoomMember } from "matrix-js-sdk";
+import { RoomMemberEvent } from "matrix-js-sdk";
 
 import type { RuntimeEnv } from "clawdbot/plugin-sdk";
 import type { CoreConfig } from "../../types.js";
@@ -19,45 +19,25 @@ export function registerMatrixAutoJoin(params: {
   const autoJoin = cfg.channels?.matrix?.autoJoin ?? "always";
   const autoJoinAllowlist = cfg.channels?.matrix?.autoJoinAllowlist ?? [];
 
-  if (autoJoin === "off") {
-    return;
-  }
-
-  if (autoJoin === "always") {
-    // Use the built-in autojoin mixin for "always" mode
-    AutojoinRoomsMixin.setupOnClient(client);
-    logVerbose("matrix: auto-join enabled for all invites");
-    return;
-  }
-
-  // For "allowlist" mode, handle invites manually
-  client.on("room.invite", async (roomId: string, _inviteEvent: unknown) => {
-    if (autoJoin !== "allowlist") return;
-    
-    // Get room alias if available
-    let alias: string | undefined;
-    let altAliases: string[] = [];
-    try {
-      const aliasState = await client
-        .getRoomStateEvent(roomId, "m.room.canonical_alias", "")
-        .catch(() => null);
-      alias = aliasState?.alias;
-      altAliases = Array.isArray(aliasState?.alt_aliases) ? aliasState.alt_aliases : [];
-    } catch {
-      // Ignore errors
+  client.on(RoomMemberEvent.Membership, async (_event: MatrixEvent, member: RoomMember) => {
+    if (member.userId !== client.getUserId()) return;
+    if (member.membership !== "invite") return;
+    const roomId = member.roomId;
+    if (autoJoin === "off") return;
+    if (autoJoin === "allowlist") {
+      const invitedRoom = client.getRoom(roomId);
+      const alias = invitedRoom?.getCanonicalAlias?.() ?? "";
+      const altAliases = invitedRoom?.getAltAliases?.() ?? [];
+      const allowed =
+        autoJoinAllowlist.includes("*") ||
+        autoJoinAllowlist.includes(roomId) ||
+        (alias ? autoJoinAllowlist.includes(alias) : false) ||
+        altAliases.some((value) => autoJoinAllowlist.includes(value));
+      if (!allowed) {
+        logVerbose(`matrix: invite ignored (not in allowlist) room=${roomId}`);
+        return;
+      }
     }
-
-    const allowed =
-      autoJoinAllowlist.includes("*") ||
-      autoJoinAllowlist.includes(roomId) ||
-      (alias ? autoJoinAllowlist.includes(alias) : false) ||
-      altAliases.some((value) => autoJoinAllowlist.includes(value));
-
-    if (!allowed) {
-      logVerbose(`matrix: invite ignored (not in allowlist) room=${roomId}`);
-      return;
-    }
-
     try {
       await client.joinRoom(roomId);
       logVerbose(`matrix: joined room ${roomId}`);

extensions/matrix/src/matrix/monitor/direct.ts

@@ -1,105 +1,80 @@
-import type { MatrixClient } from "matrix-bot-sdk";
+import type {
+  AccountDataEvents,
+  MatrixClient,
+  MatrixEvent,
+  Room,
+  RoomMember,
+} from "matrix-js-sdk";
+import { ClientEvent, EventType } from "matrix-js-sdk";
 
-type DirectMessageCheck = {
-  roomId: string;
-  senderId?: string;
-  selfUserId?: string;
-};
+function hasDirectFlag(member?: RoomMember | null): boolean {
+  if (!member?.events.member) return false;
+  const content = member.events.member.getContent() as { is_direct?: boolean } | undefined;
+  if (content?.is_direct === true) return true;
+  const prev = member.events.member.getPrevContent() as { is_direct?: boolean } | undefined;
+  return prev?.is_direct === true;
+}
 
-type DirectRoomTrackerOptions = {
-  log?: (message: string) => void;
-};
+export function isLikelyDirectRoom(params: {
+  room: Room;
+  senderId: string;
+  selfId?: string | null;
+}): boolean {
+  if (!params.selfId) return false;
+  const memberCount = params.room.getJoinedMemberCount?.();
+  if (typeof memberCount !== "number" || memberCount !== 2) return false;
+  return true;
+}
 
-const DM_CACHE_TTL_MS = 30_000;
+export function isDirectRoomByFlag(params: {
+  room: Room;
+  senderId: string;
+  selfId?: string | null;
+}): boolean {
+  if (!params.selfId) return false;
+  const selfMember = params.room.getMember(params.selfId);
+  const senderMember = params.room.getMember(params.senderId);
+  if (hasDirectFlag(selfMember) || hasDirectFlag(senderMember)) return true;
+  const inviter = selfMember?.getDMInviter() ?? senderMember?.getDMInviter();
+  return Boolean(inviter);
+}
 
-export function createDirectRoomTracker(
-  client: MatrixClient,
-  opts: DirectRoomTrackerOptions = {},
-) {
-  const log = opts.log ?? (() => {});
-  let lastDmUpdateMs = 0;
-  let cachedSelfUserId: string | null = null;
-  const memberCountCache = new Map<string, { count: number; ts: number }>();
+type MatrixDirectAccountData = AccountDataEvents[EventType.Direct];
 
-  const ensureSelfUserId = async (): Promise<string | null> => {
-    if (cachedSelfUserId) return cachedSelfUserId;
-    try {
-      cachedSelfUserId = await client.getUserId();
-    } catch {
-      cachedSelfUserId = null;
-    }
-    return cachedSelfUserId;
-  };
+export function createDirectRoomTracker(client: MatrixClient) {
+  const directMap = new Map<string, Set<string>>();
 
-  const refreshDmCache = async (): Promise<void> => {
-    const now = Date.now();
-    if (now - lastDmUpdateMs < DM_CACHE_TTL_MS) return;
-    lastDmUpdateMs = now;
-    try {
-      await client.dms.update();
-    } catch (err) {
-      log(`matrix: dm cache refresh failed (${String(err)})`);
+  const updateDirectMap = (content: MatrixDirectAccountData) => {
+    directMap.clear();
+    for (const [userId, rooms] of Object.entries(content)) {
+      if (!Array.isArray(rooms)) continue;
+      const ids = rooms.map((roomId) => String(roomId).trim()).filter(Boolean);
+      if (ids.length === 0) continue;
+      directMap.set(userId, new Set(ids));
     }
   };
 
-  const resolveMemberCount = async (roomId: string): Promise<number | null> => {
-    const cached = memberCountCache.get(roomId);
-    const now = Date.now();
-    if (cached && now - cached.ts < DM_CACHE_TTL_MS) {
-      return cached.count;
-    }
-    try {
-      const members = await client.getJoinedRoomMembers(roomId);
-      const count = members.length;
-      memberCountCache.set(roomId, { count, ts: now });
-      return count;
-    } catch (err) {
-      log(`matrix: dm member count failed room=${roomId} (${String(err)})`);
-      return null;
-    }
-  };
+  const initialDirect = client.getAccountData(EventType.Direct);
+  if (initialDirect) {
+    updateDirectMap(initialDirect.getContent<MatrixDirectAccountData>() ?? {});
+  }
 
-  const hasDirectFlag = async (roomId: string, userId?: string): Promise<boolean> => {
-    const target = userId?.trim();
-    if (!target) return false;
-    try {
-      const state = await client.getRoomStateEvent(roomId, "m.room.member", target);
-      return state?.is_direct === true;
-    } catch {
-      return false;
-    }
-  };
+  client.on(ClientEvent.AccountData, (event: MatrixEvent) => {
+    if (event.getType() !== EventType.Direct) return;
+    updateDirectMap(event.getContent<MatrixDirectAccountData>() ?? {});
+  });
 
   return {
-    isDirectMessage: async (params: DirectMessageCheck): Promise<boolean> => {
-      const { roomId, senderId } = params;
-      await refreshDmCache();
-
-      if (client.dms.isDm(roomId)) {
-        log(`matrix: dm detected via m.direct room=${roomId}`);
-        return true;
-      }
-
-      const memberCount = await resolveMemberCount(roomId);
-      if (memberCount === 2) {
-        log(`matrix: dm detected via member count room=${roomId} members=${memberCount}`);
-        return true;
-      }
-
-      const selfUserId = params.selfUserId ?? (await ensureSelfUserId());
-      const directViaState =
-        (await hasDirectFlag(roomId, senderId)) || (await hasDirectFlag(roomId, selfUserId ?? ""));
-      if (directViaState) {
-        log(`matrix: dm detected via member state room=${roomId}`);
-        return true;
-      }
-
-      log(
-        `matrix: dm check room=${roomId} result=group members=${
-          memberCount ?? "unknown"
-        }`,
+    isDirectMessage: (room: Room, senderId: string) => {
+      const roomId = room.roomId;
+      const directRooms = directMap.get(senderId);
+      const selfId = client.getUserId();
+      const isDirectByFlag = isDirectRoomByFlag({ room, senderId, selfId });
+      return (
+        Boolean(directRooms?.has(roomId)) ||
+        isDirectByFlag ||
+        isLikelyDirectRoom({ room, senderId, selfId })
       );
-      return false;
     },
   };
 }

extensions/matrix/src/matrix/monitor/index.ts

@@ -1,18 +1,11 @@
-import type {
-  EncryptedFile,
-  LocationMessageEventContent,
-  MatrixClient,
-  MessageEventContent,
-} from "matrix-bot-sdk";
-import { format } from "node:util";
+import type { MatrixEvent, Room } from "matrix-js-sdk";
+import { EventType, RelationType, RoomEvent } from "matrix-js-sdk";
+import type { RoomMessageEventContent } from "matrix-js-sdk/lib/@types/events.js";
 
 import {
   formatAllowlistMatchMeta,
-  formatLocationText,
   mergeAllowlist,
   summarizeMapping,
-  toLocationContext,
-  type NormalizedLocation,
   type ReplyPayload,
   type RuntimeEnv,
 } from "clawdbot/plugin-sdk";
@@ -22,7 +15,6 @@ import {
   isBunRuntime,
   resolveMatrixAuth,
   resolveSharedMatrixClient,
-  stopSharedClient,
 } from "../client.js";
 import {
   formatPollAsText,
@@ -30,12 +22,7 @@ import {
   type PollStartContent,
   parsePollStartContent,
 } from "../poll-types.js";
-import {
-  reactMatrixMessage,
-  sendMessageMatrix,
-  sendReadReceiptMatrix,
-  sendTypingMatrix,
-} from "../send.js";
+import { reactMatrixMessage, sendMessageMatrix, sendTypingMatrix } from "../send.js";
 import {
   resolveMatrixAllowListMatch,
   resolveMatrixAllowListMatches,
@@ -51,126 +38,12 @@ import { resolveMatrixThreadRootId, resolveMatrixThreadTarget } from "./threads.
 import { resolveMatrixTargets } from "../../resolve-targets.js";
 import { getMatrixRuntime } from "../../runtime.js";
 
-// Constants that were previously from matrix-js-sdk
-const EventType = {
-  RoomMessage: "m.room.message",
-  RoomMessageEncrypted: "m.room.encrypted",
-  RoomMember: "m.room.member",
-  Location: "m.location",
-} as const;
-
-const RelationType = {
-  Replace: "m.replace",
-} as const;
-
-// Type for raw Matrix events from matrix-bot-sdk
-type MatrixRawEvent = {
-  event_id: string;
-  sender: string;
-  type: string;
-  origin_server_ts: number;
-  content: Record<string, unknown>;
-  unsigned?: {
-    age?: number;
-    redacted_because?: unknown;
-  };
-};
-
-type RoomMessageEventContent = MessageEventContent & {
-  url?: string;
-  file?: EncryptedFile;
-  info?: {
-    mimetype?: string;
-  };
-  "m.relates_to"?: {
-    rel_type?: string;
-    event_id?: string;
-    "m.in_reply_to"?: { event_id?: string };
-  };
-};
-
-type MatrixLocationPayload = {
-  text: string;
-  context: ReturnType<typeof toLocationContext>;
-};
-
-type GeoUriParams = {
-  latitude: number;
-  longitude: number;
-  accuracy?: number;
-};
-
-function parseGeoUri(value: string): GeoUriParams | null {
-  const trimmed = value.trim();
-  if (!trimmed) return null;
-  if (!trimmed.toLowerCase().startsWith("geo:")) return null;
-  const payload = trimmed.slice(4);
-  const [coordsPart, ...paramParts] = payload.split(";");
-  const coords = coordsPart.split(",");
-  if (coords.length < 2) return null;
-  const latitude = Number.parseFloat(coords[0] ?? "");
-  const longitude = Number.parseFloat(coords[1] ?? "");
-  if (!Number.isFinite(latitude) || !Number.isFinite(longitude)) return null;
-
-  const params = new Map<string, string>();
-  for (const part of paramParts) {
-    const segment = part.trim();
-    if (!segment) continue;
-    const eqIndex = segment.indexOf("=");
-    const rawKey = eqIndex === -1 ? segment : segment.slice(0, eqIndex);
-    const rawValue = eqIndex === -1 ? "" : segment.slice(eqIndex + 1);
-    const key = rawKey.trim().toLowerCase();
-    if (!key) continue;
-    const valuePart = rawValue.trim();
-    params.set(key, valuePart ? decodeURIComponent(valuePart) : "");
-  }
-
-  const accuracyRaw = params.get("u");
-  const accuracy = accuracyRaw ? Number.parseFloat(accuracyRaw) : undefined;
-
-  return {
-    latitude,
-    longitude,
-    accuracy: Number.isFinite(accuracy) ? accuracy : undefined,
-  };
-}
-
-function resolveMatrixLocation(params: {
-  eventType: string;
-  content: LocationMessageEventContent;
-}): MatrixLocationPayload | null {
-  const { eventType, content } = params;
-  const isLocation =
-    eventType === EventType.Location ||
-    (eventType === EventType.RoomMessage && content.msgtype === EventType.Location);
-  if (!isLocation) return null;
-  const geoUri = typeof content.geo_uri === "string" ? content.geo_uri.trim() : "";
-  if (!geoUri) return null;
-  const parsed = parseGeoUri(geoUri);
-  if (!parsed) return null;
-  const caption = typeof content.body === "string" ? content.body.trim() : "";
-  const location: NormalizedLocation = {
-    latitude: parsed.latitude,
-    longitude: parsed.longitude,
-    accuracy: parsed.accuracy,
-    caption: caption || undefined,
-    source: "pin",
-    isLive: false,
-  };
-
-  return {
-    text: formatLocationText(location),
-    context: toLocationContext(location),
-  };
-}
-
 export type MonitorMatrixOpts = {
   runtime?: RuntimeEnv;
   abortSignal?: AbortSignal;
   mediaMaxMb?: number;
   initialSyncLimit?: number;
   replyToMode?: ReplyToMode;
-  accountId?: string | null;
 };
 
 const DEFAULT_MEDIA_MAX_MB = 20;
@@ -183,23 +56,13 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
   let cfg = core.config.loadConfig() as CoreConfig;
   if (cfg.channels?.matrix?.enabled === false) return;
 
-  const logger = core.logging.getChildLogger({ module: "matrix-auto-reply" });
-  const formatRuntimeMessage = (...args: Parameters<RuntimeEnv["log"]>) => format(...args);
   const runtime: RuntimeEnv = opts.runtime ?? {
-    log: (...args) => {
-      logger.info(formatRuntimeMessage(...args));
-    },
-    error: (...args) => {
-      logger.error(formatRuntimeMessage(...args));
-    },
+    log: console.log,
+    error: console.error,
     exit: (code: number): never => {
       throw new Error(`exit ${code}`);
     },
   };
-  const logVerboseMessage = (message: string) => {
-    if (!core.logging.shouldLogVerbose()) return;
-    logger.debug(message);
-  };
 
   const normalizeUserEntry = (raw: string) =>
     raw.replace(/^matrix:/i, "").replace(/^user:/i, "").trim();
@@ -207,9 +70,8 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
     raw.replace(/^matrix:/i, "").replace(/^(room|channel):/i, "").trim();
   const isMatrixUserId = (value: string) => value.startsWith("@") && value.includes(":");
 
-  const allowlistOnly = cfg.channels?.matrix?.allowlistOnly === true;
   let allowFrom = cfg.channels?.matrix?.dm?.allowFrom ?? [];
-  let roomsConfig = cfg.channels?.matrix?.groups ?? cfg.channels?.matrix?.rooms;
+  let roomsConfig = cfg.channels?.matrix?.rooms;
 
   if (allowFrom.length > 0) {
     const entries = allowFrom
@@ -301,7 +163,7 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
           ...cfg.channels?.matrix?.dm,
           allowFrom,
         },
-        ...(roomsConfig ? { groups: roomsConfig } : {}),
+        rooms: roomsConfig,
       },
     },
   };
@@ -319,11 +181,17 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
     cfg,
     auth: authWithLimit,
     startClient: false,
-    accountId: opts.accountId,
   });
   setActiveMatrixClient(client);
 
   const mentionRegexes = core.channel.mentions.buildMentionRegexes(cfg);
+  const logger = core.logging.getChildLogger({ module: "matrix-auto-reply" });
+  const logVerboseMessage = (message: string) => {
+    if (core.logging.shouldLogVerbose()) {
+      logger.debug(message);
+    }
+  };
+  const allowlistOnly = cfg.channels?.matrix?.allowlistOnly === true;
   const defaultGroupPolicy = cfg.channels?.defaults?.groupPolicy;
   const groupPolicyRaw = cfg.channels?.matrix?.groupPolicy ?? defaultGroupPolicy ?? "allowlist";
   const groupPolicy = allowlistOnly && groupPolicyRaw === "open" ? "allowlist" : groupPolicyRaw;
@@ -338,75 +206,30 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
   const mediaMaxBytes = Math.max(1, mediaMaxMb) * 1024 * 1024;
   const startupMs = Date.now();
   const startupGraceMs = 0;
-  const directTracker = createDirectRoomTracker(client, { log: logVerboseMessage });
+  const directTracker = createDirectRoomTracker(client);
   registerMatrixAutoJoin({ client, cfg, runtime });
-  const warnedEncryptedRooms = new Set<string>();
-  const warnedCryptoMissingRooms = new Set<string>();
 
-  const roomInfoCache = new Map<
-    string,
-    { name?: string; canonicalAlias?: string; altAliases: string[] }
-  >();
-
-  // Helper to get room info
-  const getRoomInfo = async (roomId: string) => {
-    const cached = roomInfoCache.get(roomId);
-    if (cached) return cached;
-    let name: string | undefined;
-    let canonicalAlias: string | undefined;
-    let altAliases: string[] = [];
-    try {
-      const nameState = await client.getRoomStateEvent(roomId, "m.room.name", "").catch(() => null);
-      name = nameState?.name;
-    } catch { /* ignore */ }
-    try {
-      const aliasState = await client.getRoomStateEvent(roomId, "m.room.canonical_alias", "").catch(() => null);
-      canonicalAlias = aliasState?.alias;
-      altAliases = aliasState?.alt_aliases ?? [];
-    } catch { /* ignore */ }
-    const info = { name, canonicalAlias, altAliases };
-    roomInfoCache.set(roomId, info);
-    return info;
-  };
-
-  // Helper to get member display name
-  const getMemberDisplayName = async (roomId: string, userId: string): Promise<string> => {
-    try {
-      const memberState = await client.getRoomStateEvent(roomId, "m.room.member", userId).catch(() => null);
-      return memberState?.displayname ?? userId;
-    } catch {
-      return userId;
-    }
-  };
-
-  const handleRoomMessage = async (
-    roomId: string,
-    event: MatrixRawEvent,
+  const handleTimeline = async (
+    event: MatrixEvent,
+    room: Room | undefined,
+    toStartOfTimeline?: boolean,
   ) => {
     try {
-      const eventType = event.type;
-      if (eventType === EventType.RoomMessageEncrypted) {
-        // Encrypted messages are decrypted automatically by matrix-bot-sdk with crypto enabled
+      if (!room) return;
+      if (toStartOfTimeline) return;
+      if (event.getType() === EventType.RoomMessageEncrypted || event.isDecryptionFailure()) {
         return;
       }
 
+      const eventType = event.getType();
       const isPollEvent = isPollStartType(eventType);
-      const locationContent = event.content as LocationMessageEventContent;
-      const isLocationEvent =
-        eventType === EventType.Location ||
-        (eventType === EventType.RoomMessage &&
-          locationContent.msgtype === EventType.Location);
-      if (eventType !== EventType.RoomMessage && !isPollEvent && !isLocationEvent) return;
-      logVerboseMessage(
-        `matrix: room.message recv room=${roomId} type=${eventType} id=${event.event_id ?? "unknown"}`,
-      );
-      if (event.unsigned?.redacted_because) return;
-      const senderId = event.sender;
+      if (eventType !== EventType.RoomMessage && !isPollEvent) return;
+      if (event.isRedacted()) return;
+      const senderId = event.getSender();
       if (!senderId) return;
-      const selfUserId = await client.getUserId();
-      if (senderId === selfUserId) return;
-      const eventTs = event.origin_server_ts;
-      const eventAge = event.unsigned?.age;
+      if (senderId === client.getUserId()) return;
+      const eventTs = event.getTs();
+      const eventAge = event.getAge();
       if (typeof eventTs === "number" && eventTs < startupMs - startupGraceMs) {
         return;
       }
@@ -418,23 +241,15 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         return;
       }
 
-      const roomInfo = await getRoomInfo(roomId);
-      const roomName = roomInfo.name;
-      const roomAliases = [
-        roomInfo.canonicalAlias ?? "",
-        ...roomInfo.altAliases,
-      ].filter(Boolean);
-
-      let content = event.content as RoomMessageEventContent;
+      let content = event.getContent<RoomMessageEventContent>();
       if (isPollEvent) {
-        const pollStartContent = event.content as PollStartContent;
+        const pollStartContent = event.getContent<PollStartContent>();
         const pollSummary = parsePollStartContent(pollStartContent);
         if (pollSummary) {
-          pollSummary.eventId = event.event_id ?? "";
-          pollSummary.roomId = roomId;
+          pollSummary.eventId = event.getId() ?? "";
+          pollSummary.roomId = room.roomId;
           pollSummary.sender = senderId;
-          const senderDisplayName = await getMemberDisplayName(roomId, senderId);
-          pollSummary.senderName = senderDisplayName;
+          pollSummary.senderName = room.getMember(senderId)?.name ?? senderId;
           const pollText = formatPollAsText(pollSummary);
           content = {
             msgtype: "m.text",
@@ -445,64 +260,50 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         }
       }
 
-      const locationPayload = resolveMatrixLocation({
-        eventType,
-        content: content as LocationMessageEventContent,
-      });
-
       const relates = content["m.relates_to"];
       if (relates && "rel_type" in relates) {
         if (relates.rel_type === RelationType.Replace) return;
       }
 
-      const isDirectMessage = await directTracker.isDirectMessage({
-        roomId,
-        senderId,
-        selfUserId,
-      });
+      const roomId = room.roomId;
+      const isDirectMessage = directTracker.isDirectMessage(room, senderId);
       const isRoom = !isDirectMessage;
 
-      if (isRoom && groupPolicy === "disabled") return;
+      if (!isDirectMessage && groupPolicy === "disabled") return;
 
-      const roomConfigInfo = isRoom
-        ? resolveMatrixRoomConfig({
-            rooms: roomsConfig,
-            roomId,
-            aliases: roomAliases,
-            name: roomName,
-          })
-        : undefined;
-      const roomConfig = roomConfigInfo?.config;
-      const roomMatchMeta = roomConfigInfo
-        ? `matchKey=${roomConfigInfo.matchKey ?? "none"} matchSource=${
-            roomConfigInfo.matchSource ?? "none"
-          }`
-        : "matchKey=none matchSource=none";
+      const roomAliases = [
+        room.getCanonicalAlias?.() ?? "",
+        ...(room.getAltAliases?.() ?? []),
+      ].filter(Boolean);
+      const roomName = room.name ?? undefined;
+      const roomConfigInfo = resolveMatrixRoomConfig({
+        rooms: cfg.channels?.matrix?.rooms,
+        roomId,
+        aliases: roomAliases,
+        name: roomName,
+      });
+      const roomMatchMeta = `matchKey=${roomConfigInfo.matchKey ?? "none"} matchSource=${
+        roomConfigInfo.matchSource ?? "none"
+      }`;
 
-      if (isRoom && roomConfig && !roomConfigInfo?.allowed) {
+      if (roomConfigInfo.config && !roomConfigInfo.allowed) {
         logVerboseMessage(`matrix: room disabled room=${roomId} (${roomMatchMeta})`);
         return;
       }
-      if (isRoom && groupPolicy === "allowlist") {
-        if (!roomConfigInfo?.allowlistConfigured) {
+      if (groupPolicy === "allowlist") {
+        if (!roomConfigInfo.allowlistConfigured) {
           logVerboseMessage(`matrix: drop room message (no allowlist, ${roomMatchMeta})`);
           return;
         }
-        if (!roomConfig) {
+        if (!roomConfigInfo.config) {
           logVerboseMessage(`matrix: drop room message (not in allowlist, ${roomMatchMeta})`);
           return;
         }
       }
 
-      const senderName = await getMemberDisplayName(roomId, senderId);
+      const senderName = room.getMember(senderId)?.name ?? senderId;
       const storeAllowFrom = await core.channel.pairing.readAllowFromStore("matrix").catch(() => []);
       const effectiveAllowFrom = normalizeAllowListLower([...allowFrom, ...storeAllowFrom]);
-      const groupAllowFrom = cfg.channels?.matrix?.groupAllowFrom ?? [];
-      const effectiveGroupAllowFrom = normalizeAllowListLower([
-        ...groupAllowFrom,
-        ...storeAllowFrom,
-      ]);
-      const groupAllowConfigured = effectiveGroupAllowFrom.length > 0;
 
       if (isDirectMessage) {
         if (!dmEnabled || dmPolicy === "disabled") return;
@@ -552,10 +353,9 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         }
       }
 
-      const roomUsers = roomConfig?.users ?? [];
-      if (isRoom && roomUsers.length > 0) {
+      if (isRoom && roomConfigInfo.config?.users?.length) {
         const userMatch = resolveMatrixAllowListMatch({
-          allowList: normalizeAllowListLower(roomUsers),
+          allowList: normalizeAllowListLower(roomConfigInfo.config.users),
           userId: senderId,
           userName: senderName,
         });
@@ -568,27 +368,11 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
           return;
         }
       }
-      if (isRoom && groupPolicy === "allowlist" && roomUsers.length === 0 && groupAllowConfigured) {
-        const groupAllowMatch = resolveMatrixAllowListMatch({
-          allowList: effectiveGroupAllowFrom,
-          userId: senderId,
-          userName: senderName,
-        });
-        if (!groupAllowMatch.allowed) {
-          logVerboseMessage(
-            `matrix: blocked sender ${senderId} (groupAllowFrom, ${roomMatchMeta}, ${formatAllowlistMatchMeta(
-              groupAllowMatch,
-            )})`,
-          );
-          return;
-        }
-      }
       if (isRoom) {
         logVerboseMessage(`matrix: allow room ${roomId} (${roomMatchMeta})`);
       }
 
-      const rawBody = locationPayload?.text
-        ?? (typeof content.body === "string" ? content.body.trim() : "");
+      const rawBody = content.body.trim();
       let media: {
         path: string;
         contentType?: string;
@@ -596,12 +380,7 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
       } | null = null;
       const contentUrl =
         "url" in content && typeof content.url === "string" ? content.url : undefined;
-      const contentFile =
-        "file" in content && content.file && typeof content.file === "object"
-          ? (content.file as EncryptedFile)
-          : undefined;
-      const mediaUrl = contentUrl ?? contentFile?.url;
-      if (!rawBody && !mediaUrl) {
+      if (!rawBody && !contentUrl) {
         return;
       }
 
@@ -609,14 +388,13 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         "info" in content && content.info && "mimetype" in content.info
           ? (content.info as { mimetype?: string }).mimetype
           : undefined;
-      if (mediaUrl?.startsWith("mxc://")) {
+      if (contentUrl?.startsWith("mxc://")) {
         try {
           media = await downloadMatrixMedia({
             client,
-            mxcUrl: mediaUrl,
+            mxcUrl: contentUrl,
             contentType,
             maxBytes: mediaMaxBytes,
-            file: contentFile,
           });
         } catch (err) {
           logVerboseMessage(`matrix: media download failed: ${String(err)}`);
@@ -628,7 +406,7 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
 
       const { wasMentioned, hasExplicitMention } = resolveMentions({
         content,
-        userId: selfUserId,
+        userId: client.getUserId(),
         text: bodyText,
         mentionRegexes,
       });
@@ -642,27 +420,10 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         userId: senderId,
         userName: senderName,
       });
-      const senderAllowedForGroup = groupAllowConfigured
-        ? resolveMatrixAllowListMatches({
-            allowList: effectiveGroupAllowFrom,
-            userId: senderId,
-            userName: senderName,
-          })
-        : false;
-      const senderAllowedForRoomUsers =
-        isRoom && roomUsers.length > 0
-          ? resolveMatrixAllowListMatches({
-              allowList: normalizeAllowListLower(roomUsers),
-              userId: senderId,
-              userName: senderName,
-            })
-          : false;
       const commandAuthorized = core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
         useAccessGroups,
         authorizers: [
           { configured: effectiveAllowFrom.length > 0, allowed: senderAllowedForCommands },
-          { configured: roomUsers.length > 0, allowed: senderAllowedForRoomUsers },
-          { configured: groupAllowConfigured, allowed: senderAllowedForGroup },
         ],
       });
       if (
@@ -675,12 +436,12 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         return;
       }
       const shouldRequireMention = isRoom
-        ? roomConfig?.autoReply === true
+        ? roomConfigInfo.config?.autoReply === true
           ? false
-          : roomConfig?.autoReply === false
+          : roomConfigInfo.config?.autoReply === false
             ? true
-            : typeof roomConfig?.requireMention === "boolean"
-              ? roomConfig?.requireMention
+            : typeof roomConfigInfo.config?.requireMention === "boolean"
+              ? roomConfigInfo.config.requireMention
               : true
         : false;
       const shouldBypassMention =
@@ -696,14 +457,13 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         return;
       }
 
-      const messageId = event.event_id ?? "";
-      const replyToEventId = content["m.relates_to"]?.["m.in_reply_to"]?.event_id;
+      const messageId = event.getId() ?? "";
       const threadRootId = resolveMatrixThreadRootId({ event, content });
 	      const threadTarget = resolveMatrixThreadTarget({
 	        threadReplies,
 	        messageId,
 	        threadRootId,
-	        isThreadRoot: false, // matrix-bot-sdk doesn't have this info readily available
+	        isThreadRoot: event.isThreadRoot,
 	      });
 
 	      const route = core.channel.routing.resolveAgentRoute({
@@ -724,16 +484,16 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
 	        storePath,
 	        sessionKey: route.sessionKey,
 	      });
-      const body = core.channel.reply.formatAgentEnvelope({
-        channel: "Matrix",
-        from: envelopeFrom,
-        timestamp: eventTs ?? undefined,
-        previousTimestamp,
-        envelope: envelopeOptions,
-        body: textWithId,
-      });
+	      const body = core.channel.reply.formatAgentEnvelope({
+	        channel: "Matrix",
+	        from: envelopeFrom,
+	        timestamp: event.getTs() ?? undefined,
+	        previousTimestamp,
+	        envelope: envelopeOptions,
+	        body: textWithId,
+	      });
 
-      const groupSystemPrompt = roomConfig?.systemPrompt?.trim() || undefined;
+	      const groupSystemPrompt = roomConfigInfo.config?.systemPrompt?.trim() || undefined;
       const ctxPayload = core.channel.reply.finalizeInboundContext({
 	        Body: body,
 	        RawBody: bodyText,
@@ -748,19 +508,18 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         SenderId: senderId,
         SenderUsername: senderId.split(":")[0]?.replace(/^@/, ""),
         GroupSubject: isRoom ? (roomName ?? roomId) : undefined,
-        GroupChannel: isRoom ? (roomInfo.canonicalAlias ?? roomId) : undefined,
+        GroupChannel: isRoom ? (room.getCanonicalAlias?.() ?? roomId) : undefined,
         GroupSystemPrompt: isRoom ? groupSystemPrompt : undefined,
         Provider: "matrix" as const,
         Surface: "matrix" as const,
         WasMentioned: isRoom ? wasMentioned : undefined,
         MessageSid: messageId,
-        ReplyToId: threadTarget ? undefined : (replyToEventId ?? undefined),
+        ReplyToId: threadTarget ? undefined : (event.replyEventId ?? undefined),
         MessageThreadId: threadTarget,
-        Timestamp: eventTs ?? undefined,
+        Timestamp: event.getTs() ?? undefined,
         MediaPath: media?.path,
         MediaType: media?.contentType,
         MediaUrl: media?.path,
-        ...(locationPayload?.context ?? {}),
 	        CommandAuthorized: commandAuthorized,
 	        CommandSource: "text" as const,
 	        OriginatingChannel: "matrix" as const,
@@ -818,14 +577,6 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         return;
       }
 
-      if (messageId) {
-        sendReadReceiptMatrix(roomId, messageId, client).catch((err) => {
-          logVerboseMessage(
-            `matrix: read receipt failed room=${roomId} id=${messageId}: ${String(err)}`,
-          );
-        });
-      }
-
       let didSendReply = false;
       const { dispatcher, replyOptions, markDispatchIdle } = core.channel.reply.createReplyDispatcherWithTyping({
         responsePrefix: core.channel.reply.resolveEffectiveMessagesConfig(cfg, route.agentId).responsePrefix,
@@ -855,7 +606,7 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
         dispatcher,
         replyOptions: {
           ...replyOptions,
-          skillFilter: roomConfig?.skills,
+          skillFilter: roomConfigInfo.config?.skills,
         },
       });
       markDispatchIdle();
@@ -877,101 +628,15 @@ export async function monitorMatrixProvider(opts: MonitorMatrixOpts = {}): Promi
     }
   };
 
-  // matrix-bot-sdk uses on("room.message", handler)
-  client.on("room.message", handleRoomMessage);
+  client.on(RoomEvent.Timeline, handleTimeline);
 
-  client.on("room.encrypted_event", (roomId: string, event: MatrixRawEvent) => {
-    const eventId = event?.event_id ?? "unknown";
-    const eventType = event?.type ?? "unknown";
-    logVerboseMessage(`matrix: encrypted event room=${roomId} type=${eventType} id=${eventId}`);
-  });
-
-  client.on("room.decrypted_event", (roomId: string, event: MatrixRawEvent) => {
-    const eventId = event?.event_id ?? "unknown";
-    const eventType = event?.type ?? "unknown";
-    logVerboseMessage(`matrix: decrypted event room=${roomId} type=${eventType} id=${eventId}`);
-  });
-
-  // Handle failed E2EE decryption
-  client.on("room.failed_decryption", async (roomId: string, event: MatrixRawEvent, error: Error) => {
-    logger.warn({ roomId, eventId: event.event_id, error: error.message }, "Failed to decrypt message");
-    logVerboseMessage(
-      `matrix: failed decrypt room=${roomId} id=${event.event_id ?? "unknown"} error=${error.message}`,
-    );
-  });
-
-  client.on("room.invite", (roomId: string, event: MatrixRawEvent) => {
-    const eventId = event?.event_id ?? "unknown";
-    const sender = event?.sender ?? "unknown";
-    const isDirect = (event?.content as { is_direct?: boolean } | undefined)?.is_direct === true;
-    logVerboseMessage(
-      `matrix: invite room=${roomId} sender=${sender} direct=${String(isDirect)} id=${eventId}`,
-    );
-  });
-
-  client.on("room.join", (roomId: string, event: MatrixRawEvent) => {
-    const eventId = event?.event_id ?? "unknown";
-    logVerboseMessage(`matrix: join room=${roomId} id=${eventId}`);
-  });
-
-  client.on("room.event", (roomId: string, event: MatrixRawEvent) => {
-    const eventType = event?.type ?? "unknown";
-    if (eventType === EventType.RoomMessageEncrypted) {
-      logVerboseMessage(
-        `matrix: encrypted raw event room=${roomId} id=${event?.event_id ?? "unknown"}`,
-      );
-      if (auth.encryption !== true && !warnedEncryptedRooms.has(roomId)) {
-        warnedEncryptedRooms.add(roomId);
-        const warning =
-          "matrix: encrypted event received without encryption enabled; set channels.matrix.encryption=true and verify the device to decrypt";
-        logger.warn({ roomId }, warning);
-      }
-      if (auth.encryption === true && !client.crypto && !warnedCryptoMissingRooms.has(roomId)) {
-        warnedCryptoMissingRooms.add(roomId);
-        const warning =
-          "matrix: encryption enabled but crypto is unavailable; install @matrix-org/matrix-sdk-crypto-nodejs and restart";
-        logger.warn({ roomId }, warning);
-      }
-      return;
-    }
-    if (eventType === EventType.RoomMember) {
-      const membership = (event?.content as { membership?: string } | undefined)?.membership;
-      const stateKey = (event as { state_key?: string }).state_key ?? "";
-      logVerboseMessage(
-        `matrix: member event room=${roomId} stateKey=${stateKey} membership=${membership ?? "unknown"}`,
-      );
-    }
-  });
-
-  logVerboseMessage("matrix: starting client");
-  await resolveSharedMatrixClient({
-    cfg,
-    auth: authWithLimit,
-    accountId: opts.accountId,
-  });
-  logVerboseMessage("matrix: client started");
-
-  // matrix-bot-sdk client is already started via resolveSharedMatrixClient
-  logger.info(`matrix: logged in as ${auth.userId}`);
-
-  // If E2EE is enabled, trigger device verification
-  if (auth.encryption && client.crypto) {
-    try {
-      // Request verification from other sessions
-      const verificationRequest = await client.crypto.requestOwnUserVerification();
-      if (verificationRequest) {
-        logger.info("matrix: device verification requested - please verify in another client");
-      }
-    } catch (err) {
-      logger.debug({ error: String(err) }, "Device verification request failed (may already be verified)");
-    }
-  }
+  await resolveSharedMatrixClient({ cfg, auth: authWithLimit, startClient: true });
+  runtime.log?.(`matrix: logged in as ${auth.userId}`);
 
   await new Promise<void>((resolve) => {
     const onAbort = () => {
       try {
-        logVerboseMessage("matrix: stopping client");
-        stopSharedClient();
+        client.stopClient();
       } finally {
         setActiveMatrixClient(null);
         resolve();

extensions/matrix/src/matrix/monitor/media.test.ts

@@ -1,67 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import type { PluginRuntime } from "clawdbot/plugin-sdk";
-import { setMatrixRuntime } from "../../runtime.js";
-import { downloadMatrixMedia } from "./media.js";
-
-describe("downloadMatrixMedia", () => {
-  const saveMediaBuffer = vi.fn().mockResolvedValue({
-    path: "/tmp/media",
-    contentType: "image/png",
-  });
-
-  const runtimeStub = {
-    channel: {
-      media: {
-        saveMediaBuffer: (...args: unknown[]) => saveMediaBuffer(...args),
-      },
-    },
-  } as unknown as PluginRuntime;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    setMatrixRuntime(runtimeStub);
-  });
-
-  it("decrypts encrypted media when file payloads are present", async () => {
-    const decryptMedia = vi.fn().mockResolvedValue(Buffer.from("decrypted"));
-    const downloadContent = vi.fn().mockResolvedValue(Buffer.from("encrypted"));
-
-    const client = {
-      downloadContent,
-      crypto: { decryptMedia },
-      mxcToHttp: vi.fn().mockReturnValue("https://example/mxc"),
-    } as unknown as import("matrix-bot-sdk").MatrixClient;
-
-    const file = {
-      url: "mxc://example/file",
-      key: {
-        kty: "oct",
-        key_ops: ["encrypt", "decrypt"],
-        alg: "A256CTR",
-        k: "secret",
-        ext: true,
-      },
-      iv: "iv",
-      hashes: { sha256: "hash" },
-      v: "v2",
-    };
-
-    const result = await downloadMatrixMedia({
-      client,
-      mxcUrl: "mxc://example/file",
-      contentType: "image/png",
-      maxBytes: 1024,
-      file,
-    });
-
-    expect(decryptMedia).toHaveBeenCalled();
-    expect(saveMediaBuffer).toHaveBeenCalledWith(
-      Buffer.from("decrypted"),
-      "image/png",
-      "inbound",
-      1024,
-    );
-    expect(result?.path).toBe("/tmp/media");
-  });
-});

extensions/matrix/src/matrix/monitor/media.ts

@@ -1,68 +1,35 @@
-import type { MatrixClient } from "matrix-bot-sdk";
+import type { MatrixClient } from "matrix-js-sdk";
 
 import { getMatrixRuntime } from "../../runtime.js";
 
-// Type for encrypted file info
-type EncryptedFile = {
-  url: string;
-  key: {
-    kty: string;
-    key_ops: string[];
-    alg: string;
-    k: string;
-    ext: boolean;
-  };
-  iv: string;
-  hashes: Record<string, string>;
-  v: string;
-};
-
 async function fetchMatrixMediaBuffer(params: {
   client: MatrixClient;
   mxcUrl: string;
   maxBytes: number;
 }): Promise<{ buffer: Buffer; headerType?: string } | null> {
-  // matrix-bot-sdk provides mxcToHttp helper
-  const url = params.client.mxcToHttp(params.mxcUrl);
+  const url = params.client.mxcUrlToHttp(
+    params.mxcUrl,
+    undefined,
+    undefined,
+    undefined,
+    false,
+    true,
+    true,
+  );
   if (!url) return null;
-  
-  // Use the client's download method which handles auth
-  try {
-    const buffer = await params.client.downloadContent(params.mxcUrl);
-    if (buffer.byteLength > params.maxBytes) {
-      throw new Error("Matrix media exceeds configured size limit");
-    }
-    return { buffer: Buffer.from(buffer) };
-  } catch (err) {
-    throw new Error(`Matrix media download failed: ${String(err)}`);
+  const token = params.client.getAccessToken();
+  const res = await fetch(url, {
+    headers: token ? { Authorization: `Bearer ${token}` } : undefined,
+  });
+  if (!res.ok) {
+    throw new Error(`Matrix media download failed: HTTP ${res.status}`);
   }
-}
-
-/**
- * Download and decrypt encrypted media from a Matrix room.
- */
-async function fetchEncryptedMediaBuffer(params: {
-  client: MatrixClient;
-  file: EncryptedFile;
-  maxBytes: number;
-}): Promise<{ buffer: Buffer } | null> {
-  if (!params.client.crypto) {
-    throw new Error("Cannot decrypt media: crypto not enabled");
-  }
-
-  // Download the encrypted content
-  const encryptedBuffer = await params.client.downloadContent(params.file.url);
-  if (encryptedBuffer.byteLength > params.maxBytes) {
+  const buffer = Buffer.from(await res.arrayBuffer());
+  if (buffer.byteLength > params.maxBytes) {
     throw new Error("Matrix media exceeds configured size limit");
   }
-
-  // Decrypt using matrix-bot-sdk crypto
-  const decrypted = await params.client.crypto.decryptMedia(
-    Buffer.from(encryptedBuffer),
-    params.file,
-  );
-  
-  return { buffer: decrypted };
+  const headerType = res.headers.get("content-type") ?? undefined;
+  return { buffer, headerType };
 }
 
 export async function downloadMatrixMedia(params: {
@@ -70,30 +37,16 @@ export async function downloadMatrixMedia(params: {
   mxcUrl: string;
   contentType?: string;
   maxBytes: number;
-  file?: EncryptedFile;
 }): Promise<{
   path: string;
   contentType?: string;
   placeholder: string;
 } | null> {
-  let fetched: { buffer: Buffer; headerType?: string } | null;
-  
-  if (params.file) {
-    // Encrypted media
-    fetched = await fetchEncryptedMediaBuffer({
-      client: params.client,
-      file: params.file,
-      maxBytes: params.maxBytes,
-    });
-  } else {
-    // Unencrypted media
-    fetched = await fetchMatrixMediaBuffer({
-      client: params.client,
-      mxcUrl: params.mxcUrl,
-      maxBytes: params.maxBytes,
-    });
-  }
-  
+  const fetched = await fetchMatrixMediaBuffer({
+    client: params.client,
+    mxcUrl: params.mxcUrl,
+    maxBytes: params.maxBytes,
+  });
   if (!fetched) return null;
   const headerType = fetched.headerType ?? params.contentType ?? undefined;
   const saved = await getMatrixRuntime().channel.media.saveMediaBuffer(

extensions/matrix/src/matrix/monitor/mentions.ts

@@ -1,22 +1,16 @@
+import type { RoomMessageEventContent } from "matrix-js-sdk/lib/@types/events.js";
+
 import { getMatrixRuntime } from "../../runtime.js";
 
-// Type for room message content with mentions
-type MessageContentWithMentions = {
-  msgtype: string;
-  body: string;
-  "m.mentions"?: {
-    user_ids?: string[];
-    room?: boolean;
-  };
-};
-
 export function resolveMentions(params: {
-  content: MessageContentWithMentions;
+  content: RoomMessageEventContent;
   userId?: string | null;
   text?: string;
   mentionRegexes: RegExp[];
 }) {
-  const mentions = params.content["m.mentions"];
+  const mentions = params.content["m.mentions"] as
+    | { user_ids?: string[]; room?: boolean }
+    | undefined;
   const mentionedUsers = Array.isArray(mentions?.user_ids)
     ? new Set(mentions.user_ids)
     : new Set<string>();

extensions/matrix/src/matrix/monitor/replies.ts

@@ -1,4 +1,4 @@
-import type { MatrixClient } from "matrix-bot-sdk";
+import type { MatrixClient } from "matrix-js-sdk";
 
 import type { ReplyPayload, RuntimeEnv } from "clawdbot/plugin-sdk";
 import { sendMessageMatrix } from "../send.js";

extensions/matrix/src/matrix/monitor/rooms.ts

@@ -1,4 +1,4 @@
-import type { MatrixRoomConfig } from "../../types.js";
+import type { MatrixConfig, MatrixRoomConfig } from "../../types.js";
 import { buildChannelKeyCandidates, resolveChannelEntryMatch } from "clawdbot/plugin-sdk";
 
 export type MatrixRoomConfigResolved = {
@@ -10,7 +10,7 @@ export type MatrixRoomConfigResolved = {
 };
 
 export function resolveMatrixRoomConfig(params: {
-  rooms?: Record<string, MatrixRoomConfig>;
+  rooms?: MatrixConfig["rooms"];
   roomId: string;
   aliases: string[];
   name?: string | null;

extensions/matrix/src/matrix/monitor/threads.ts

@@ -1,25 +1,6 @@
-// Type for raw Matrix event from matrix-bot-sdk
-type MatrixRawEvent = {
-  event_id: string;
-  sender: string;
-  type: string;
-  origin_server_ts: number;
-  content: Record<string, unknown>;
-};
-
-type RoomMessageEventContent = {
-  msgtype: string;
-  body: string;
-  "m.relates_to"?: {
-    rel_type?: string;
-    event_id?: string;
-    "m.in_reply_to"?: { event_id?: string };
-  };
-};
-
-const RelationType = {
-  Thread: "m.thread",
-} as const;
+import type { MatrixEvent } from "matrix-js-sdk";
+import { RelationType } from "matrix-js-sdk";
+import type { RoomMessageEventContent } from "matrix-js-sdk/lib/@types/events.js";
 
 export function resolveMatrixThreadTarget(params: {
   threadReplies: "off" | "inbound" | "always";
@@ -41,9 +22,13 @@ export function resolveMatrixThreadTarget(params: {
 }
 
 export function resolveMatrixThreadRootId(params: {
-  event: MatrixRawEvent;
+  event: MatrixEvent;
   content: RoomMessageEventContent;
 }): string | undefined {
+  const fromThread = params.event.getThread?.()?.id;
+  if (fromThread) return fromThread;
+  const direct = params.event.threadRootId ?? undefined;
+  if (direct) return direct;
   const relates = params.content["m.relates_to"];
   if (!relates || typeof relates !== "object") return undefined;
   if ("rel_type" in relates && relates.rel_type === RelationType.Thread) {

extensions/matrix/src/matrix/poll-types.ts

@@ -7,6 +7,8 @@
  * - m.poll.end - Closes a poll
  */
 
+import type { TimelineEvents } from "matrix-js-sdk/lib/@types/event.js";
+import type { ExtensibleAnyMessageEventContent } from "matrix-js-sdk/lib/@types/extensible_events.js";
 import type { PollInput } from "clawdbot/plugin-sdk";
 
 export const M_POLL_START = "m.poll.start" as const;
@@ -32,9 +34,7 @@ export const POLL_END_TYPES = [M_POLL_END, ORG_POLL_END];
 
 export type PollKind = "m.poll.disclosed" | "m.poll.undisclosed";
 
-export type TextContent = {
-  "m.text"?: string;
-  "org.matrix.msc1767.text"?: string;
+export type TextContent = ExtensibleAnyMessageEventContent & {
   body?: string;
 };
 
@@ -53,13 +53,7 @@ export type LegacyPollStartContent = {
   "m.poll"?: PollStartSubtype;
 };
 
-export type PollStartContent = {
-  [M_POLL_START]?: PollStartSubtype;
-  [ORG_POLL_START]?: PollStartSubtype;
-  "m.poll"?: PollStartSubtype;
-  "m.text"?: string;
-  "org.matrix.msc1767.text"?: string;
-};
+export type PollStartContent = TimelineEvents[typeof M_POLL_START] | LegacyPollStartContent;
 
 export type PollSummary = {
   eventId: string;

extensions/matrix/src/matrix/probe.ts

@@ -49,10 +49,9 @@ export async function probeMatrix(params: {
       accessToken: params.accessToken,
       localTimeoutMs: params.timeoutMs,
     });
-    // matrix-bot-sdk uses getUserId() which calls whoami internally
-    const userId = await client.getUserId();
+    const res = await client.whoami();
     result.ok = true;
-    result.userId = userId ?? null;
+    result.userId = res.user_id ?? null;
 
     result.elapsedMs = Date.now() - started;
     return result;
@@ -60,8 +59,8 @@ export async function probeMatrix(params: {
     return {
       ...result,
       status:
-        typeof err === "object" && err && "statusCode" in err
-          ? Number((err as { statusCode?: number }).statusCode)
+        typeof err === "object" && err && "httpStatus" in err
+          ? Number((err as { httpStatus?: number }).httpStatus)
           : result.status,
       error: err instanceof Error ? err.message : String(err),
       elapsedMs: Date.now() - started,

extensions/matrix/src/matrix/send.test.ts

@@ -3,20 +3,22 @@ import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import type { PluginRuntime } from "clawdbot/plugin-sdk";
 import { setMatrixRuntime } from "../runtime.js";
 
-vi.mock("matrix-bot-sdk", () => ({
-  ConsoleLogger: class {
-    trace = vi.fn();
-    debug = vi.fn();
-    info = vi.fn();
-    warn = vi.fn();
-    error = vi.fn();
+vi.mock("matrix-js-sdk", () => ({
+  EventType: {
+    Direct: "m.direct",
+    RoomMessage: "m.room.message",
+    Reaction: "m.reaction",
   },
-  LogService: {
-    setLogger: vi.fn(),
+  MsgType: {
+    Text: "m.text",
+    File: "m.file",
+    Image: "m.image",
+    Audio: "m.audio",
+    Video: "m.video",
+  },
+  RelationType: {
+    Annotation: "m.annotation",
   },
-  MatrixClient: vi.fn(),
-  SimpleFsStorageProvider: vi.fn(),
-  RustSdkCryptoStorageProvider: vi.fn(),
 }));
 
 const loadWebMediaMock = vi.fn().mockResolvedValue({
@@ -50,13 +52,14 @@ const runtimeStub = {
 let sendMessageMatrix: typeof import("./send.js").sendMessageMatrix;
 
 const makeClient = () => {
-  const sendMessage = vi.fn().mockResolvedValue("evt1");
-  const uploadContent = vi.fn().mockResolvedValue("mxc://example/file");
+  const sendMessage = vi.fn().mockResolvedValue({ event_id: "evt1" });
+  const uploadContent = vi.fn().mockResolvedValue({
+    content_uri: "mxc://example/file",
+  });
   const client = {
     sendMessage,
     uploadContent,
-    getUserId: vi.fn().mockResolvedValue("@bot:example.org"),
-  } as unknown as import("matrix-bot-sdk").MatrixClient;
+  } as unknown as import("matrix-js-sdk").MatrixClient;
   return { client, sendMessage, uploadContent };
 };
 
@@ -93,76 +96,4 @@ describe("sendMessageMatrix media", () => {
     expect(content.formatted_body).toContain("caption");
     expect(content.url).toBe("mxc://example/file");
   });
-
-  it("uploads encrypted media with file payloads", async () => {
-    const { client, sendMessage, uploadContent } = makeClient();
-    (client as { crypto?: object }).crypto = {
-      isRoomEncrypted: vi.fn().mockResolvedValue(true),
-      encryptMedia: vi.fn().mockResolvedValue({
-        buffer: Buffer.from("encrypted"),
-        file: {
-          key: {
-            kty: "oct",
-            key_ops: ["encrypt", "decrypt"],
-            alg: "A256CTR",
-            k: "secret",
-            ext: true,
-          },
-          iv: "iv",
-          hashes: { sha256: "hash" },
-          v: "v2",
-        },
-      }),
-    };
-
-    await sendMessageMatrix("room:!room:example", "caption", {
-      client,
-      mediaUrl: "file:///tmp/photo.png",
-    });
-
-    const uploadArg = uploadContent.mock.calls[0]?.[0] as Buffer | undefined;
-    expect(uploadArg?.toString()).toBe("encrypted");
-
-    const content = sendMessage.mock.calls[0]?.[1] as {
-      url?: string;
-      file?: { url?: string };
-    };
-    expect(content.url).toBeUndefined();
-    expect(content.file?.url).toBe("mxc://example/file");
-  });
-});
-
-describe("sendMessageMatrix threads", () => {
-  beforeAll(async () => {
-    setMatrixRuntime(runtimeStub);
-    ({ sendMessageMatrix } = await import("./send.js"));
-  });
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    setMatrixRuntime(runtimeStub);
-  });
-
-  it("includes thread relation metadata when threadId is set", async () => {
-    const { client, sendMessage } = makeClient();
-
-    await sendMessageMatrix("room:!room:example", "hello thread", {
-      client,
-      threadId: "$thread",
-    });
-
-    const content = sendMessage.mock.calls[0]?.[1] as {
-      "m.relates_to"?: {
-        rel_type?: string;
-        event_id?: string;
-        "m.in_reply_to"?: { event_id?: string };
-      };
-    };
-
-    expect(content["m.relates_to"]).toMatchObject({
-      rel_type: "m.thread",
-      event_id: "$thread",
-      "m.in_reply_to": { event_id: "$thread" },
-    });
-  });
 });