@openclaw/discord 2026.3.13 → 2026.5.1-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (498) hide show
  1. package/account-inspect-api.ts +6 -0
  2. package/action-runtime-api.ts +1 -0
  3. package/api.ts +132 -0
  4. package/channel-config-api.ts +1 -0
  5. package/channel-plugin-api.ts +3 -0
  6. package/config-api.ts +4 -0
  7. package/configured-state.ts +6 -0
  8. package/contract-api.ts +21 -0
  9. package/directory-contract-api.ts +4 -0
  10. package/doctor-contract-api.ts +1 -0
  11. package/index.test.ts +13 -0
  12. package/index.ts +18 -13
  13. package/openclaw.plugin.json +3282 -1
  14. package/package.json +67 -2
  15. package/runtime-api.actions.ts +15 -0
  16. package/runtime-api.lookup.ts +22 -0
  17. package/runtime-api.monitor.ts +50 -0
  18. package/runtime-api.send.ts +79 -0
  19. package/runtime-api.threads.ts +30 -0
  20. package/runtime-api.ts +180 -0
  21. package/runtime-setter-api.ts +3 -0
  22. package/secret-contract-api.ts +4 -0
  23. package/security-audit-contract-api.ts +1 -0
  24. package/security-contract-api.ts +4 -0
  25. package/session-key-api.ts +1 -0
  26. package/setup-entry.ts +9 -0
  27. package/setup-plugin-api.ts +3 -0
  28. package/src/account-inspect.test.ts +126 -0
  29. package/src/account-inspect.ts +132 -0
  30. package/src/accounts.test.ts +247 -0
  31. package/src/accounts.ts +196 -0
  32. package/src/actions/handle-action.guild-admin.ts +411 -0
  33. package/src/actions/handle-action.test.ts +185 -0
  34. package/src/actions/handle-action.ts +332 -0
  35. package/src/actions/runtime.guild.ts +446 -0
  36. package/src/actions/runtime.messaging.messages.ts +205 -0
  37. package/src/actions/runtime.messaging.reactions.ts +67 -0
  38. package/src/actions/runtime.messaging.runtime.ts +69 -0
  39. package/src/actions/runtime.messaging.send.ts +244 -0
  40. package/src/actions/runtime.messaging.shared.ts +92 -0
  41. package/src/actions/runtime.messaging.ts +37 -0
  42. package/src/actions/runtime.moderation-shared.ts +48 -0
  43. package/src/actions/runtime.moderation.authz.test.ts +151 -0
  44. package/src/actions/runtime.moderation.ts +116 -0
  45. package/src/actions/runtime.presence.test.ts +160 -0
  46. package/src/actions/runtime.presence.ts +117 -0
  47. package/src/actions/runtime.shared.ts +83 -0
  48. package/src/actions/runtime.test.ts +1056 -0
  49. package/src/actions/runtime.ts +81 -0
  50. package/src/api-barrel.test.ts +80 -0
  51. package/src/api.test.ts +130 -0
  52. package/src/api.ts +169 -0
  53. package/src/approval-handler.runtime.test.ts +41 -0
  54. package/src/approval-handler.runtime.ts +632 -0
  55. package/src/approval-native.test.ts +330 -0
  56. package/src/approval-native.ts +219 -0
  57. package/src/approval-runtime.ts +14 -0
  58. package/src/approval-shared.ts +53 -0
  59. package/src/audit-core.ts +141 -0
  60. package/src/audit.test.ts +145 -0
  61. package/src/audit.ts +32 -0
  62. package/src/channel-actions.contract.test.ts +45 -0
  63. package/src/channel-actions.runtime.ts +1 -0
  64. package/src/channel-actions.test.ts +236 -0
  65. package/src/channel-actions.ts +198 -0
  66. package/src/channel-api.ts +28 -0
  67. package/src/channel.conversation.ts +159 -0
  68. package/src/channel.loaders.ts +47 -0
  69. package/src/channel.runtime.ts +1 -0
  70. package/src/channel.setup.ts +12 -0
  71. package/src/channel.test.ts +539 -12
  72. package/src/channel.ts +596 -430
  73. package/src/chunk.test.ts +157 -0
  74. package/src/chunk.ts +321 -0
  75. package/src/client.proxy.test.ts +176 -0
  76. package/src/client.test.ts +76 -0
  77. package/src/client.ts +139 -0
  78. package/src/component-custom-id.ts +72 -0
  79. package/src/components-registry.ts +356 -0
  80. package/src/components.builders.ts +409 -0
  81. package/src/components.modal.ts +124 -0
  82. package/src/components.parse.ts +407 -0
  83. package/src/components.test.ts +312 -0
  84. package/src/components.ts +54 -0
  85. package/src/components.types.ts +187 -0
  86. package/src/config-schema.test.ts +325 -0
  87. package/src/config-schema.ts +6 -0
  88. package/src/config-ui-hints.ts +249 -0
  89. package/src/conversation-identity.ts +58 -0
  90. package/src/delivery-retry.ts +56 -0
  91. package/src/directory-cache.ts +116 -0
  92. package/src/directory-config.ts +58 -0
  93. package/src/directory-contract.test.ts +129 -0
  94. package/src/directory-live.test.ts +126 -0
  95. package/src/directory-live.ts +135 -0
  96. package/src/doctor-contract.ts +477 -0
  97. package/src/doctor-shared.ts +5 -0
  98. package/src/doctor.test.ts +405 -0
  99. package/src/doctor.ts +340 -0
  100. package/src/draft-chunking.test.ts +64 -0
  101. package/src/draft-chunking.ts +43 -0
  102. package/src/draft-stream.test.ts +159 -0
  103. package/src/draft-stream.ts +154 -0
  104. package/src/error-body.ts +38 -0
  105. package/src/exec-approvals.test.ts +88 -0
  106. package/src/exec-approvals.ts +110 -0
  107. package/src/gateway-logging.test.ts +98 -0
  108. package/src/gateway-logging.ts +67 -0
  109. package/src/group-policy.ts +113 -0
  110. package/src/guilds.ts +29 -0
  111. package/src/inbound-context.contract.test.ts +11 -0
  112. package/src/interactive-dispatch.ts +104 -0
  113. package/src/internal/api.commands.ts +51 -0
  114. package/src/internal/api.guild.ts +164 -0
  115. package/src/internal/api.interactions.ts +53 -0
  116. package/src/internal/api.messages.ts +113 -0
  117. package/src/internal/api.reactions.ts +38 -0
  118. package/src/internal/api.test.ts +262 -0
  119. package/src/internal/api.ts +61 -0
  120. package/src/internal/api.users.ts +19 -0
  121. package/src/internal/api.webhooks.ts +13 -0
  122. package/src/internal/client.test.ts +297 -0
  123. package/src/internal/client.ts +246 -0
  124. package/src/internal/command-deploy.ts +202 -0
  125. package/src/internal/commands.ts +188 -0
  126. package/src/internal/components.base.ts +65 -0
  127. package/src/internal/components.message.ts +279 -0
  128. package/src/internal/components.modal.ts +95 -0
  129. package/src/internal/components.ts +31 -0
  130. package/src/internal/discord.ts +11 -0
  131. package/src/internal/embeds.ts +35 -0
  132. package/src/internal/entity-cache.ts +98 -0
  133. package/src/internal/event-queue.ts +162 -0
  134. package/src/internal/gateway-close-codes.ts +25 -0
  135. package/src/internal/gateway-dispatch.ts +96 -0
  136. package/src/internal/gateway-identify-limiter.ts +26 -0
  137. package/src/internal/gateway-lifecycle.ts +61 -0
  138. package/src/internal/gateway-rate-limit.ts +104 -0
  139. package/src/internal/gateway.test.ts +475 -0
  140. package/src/internal/gateway.ts +437 -0
  141. package/src/internal/interaction-dispatch.test.ts +148 -0
  142. package/src/internal/interaction-dispatch.ts +130 -0
  143. package/src/internal/interaction-options.ts +98 -0
  144. package/src/internal/interaction-response.ts +53 -0
  145. package/src/internal/interactions.test.ts +253 -0
  146. package/src/internal/interactions.ts +337 -0
  147. package/src/internal/listeners.ts +85 -0
  148. package/src/internal/live-smoke.live.test.ts +26 -0
  149. package/src/internal/modal-fields.ts +95 -0
  150. package/src/internal/payload.ts +69 -0
  151. package/src/internal/rest-body.ts +115 -0
  152. package/src/internal/rest-errors.ts +88 -0
  153. package/src/internal/rest-routes.ts +50 -0
  154. package/src/internal/rest-scheduler.ts +412 -0
  155. package/src/internal/rest.test.ts +437 -0
  156. package/src/internal/rest.ts +213 -0
  157. package/src/internal/schemas.ts +36 -0
  158. package/src/internal/structures.ts +278 -0
  159. package/src/internal/test-builders.test-support.ts +163 -0
  160. package/src/internal/voice.ts +49 -0
  161. package/src/media-detection.ts +28 -0
  162. package/src/mentions.test.ts +111 -0
  163. package/src/mentions.ts +147 -0
  164. package/src/monitor/access-groups.ts +55 -0
  165. package/src/monitor/ack-reactions.ts +70 -0
  166. package/src/monitor/acp-bind-here.integration.test.ts +211 -0
  167. package/src/monitor/agent-components-auth.ts +7 -0
  168. package/src/monitor/agent-components-context.ts +144 -0
  169. package/src/monitor/agent-components-data.ts +224 -0
  170. package/src/monitor/agent-components-dm-auth.ts +221 -0
  171. package/src/monitor/agent-components-guild-auth.ts +322 -0
  172. package/src/monitor/agent-components-helpers.runtime.ts +5 -0
  173. package/src/monitor/agent-components-helpers.ts +34 -0
  174. package/src/monitor/agent-components-reply.ts +10 -0
  175. package/src/monitor/agent-components.deps.runtime.ts +2 -0
  176. package/src/monitor/agent-components.dispatch.ts +366 -0
  177. package/src/monitor/agent-components.handlers.ts +303 -0
  178. package/src/monitor/agent-components.modal.ts +160 -0
  179. package/src/monitor/agent-components.plugin-interactive.ts +187 -0
  180. package/src/monitor/agent-components.runtime.ts +14 -0
  181. package/src/monitor/agent-components.system-controls.ts +211 -0
  182. package/src/monitor/agent-components.ts +70 -0
  183. package/src/monitor/agent-components.types.ts +57 -0
  184. package/src/monitor/agent-components.wildcard-controls.ts +168 -0
  185. package/src/monitor/agent-components.wildcard.test.ts +71 -0
  186. package/src/monitor/allow-list.ts +623 -0
  187. package/src/monitor/auto-presence.test.ts +156 -0
  188. package/src/monitor/auto-presence.ts +356 -0
  189. package/src/monitor/channel-access.ts +70 -0
  190. package/src/monitor/commands.test.ts +24 -0
  191. package/src/monitor/commands.ts +9 -0
  192. package/src/monitor/dm-command-auth.test.ts +197 -0
  193. package/src/monitor/dm-command-auth.ts +158 -0
  194. package/src/monitor/dm-command-decision.test.ts +113 -0
  195. package/src/monitor/dm-command-decision.ts +49 -0
  196. package/src/monitor/exec-approvals.test.ts +226 -0
  197. package/src/monitor/exec-approvals.ts +158 -0
  198. package/src/monitor/format.ts +45 -0
  199. package/src/monitor/gateway-handle.ts +34 -0
  200. package/src/monitor/gateway-metadata.test.ts +29 -0
  201. package/src/monitor/gateway-metadata.ts +298 -0
  202. package/src/monitor/gateway-plugin.test.ts +297 -0
  203. package/src/monitor/gateway-plugin.ts +294 -0
  204. package/src/monitor/gateway-registry.ts +37 -0
  205. package/src/monitor/gateway-supervisor.test.ts +150 -0
  206. package/src/monitor/gateway-supervisor.ts +206 -0
  207. package/src/monitor/inbound-context.test-helpers.ts +37 -0
  208. package/src/monitor/inbound-context.test.ts +106 -0
  209. package/src/monitor/inbound-context.ts +103 -0
  210. package/src/monitor/inbound-dedupe.ts +79 -0
  211. package/src/monitor/inbound-job.test.ts +203 -0
  212. package/src/monitor/inbound-job.ts +118 -0
  213. package/src/monitor/listeners.queue.ts +91 -0
  214. package/src/monitor/listeners.reactions.ts +610 -0
  215. package/src/monitor/listeners.test.ts +200 -0
  216. package/src/monitor/listeners.ts +150 -0
  217. package/src/monitor/message-channel-info.ts +96 -0
  218. package/src/monitor/message-forwarded.ts +107 -0
  219. package/src/monitor/message-handler.batch-gate.test.ts +22 -0
  220. package/src/monitor/message-handler.batch-gate.ts +19 -0
  221. package/src/monitor/message-handler.bot-self-filter.test.ts +68 -0
  222. package/src/monitor/message-handler.context.ts +393 -0
  223. package/src/monitor/message-handler.dm-preflight.ts +123 -0
  224. package/src/monitor/message-handler.draft-preview.ts +246 -0
  225. package/src/monitor/message-handler.hydration.test.ts +80 -0
  226. package/src/monitor/message-handler.hydration.ts +198 -0
  227. package/src/monitor/message-handler.inbound-context.test.ts +59 -0
  228. package/src/monitor/message-handler.module-test-helpers.ts +31 -0
  229. package/src/monitor/message-handler.preflight-channel-access.ts +86 -0
  230. package/src/monitor/message-handler.preflight-channel-context.ts +55 -0
  231. package/src/monitor/message-handler.preflight-context.ts +54 -0
  232. package/src/monitor/message-handler.preflight-helpers.ts +164 -0
  233. package/src/monitor/message-handler.preflight-history.ts +23 -0
  234. package/src/monitor/message-handler.preflight-logging.ts +36 -0
  235. package/src/monitor/message-handler.preflight-pluralkit.ts +27 -0
  236. package/src/monitor/message-handler.preflight-runtime.ts +28 -0
  237. package/src/monitor/message-handler.preflight-thread.ts +49 -0
  238. package/src/monitor/message-handler.preflight.acp-bindings.test.ts +369 -0
  239. package/src/monitor/message-handler.preflight.test-helpers.ts +111 -0
  240. package/src/monitor/message-handler.preflight.test.ts +1544 -0
  241. package/src/monitor/message-handler.preflight.ts +680 -0
  242. package/src/monitor/message-handler.preflight.types.ts +109 -0
  243. package/src/monitor/message-handler.process.test.ts +1301 -0
  244. package/src/monitor/message-handler.process.ts +684 -0
  245. package/src/monitor/message-handler.queue.test.ts +496 -0
  246. package/src/monitor/message-handler.routing-preflight.ts +112 -0
  247. package/src/monitor/message-handler.test-harness.ts +99 -0
  248. package/src/monitor/message-handler.test-helpers.ts +75 -0
  249. package/src/monitor/message-handler.ts +274 -0
  250. package/src/monitor/message-media.ts +507 -0
  251. package/src/monitor/message-run-queue.ts +101 -0
  252. package/src/monitor/message-text.ts +171 -0
  253. package/src/monitor/message-utils.test.ts +1151 -0
  254. package/src/monitor/message-utils.ts +32 -0
  255. package/src/monitor/model-picker-preferences.test.ts +67 -0
  256. package/src/monitor/model-picker-preferences.ts +184 -0
  257. package/src/monitor/model-picker.state.ts +364 -0
  258. package/src/monitor/model-picker.test-utils.ts +26 -0
  259. package/src/monitor/model-picker.test.ts +794 -0
  260. package/src/monitor/model-picker.ts +38 -0
  261. package/src/monitor/model-picker.view.ts +695 -0
  262. package/src/monitor/monitor.agent-components.test.ts +375 -0
  263. package/src/monitor/monitor.test.ts +849 -0
  264. package/src/monitor/monitor.threading-utils.test.ts +598 -0
  265. package/src/monitor/native-command-agent-reply.ts +123 -0
  266. package/src/monitor/native-command-arg-ui.ts +233 -0
  267. package/src/monitor/native-command-auth.ts +308 -0
  268. package/src/monitor/native-command-bypass.ts +13 -0
  269. package/src/monitor/native-command-context.test.ts +98 -0
  270. package/src/monitor/native-command-context.ts +103 -0
  271. package/src/monitor/native-command-dispatch.ts +35 -0
  272. package/src/monitor/native-command-model-picker-apply.ts +177 -0
  273. package/src/monitor/native-command-model-picker-interaction.ts +461 -0
  274. package/src/monitor/native-command-model-picker-ui.ts +368 -0
  275. package/src/monitor/native-command-reply.test.ts +68 -0
  276. package/src/monitor/native-command-reply.ts +183 -0
  277. package/src/monitor/native-command-route.ts +91 -0
  278. package/src/monitor/native-command-status.ts +76 -0
  279. package/src/monitor/native-command-ui.ts +26 -0
  280. package/src/monitor/native-command-ui.types.ts +20 -0
  281. package/src/monitor/native-command.args.ts +45 -0
  282. package/src/monitor/native-command.command-arg.test.ts +99 -0
  283. package/src/monitor/native-command.commands-allowfrom.test.ts +490 -0
  284. package/src/monitor/native-command.model-picker.test.ts +767 -0
  285. package/src/monitor/native-command.options.test.ts +369 -0
  286. package/src/monitor/native-command.options.ts +153 -0
  287. package/src/monitor/native-command.plugin-dispatch.test.ts +879 -0
  288. package/src/monitor/native-command.runtime.ts +50 -0
  289. package/src/monitor/native-command.status-direct.test.ts +272 -0
  290. package/src/monitor/native-command.test-helpers.ts +64 -0
  291. package/src/monitor/native-command.think-autocomplete.test.ts +416 -0
  292. package/src/monitor/native-command.ts +699 -0
  293. package/src/monitor/native-command.types.ts +9 -0
  294. package/src/monitor/native-interaction-channel-context.ts +50 -0
  295. package/src/monitor/preflight-audio.runtime.ts +9 -0
  296. package/src/monitor/preflight-audio.test.ts +157 -0
  297. package/src/monitor/preflight-audio.ts +130 -0
  298. package/src/monitor/presence-cache.ts +61 -0
  299. package/src/monitor/presence.test.ts +44 -0
  300. package/src/monitor/presence.ts +50 -0
  301. package/src/monitor/provider-session.runtime.ts +12 -0
  302. package/src/monitor/provider.acp.ts +89 -0
  303. package/src/monitor/provider.allowlist.test.ts +149 -0
  304. package/src/monitor/provider.allowlist.ts +394 -0
  305. package/src/monitor/provider.cleanup.ts +41 -0
  306. package/src/monitor/provider.commands.ts +129 -0
  307. package/src/monitor/provider.config-log.ts +45 -0
  308. package/src/monitor/provider.deploy-errors.ts +362 -0
  309. package/src/monitor/provider.deploy.ts +221 -0
  310. package/src/monitor/provider.interactions.ts +160 -0
  311. package/src/monitor/provider.lifecycle.test.ts +658 -0
  312. package/src/monitor/provider.lifecycle.ts +545 -0
  313. package/src/monitor/provider.proxy.test.ts +745 -0
  314. package/src/monitor/provider.rest-proxy.test.ts +121 -0
  315. package/src/monitor/provider.runtime.ts +1 -0
  316. package/src/monitor/provider.skill-dedupe.test.ts +42 -0
  317. package/src/monitor/provider.startup-log.ts +32 -0
  318. package/src/monitor/provider.startup.test.ts +426 -0
  319. package/src/monitor/provider.startup.ts +323 -0
  320. package/src/monitor/provider.test.ts +1111 -0
  321. package/src/monitor/provider.ts +713 -0
  322. package/src/monitor/reply-context.ts +64 -0
  323. package/src/monitor/reply-delivery.test.ts +244 -0
  324. package/src/monitor/reply-delivery.ts +203 -0
  325. package/src/monitor/rest-fetch.ts +43 -0
  326. package/src/monitor/route-resolution.test.ts +204 -0
  327. package/src/monitor/route-resolution.ts +140 -0
  328. package/src/monitor/sender-identity.ts +81 -0
  329. package/src/monitor/startup-status.test.ts +30 -0
  330. package/src/monitor/startup-status.ts +10 -0
  331. package/src/monitor/status.ts +22 -0
  332. package/src/monitor/system-events.ts +55 -0
  333. package/src/monitor/thread-bindings.config.ts +35 -0
  334. package/src/monitor/thread-bindings.discord-api.test.ts +229 -0
  335. package/src/monitor/thread-bindings.discord-api.ts +318 -0
  336. package/src/monitor/thread-bindings.lifecycle.test.ts +1871 -0
  337. package/src/monitor/thread-bindings.lifecycle.ts +354 -0
  338. package/src/monitor/thread-bindings.manager.ts +553 -0
  339. package/src/monitor/thread-bindings.messages.ts +6 -0
  340. package/src/monitor/thread-bindings.persona.test.ts +34 -0
  341. package/src/monitor/thread-bindings.persona.ts +25 -0
  342. package/src/monitor/thread-bindings.session-adapter.ts +229 -0
  343. package/src/monitor/thread-bindings.session-shared.ts +59 -0
  344. package/src/monitor/thread-bindings.session-updates.ts +35 -0
  345. package/src/monitor/thread-bindings.shared-state.test.ts +36 -0
  346. package/src/monitor/thread-bindings.state.ts +540 -0
  347. package/src/monitor/thread-bindings.ts +48 -0
  348. package/src/monitor/thread-bindings.types.ts +83 -0
  349. package/src/monitor/thread-channel-context.ts +112 -0
  350. package/src/monitor/thread-session-close.test.ts +180 -0
  351. package/src/monitor/thread-session-close.ts +63 -0
  352. package/src/monitor/thread-title.generate.test.ts +197 -0
  353. package/src/monitor/thread-title.test.ts +31 -0
  354. package/src/monitor/thread-title.ts +181 -0
  355. package/src/monitor/threading.auto-thread.test.ts +327 -0
  356. package/src/monitor/threading.auto-thread.ts +287 -0
  357. package/src/monitor/threading.cache.ts +45 -0
  358. package/src/monitor/threading.parent-info.test.ts +156 -0
  359. package/src/monitor/threading.starter.test.ts +260 -0
  360. package/src/monitor/threading.starter.ts +287 -0
  361. package/src/monitor/threading.ts +20 -0
  362. package/src/monitor/threading.types.ts +102 -0
  363. package/src/monitor/timeouts.ts +84 -0
  364. package/src/monitor/typing.test.ts +42 -0
  365. package/src/monitor/typing.ts +17 -0
  366. package/src/monitor.gateway.test.ts +187 -0
  367. package/src/monitor.gateway.ts +75 -0
  368. package/src/monitor.test.ts +1397 -0
  369. package/src/monitor.ts +28 -0
  370. package/src/normalize.test.ts +56 -0
  371. package/src/normalize.ts +86 -0
  372. package/src/outbound-adapter.interactive-order.test.ts +64 -0
  373. package/src/outbound-adapter.test-harness.ts +207 -0
  374. package/src/outbound-adapter.test.ts +696 -0
  375. package/src/outbound-adapter.ts +291 -0
  376. package/src/outbound-approval.ts +29 -0
  377. package/src/outbound-components.ts +81 -0
  378. package/src/outbound-payload.contract.test.ts +38 -0
  379. package/src/outbound-payload.ts +134 -0
  380. package/src/outbound-send-context.ts +92 -0
  381. package/src/outbound-session-route.test.ts +34 -0
  382. package/src/outbound-session-route.ts +72 -0
  383. package/src/pluralkit.test.ts +67 -0
  384. package/src/pluralkit.ts +58 -0
  385. package/src/preview-streaming.ts +32 -0
  386. package/src/probe.intents.test.ts +94 -0
  387. package/src/probe.parse-token.test.ts +43 -0
  388. package/src/probe.runtime.ts +1 -0
  389. package/src/probe.ts +237 -0
  390. package/src/proxy-fetch.ts +92 -0
  391. package/src/proxy-request-client.test.ts +78 -0
  392. package/src/proxy-request-client.ts +54 -0
  393. package/src/recipient-resolution.ts +39 -0
  394. package/src/resolve-allowlist-common.test.ts +36 -0
  395. package/src/resolve-allowlist-common.ts +39 -0
  396. package/src/resolve-channels.test.ts +340 -0
  397. package/src/resolve-channels.ts +369 -0
  398. package/src/resolve-users.test.ts +222 -0
  399. package/src/resolve-users.ts +184 -0
  400. package/src/retry.test.ts +83 -0
  401. package/src/retry.ts +98 -0
  402. package/src/runtime-api.ts +64 -0
  403. package/src/runtime.ts +22 -5
  404. package/src/secret-config-contract.ts +140 -0
  405. package/src/security-audit.runtime.ts +1 -0
  406. package/src/security-audit.test.ts +246 -0
  407. package/src/security-audit.ts +208 -0
  408. package/src/security-contract.ts +47 -0
  409. package/src/security-doctor.test.ts +25 -0
  410. package/src/security-doctor.ts +20 -0
  411. package/src/security.ts +60 -0
  412. package/src/send-target-parsing.ts +14 -0
  413. package/src/send.channels.ts +139 -0
  414. package/src/send.components.test.ts +275 -0
  415. package/src/send.components.ts +383 -0
  416. package/src/send.creates-thread.test.ts +643 -0
  417. package/src/send.emojis-stickers.ts +57 -0
  418. package/src/send.guild.ts +170 -0
  419. package/src/send.message-request.ts +97 -0
  420. package/src/send.messages.test.ts +53 -0
  421. package/src/send.messages.ts +225 -0
  422. package/src/send.outbound.ts +414 -0
  423. package/src/send.permissions.authz.test.ts +188 -0
  424. package/src/send.permissions.ts +283 -0
  425. package/src/send.reactions.ts +155 -0
  426. package/src/send.sends-basic-channel-messages.test.ts +919 -0
  427. package/src/send.shared.ts +445 -0
  428. package/src/send.test-harness.ts +56 -0
  429. package/src/send.ts +82 -0
  430. package/src/send.types.ts +188 -0
  431. package/src/send.typing.test.ts +41 -0
  432. package/src/send.typing.ts +9 -0
  433. package/src/send.voice.ts +134 -0
  434. package/src/send.webhook-activity.test.ts +105 -0
  435. package/src/send.webhook.proxy.test.ts +191 -0
  436. package/src/send.webhook.ts +133 -0
  437. package/src/session-contract.ts +3 -0
  438. package/src/session-key-normalization.test.ts +44 -0
  439. package/src/session-key-normalization.ts +47 -0
  440. package/src/setup-account-state.test.ts +91 -0
  441. package/src/setup-account-state.ts +144 -0
  442. package/src/setup-adapter.ts +12 -0
  443. package/src/setup-core.ts +180 -0
  444. package/src/setup-runtime-helpers.ts +10 -0
  445. package/src/setup-surface.test.ts +96 -0
  446. package/src/setup-surface.ts +129 -0
  447. package/src/shared-interactive.test.ts +153 -0
  448. package/src/shared-interactive.ts +124 -0
  449. package/src/shared.test.ts +159 -0
  450. package/src/shared.ts +190 -0
  451. package/src/status-issues.test.ts +70 -0
  452. package/src/status-issues.ts +169 -0
  453. package/src/subagent-hooks.test.ts +40 -44
  454. package/src/subagent-hooks.ts +185 -122
  455. package/src/target-parsing.ts +53 -0
  456. package/src/target-resolver.ts +129 -0
  457. package/src/targets.test.ts +367 -0
  458. package/src/targets.ts +12 -0
  459. package/src/test-http-helpers.ts +10 -0
  460. package/src/test-support/component-runtime.ts +190 -0
  461. package/src/test-support/config.ts +7 -0
  462. package/src/test-support/configured-binding-runtime.ts +29 -0
  463. package/src/test-support/partial-channel.ts +26 -0
  464. package/src/test-support/provider.test-support.ts +545 -0
  465. package/src/token.test.ts +107 -0
  466. package/src/token.ts +60 -0
  467. package/src/ui-colors.ts +27 -0
  468. package/src/ui.ts +20 -0
  469. package/src/voice/access.test.ts +217 -0
  470. package/src/voice/access.ts +124 -0
  471. package/src/voice/audio.ts +173 -0
  472. package/src/voice/capture-state.test.ts +48 -0
  473. package/src/voice/capture-state.ts +120 -0
  474. package/src/voice/command.test.ts +164 -0
  475. package/src/voice/command.ts +283 -0
  476. package/src/voice/config.ts +8 -0
  477. package/src/voice/manager.e2e.test.ts +928 -0
  478. package/src/voice/manager.ready-listener.test.ts +37 -0
  479. package/src/voice/manager.runtime.ts +11 -0
  480. package/src/voice/manager.ts +691 -0
  481. package/src/voice/prompt.test.ts +16 -0
  482. package/src/voice/prompt.ts +17 -0
  483. package/src/voice/receive-recovery.test.ts +79 -0
  484. package/src/voice/receive-recovery.ts +159 -0
  485. package/src/voice/sanitize.test.ts +34 -0
  486. package/src/voice/sanitize.ts +32 -0
  487. package/src/voice/sdk-runtime.ts +14 -0
  488. package/src/voice/segment.ts +156 -0
  489. package/src/voice/session.ts +50 -0
  490. package/src/voice/speaker-context.ts +127 -0
  491. package/src/voice/tts.ts +125 -0
  492. package/src/voice-message.test.ts +234 -0
  493. package/src/voice-message.ts +444 -0
  494. package/subagent-hooks-api.ts +27 -0
  495. package/test-api.ts +4 -0
  496. package/thread-binding-api.ts +1 -0
  497. package/timeouts.ts +6 -0
  498. package/tsconfig.json +16 -0
@@ -0,0 +1,369 @@
1
+ import { ChannelType } from "discord-api-types/v10";
2
+ import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";
3
+ import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
4
+
5
+ const { logVerboseMock } = vi.hoisted(() => ({
6
+ logVerboseMock: vi.fn(),
7
+ }));
8
+ const { loggerWarnMock } = vi.hoisted(() => ({
9
+ loggerWarnMock: vi.fn(),
10
+ }));
11
+
12
+ vi.mock("openclaw/plugin-sdk/runtime-env", async () => {
13
+ const actual = await vi.importActual<typeof import("openclaw/plugin-sdk/runtime-env")>(
14
+ "openclaw/plugin-sdk/runtime-env",
15
+ );
16
+ return {
17
+ ...actual,
18
+ createSubsystemLogger: () => ({
19
+ child: vi.fn(),
20
+ info: vi.fn(),
21
+ error: vi.fn(),
22
+ warn: loggerWarnMock,
23
+ debug: vi.fn(),
24
+ }),
25
+ logVerbose: logVerboseMock,
26
+ };
27
+ });
28
+
29
+ vi.mock("openclaw/plugin-sdk/agent-runtime", () => ({
30
+ resolveHumanDelayConfig: () => undefined,
31
+ }));
32
+
33
+ let listNativeCommandSpecs: typeof import("openclaw/plugin-sdk/command-auth").listNativeCommandSpecs;
34
+ let createDiscordNativeCommand: typeof import("./native-command.js").createDiscordNativeCommand;
35
+ let createNoopThreadBindingManager: typeof import("./thread-bindings.js").createNoopThreadBindingManager;
36
+
37
+ function createNativeCommand(
38
+ name: string,
39
+ opts?: {
40
+ cfg?: OpenClawConfig;
41
+ discordConfig?: NonNullable<OpenClawConfig["channels"]>["discord"];
42
+ },
43
+ ): ReturnType<typeof import("./native-command.js").createDiscordNativeCommand> {
44
+ const command = listNativeCommandSpecs({ provider: "discord" }).find(
45
+ (entry) => entry.name === name,
46
+ );
47
+ if (!command) {
48
+ throw new Error(`missing native command: ${name}`);
49
+ }
50
+ const baseCfg: OpenClawConfig = opts?.cfg ?? {};
51
+ const discordConfig: NonNullable<OpenClawConfig["channels"]>["discord"] =
52
+ opts?.discordConfig ?? baseCfg.channels?.discord ?? {};
53
+ const cfg =
54
+ opts?.discordConfig === undefined
55
+ ? baseCfg
56
+ : {
57
+ ...baseCfg,
58
+ channels: {
59
+ ...baseCfg.channels,
60
+ discord: discordConfig,
61
+ },
62
+ };
63
+ return createDiscordNativeCommand({
64
+ command,
65
+ cfg,
66
+ discordConfig,
67
+ accountId: "default",
68
+ sessionPrefix: "discord:slash",
69
+ ephemeralDefault: true,
70
+ threadBindings: createNoopThreadBindingManager("default"),
71
+ });
72
+ }
73
+
74
+ type CommandOption = NonNullable<
75
+ ReturnType<typeof import("./native-command.js").createDiscordNativeCommand>["options"]
76
+ >[number];
77
+
78
+ function findOption(
79
+ command: ReturnType<typeof import("./native-command.js").createDiscordNativeCommand>,
80
+ name: string,
81
+ ): CommandOption | undefined {
82
+ return command.options?.find((entry) => entry.name === name);
83
+ }
84
+
85
+ function requireOption(
86
+ command: ReturnType<typeof import("./native-command.js").createDiscordNativeCommand>,
87
+ name: string,
88
+ ): CommandOption {
89
+ const option = findOption(command, name);
90
+ if (!option) {
91
+ throw new Error(`missing command option: ${name}`);
92
+ }
93
+ return option;
94
+ }
95
+
96
+ function readAutocomplete(option: CommandOption | undefined): unknown {
97
+ if (!option || typeof option !== "object") {
98
+ return undefined;
99
+ }
100
+ return (option as { autocomplete?: unknown }).autocomplete;
101
+ }
102
+
103
+ function readChoices(option: CommandOption | undefined): unknown[] | undefined {
104
+ if (!option || typeof option !== "object") {
105
+ return undefined;
106
+ }
107
+ const value = (option as { choices?: unknown }).choices;
108
+ return Array.isArray(value) ? value : undefined;
109
+ }
110
+
111
+ function requireAutocomplete(option: CommandOption, errorMessage: string) {
112
+ const autocomplete = readAutocomplete(option);
113
+ if (typeof autocomplete !== "function") {
114
+ throw new Error(errorMessage);
115
+ }
116
+ return autocomplete as (interaction: unknown) => Promise<unknown>;
117
+ }
118
+
119
+ async function runAutocomplete(
120
+ autocomplete: (interaction: unknown) => Promise<unknown>,
121
+ params: {
122
+ userId: string;
123
+ username?: string;
124
+ globalName?: string;
125
+ channelType: ChannelType;
126
+ channelId: string;
127
+ channelName: string;
128
+ guildId?: string;
129
+ focusedValue: string;
130
+ },
131
+ ) {
132
+ const respond = vi.fn(async (_choices: unknown[]) => undefined);
133
+
134
+ await autocomplete({
135
+ user: {
136
+ id: params.userId,
137
+ username: params.username ?? params.userId,
138
+ globalName: params.globalName ?? params.userId,
139
+ },
140
+ channel: {
141
+ type: params.channelType,
142
+ id: params.channelId,
143
+ name: params.channelName,
144
+ },
145
+ guild: params.guildId ? { id: params.guildId } : undefined,
146
+ rawData: {
147
+ member: { roles: [] },
148
+ },
149
+ options: {
150
+ getFocused: () => ({ value: params.focusedValue }),
151
+ },
152
+ respond,
153
+ client: {},
154
+ } as never);
155
+
156
+ return respond;
157
+ }
158
+
159
+ describe("createDiscordNativeCommand option wiring", () => {
160
+ beforeAll(async () => {
161
+ ({ listNativeCommandSpecs } = await import("openclaw/plugin-sdk/command-auth"));
162
+ ({ createDiscordNativeCommand } = await import("./native-command.js"));
163
+ ({ createNoopThreadBindingManager } = await import("./thread-bindings.js"));
164
+ });
165
+
166
+ beforeEach(() => {
167
+ logVerboseMock.mockReset();
168
+ loggerWarnMock.mockReset();
169
+ });
170
+
171
+ it("uses autocomplete for /acp action so inline action values are accepted", async () => {
172
+ const command = createNativeCommand("acp");
173
+ const action = requireOption(command, "action");
174
+ const autocomplete = requireAutocomplete(action, "acp action option did not wire autocomplete");
175
+
176
+ expect(readChoices(action)).toBeUndefined();
177
+ const respond = await runAutocomplete(autocomplete, {
178
+ userId: "owner",
179
+ username: "tester",
180
+ globalName: "Tester",
181
+ channelType: ChannelType.DM,
182
+ channelId: "dm-1",
183
+ channelName: "dm-1",
184
+ focusedValue: "st",
185
+ });
186
+ expect(respond).toHaveBeenCalledWith([
187
+ { name: "steer", value: "steer" },
188
+ { name: "status", value: "status" },
189
+ { name: "install", value: "install" },
190
+ ]);
191
+ });
192
+
193
+ it("keeps static choices for non-acp string action arguments", () => {
194
+ const command = createNativeCommand("config");
195
+ const action = requireOption(command, "action");
196
+ const choices = readChoices(action);
197
+
198
+ expect(readAutocomplete(action)).toBeUndefined();
199
+ expect(choices).toEqual(
200
+ expect.arrayContaining([
201
+ expect.objectContaining({ name: expect.any(String), value: expect.any(String) }),
202
+ ]),
203
+ );
204
+ });
205
+
206
+ it("returns no autocomplete choices for unauthorized users", async () => {
207
+ const command = createNativeCommand("think", {
208
+ cfg: {
209
+ commands: {
210
+ allowFrom: {
211
+ discord: ["user:allowed-user"],
212
+ },
213
+ },
214
+ } as OpenClawConfig,
215
+ });
216
+ const level = requireOption(command, "level");
217
+ const autocomplete = requireAutocomplete(level, "think level option did not wire autocomplete");
218
+ const respond = await runAutocomplete(autocomplete, {
219
+ userId: "blocked-user",
220
+ username: "blocked",
221
+ globalName: "Blocked",
222
+ channelType: ChannelType.GuildText,
223
+ channelId: "channel-1",
224
+ channelName: "general",
225
+ guildId: "guild-1",
226
+ focusedValue: "",
227
+ });
228
+
229
+ expect(respond).toHaveBeenCalledWith([]);
230
+ });
231
+
232
+ it("returns no autocomplete choices outside the Discord allowlist when commands.useAccessGroups is false and commands.allowFrom is not configured", async () => {
233
+ const command = createNativeCommand("think", {
234
+ cfg: {
235
+ commands: {
236
+ useAccessGroups: false,
237
+ },
238
+ channels: {
239
+ discord: {
240
+ groupPolicy: "allowlist",
241
+ guilds: {
242
+ "other-guild": {
243
+ channels: {
244
+ "other-channel": {
245
+ enabled: true,
246
+ requireMention: false,
247
+ },
248
+ },
249
+ },
250
+ },
251
+ },
252
+ },
253
+ } as OpenClawConfig,
254
+ });
255
+ const level = requireOption(command, "level");
256
+ const autocomplete = requireAutocomplete(level, "think level option did not wire autocomplete");
257
+ const respond = await runAutocomplete(autocomplete, {
258
+ userId: "allowed-user",
259
+ username: "allowed",
260
+ globalName: "Allowed",
261
+ channelType: ChannelType.GuildText,
262
+ channelId: "channel-1",
263
+ channelName: "general",
264
+ guildId: "guild-1",
265
+ focusedValue: "xh",
266
+ });
267
+
268
+ expect(respond).toHaveBeenCalledWith([]);
269
+ });
270
+
271
+ it("returns no autocomplete choices for group DMs outside dm.groupChannels", async () => {
272
+ const discordConfig = {
273
+ dm: {
274
+ enabled: true,
275
+ policy: "open",
276
+ groupEnabled: true,
277
+ groupChannels: ["allowed-group"],
278
+ },
279
+ } satisfies NonNullable<OpenClawConfig["channels"]>["discord"];
280
+ const command = createNativeCommand("think", {
281
+ cfg: {
282
+ commands: {
283
+ allowFrom: {
284
+ discord: ["user:allowed-user"],
285
+ },
286
+ },
287
+ } as OpenClawConfig,
288
+ discordConfig,
289
+ });
290
+ const level = requireOption(command, "level");
291
+ const autocomplete = requireAutocomplete(level, "think level option did not wire autocomplete");
292
+ const respond = await runAutocomplete(autocomplete, {
293
+ userId: "allowed-user",
294
+ username: "allowed",
295
+ globalName: "Allowed",
296
+ channelType: ChannelType.GroupDM,
297
+ channelId: "blocked-group",
298
+ channelName: "Blocked Group",
299
+ focusedValue: "xh",
300
+ });
301
+
302
+ expect(respond).toHaveBeenCalledWith([]);
303
+ });
304
+
305
+ it("truncates Discord command and option descriptions to Discord's limit", () => {
306
+ const longDescription = "x".repeat(140);
307
+ const cfg = {} as OpenClawConfig;
308
+ const discordConfig = {} as NonNullable<OpenClawConfig["channels"]>["discord"];
309
+ const command = createDiscordNativeCommand({
310
+ command: {
311
+ name: "longdesc",
312
+ description: longDescription,
313
+ acceptsArgs: true,
314
+ args: [
315
+ {
316
+ name: "input",
317
+ description: longDescription,
318
+ type: "string",
319
+ required: false,
320
+ },
321
+ ],
322
+ },
323
+ cfg,
324
+ discordConfig,
325
+ accountId: "default",
326
+ sessionPrefix: "discord:slash",
327
+ ephemeralDefault: true,
328
+ threadBindings: createNoopThreadBindingManager("default"),
329
+ });
330
+
331
+ expect(command.description).toHaveLength(100);
332
+ expect(command.description).toBe("x".repeat(100));
333
+ expect(requireOption(command, "input").description).toHaveLength(100);
334
+ expect(requireOption(command, "input").description).toBe("x".repeat(100));
335
+ });
336
+
337
+ it("serializes localized command descriptions", () => {
338
+ const longDescription = "k".repeat(140);
339
+ const command = createDiscordNativeCommand({
340
+ command: {
341
+ name: "localized",
342
+ description: "Default description",
343
+ descriptionLocalizations: {
344
+ ko: "현지화된 설명",
345
+ "en-GB": longDescription,
346
+ },
347
+ acceptsArgs: false,
348
+ },
349
+ cfg: {} as OpenClawConfig,
350
+ discordConfig: {},
351
+ accountId: "default",
352
+ sessionPrefix: "discord:slash",
353
+ ephemeralDefault: true,
354
+ threadBindings: createNoopThreadBindingManager("default"),
355
+ });
356
+
357
+ expect(command.descriptionLocalizations).toEqual({
358
+ ko: "현지화된 설명",
359
+ "en-GB": "k".repeat(100),
360
+ });
361
+ expect(command.serialize()).toMatchObject({
362
+ description: "Default description",
363
+ description_localizations: {
364
+ ko: "현지화된 설명",
365
+ "en-GB": "k".repeat(100),
366
+ },
367
+ });
368
+ });
369
+ });
@@ -0,0 +1,153 @@
1
+ import { ApplicationCommandOptionType } from "discord-api-types/v10";
2
+ import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";
3
+ import {
4
+ resolveCommandArgChoices,
5
+ type ChatCommandDefinition,
6
+ } from "openclaw/plugin-sdk/native-command-registry";
7
+ import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
8
+ import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/text-runtime";
9
+ import type { AutocompleteInteraction, CommandOptions } from "../internal/discord.js";
10
+
11
+ const log = createSubsystemLogger("discord/native-command");
12
+
13
+ // Discord application command and option descriptions are limited to 1-100 chars.
14
+ // https://discord.com/developers/docs/interactions/application-commands#application-command-object-application-command-structure
15
+ const DISCORD_COMMAND_DESCRIPTION_MAX = 100;
16
+
17
+ export function truncateDiscordCommandDescription(params: {
18
+ value: string;
19
+ label: string;
20
+ }): string {
21
+ const { value, label } = params;
22
+ if (value.length <= DISCORD_COMMAND_DESCRIPTION_MAX) {
23
+ return value;
24
+ }
25
+ log.warn(
26
+ `discord: truncating native command description (${label}) from ${value.length} to ${DISCORD_COMMAND_DESCRIPTION_MAX}: ${JSON.stringify(value)}`,
27
+ );
28
+ return value.slice(0, DISCORD_COMMAND_DESCRIPTION_MAX);
29
+ }
30
+
31
+ export function truncateDiscordCommandDescriptionLocalizations(params: {
32
+ value?: Record<string, string>;
33
+ label: string;
34
+ }): Record<string, string> | undefined {
35
+ const entries = Object.entries(params.value ?? {});
36
+ if (entries.length === 0) {
37
+ return undefined;
38
+ }
39
+ return Object.fromEntries(
40
+ entries.map(([locale, description]) => [
41
+ locale,
42
+ truncateDiscordCommandDescription({
43
+ value: description,
44
+ label: `${params.label} locale:${locale}`,
45
+ }),
46
+ ]),
47
+ );
48
+ }
49
+
50
+ function resolveDiscordCommandLogLabel(command: ChatCommandDefinition): string {
51
+ if (typeof command.nativeName === "string" && command.nativeName.trim().length > 0) {
52
+ return command.nativeName;
53
+ }
54
+ return command.key;
55
+ }
56
+
57
+ export function buildDiscordCommandOptions(params: {
58
+ command: ChatCommandDefinition;
59
+ cfg: OpenClawConfig;
60
+ authorizeChoiceContext?: (interaction: AutocompleteInteraction) => Promise<boolean>;
61
+ resolveChoiceContext?: (
62
+ interaction: AutocompleteInteraction,
63
+ ) => Promise<{ provider?: string; model?: string } | null>;
64
+ }): CommandOptions | undefined {
65
+ const { command, cfg, authorizeChoiceContext, resolveChoiceContext } = params;
66
+ const commandLabel = resolveDiscordCommandLogLabel(command);
67
+ const args = command.args;
68
+ if (!args || args.length === 0) {
69
+ return undefined;
70
+ }
71
+ return args.map((arg) => {
72
+ const required = arg.required ?? false;
73
+ if (arg.type === "number") {
74
+ return {
75
+ name: arg.name,
76
+ description: truncateDiscordCommandDescription({
77
+ value: arg.description,
78
+ label: `command:${commandLabel} arg:${arg.name}`,
79
+ }),
80
+ type: ApplicationCommandOptionType.Number,
81
+ required,
82
+ };
83
+ }
84
+ if (arg.type === "boolean") {
85
+ return {
86
+ name: arg.name,
87
+ description: truncateDiscordCommandDescription({
88
+ value: arg.description,
89
+ label: `command:${commandLabel} arg:${arg.name}`,
90
+ }),
91
+ type: ApplicationCommandOptionType.Boolean,
92
+ required,
93
+ };
94
+ }
95
+ const resolvedChoices = resolveCommandArgChoices({ command, arg, cfg });
96
+ const shouldAutocomplete =
97
+ arg.preferAutocomplete === true ||
98
+ (resolvedChoices.length > 0 &&
99
+ (typeof arg.choices === "function" || resolvedChoices.length > 25));
100
+ const autocomplete = shouldAutocomplete
101
+ ? async (interaction: AutocompleteInteraction) => {
102
+ if (
103
+ typeof arg.choices === "function" &&
104
+ resolveChoiceContext &&
105
+ authorizeChoiceContext &&
106
+ !(await authorizeChoiceContext(interaction))
107
+ ) {
108
+ await interaction.respond([]);
109
+ return;
110
+ }
111
+ const focused = interaction.options.getFocused();
112
+ const focusValue = normalizeLowercaseStringOrEmpty(focused?.value);
113
+ const context =
114
+ typeof arg.choices === "function" && resolveChoiceContext
115
+ ? await resolveChoiceContext(interaction)
116
+ : null;
117
+ const choices = resolveCommandArgChoices({
118
+ command,
119
+ arg,
120
+ cfg,
121
+ provider: context?.provider,
122
+ model: context?.model,
123
+ });
124
+ const filtered = focusValue
125
+ ? choices.filter((choice) =>
126
+ normalizeLowercaseStringOrEmpty(choice.label).includes(focusValue),
127
+ )
128
+ : choices;
129
+ await interaction.respond(
130
+ filtered.slice(0, 25).map((choice) => ({ name: choice.label, value: choice.value })),
131
+ );
132
+ }
133
+ : undefined;
134
+ const choices =
135
+ resolvedChoices.length > 0 && !autocomplete
136
+ ? resolvedChoices.slice(0, 25).map((choice) => ({
137
+ name: choice.label,
138
+ value: choice.value,
139
+ }))
140
+ : undefined;
141
+ return {
142
+ name: arg.name,
143
+ description: truncateDiscordCommandDescription({
144
+ value: arg.description,
145
+ label: `command:${commandLabel} arg:${arg.name}`,
146
+ }),
147
+ type: ApplicationCommandOptionType.String,
148
+ required,
149
+ choices,
150
+ autocomplete,
151
+ };
152
+ }) satisfies CommandOptions;
153
+ }