@desplega.ai/agent-swarm 2.13.2 → 2.13.4
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.
- package/dist/acp-adapter-mr4temec.js +17 -0
- package/dist/{acp-targets-mz8c5dnt.js → acp-targets-zrk9k0n7.js} +10 -10
- package/dist/{actions-5ft3qp5a.js → actions-acqqj9jn.js} +236 -26
- package/dist/{agent-fs-provision-6fgz7wvz.js → agent-fs-provision-zmaykqnd.js} +4 -4
- package/dist/{amp-adapter-nthn8ezm.js → amp-adapter-a7ts8tmw.js} +3 -3
- package/dist/{app-535m78qw.js → app-tmwa442h.js} +7 -7
- package/dist/{approval-notifications-dewbk403.js → approval-notifications-6psaaaye.js} +8 -8
- package/dist/{assistant-39zyabv2.js → assistant-564v6emv.js} +25 -25
- package/dist/{boot-args-schema-bqv5bf77.js → boot-args-schema-n099e0f2.js} +1 -1
- package/dist/{boot-reembed-fas7z3zn.js → boot-reembed-chx66qfk.js} +1 -1
- package/dist/{boot-reembed-157c0gcz.js → boot-reembed-epvg4fp9.js} +1 -1
- package/dist/{boot-scrub-sweep-tmec0be2.js → boot-scrub-sweep-dhkfp0a7.js} +2 -2
- package/dist/{boot-seeds-32zm50x2.js → boot-seeds-m74fc07r.js} +4 -4
- package/dist/{boxd-hr8rsxzq.js → boxd-451q55ys.js} +1 -1
- package/dist/{claude-adapter-gwq7x2nj.js → claude-adapter-hw63yj3j.js} +12 -9
- package/dist/{claude-managed-adapter-rkvw6fvq.js → claude-managed-adapter-z5s7fx6p.js} +3 -3
- package/dist/{claude-managed-setup-0vgz4d1j.js → claude-managed-setup-wee1762m.js} +3 -3
- package/dist/{claude-sdk-session-5wbwxy8c.js → claude-sdk-session-cktyqkpk.js} +27 -13
- package/dist/{cli-d528acsw.js → cli-0fgvnb0x.js} +7 -7
- package/dist/{cli-2v4xxnx2.js → cli-0h8skzss.js} +1 -1
- package/dist/{cli-jkkcm72j.js → cli-0p76my9q.js} +31 -16
- package/dist/{cli-fp65jdp2.js → cli-1kvcsd2f.js} +219 -155
- package/dist/{cli-gc7jkf4a.js → cli-1vmhnncj.js} +3 -3
- package/dist/{cli-tceqvv6h.js → cli-29h5239w.js} +5 -5
- package/dist/cli-2ap1the6.js +11 -0
- package/dist/{cli-8fj8yfmk.js → cli-2vp0z049.js} +1 -1
- package/dist/{cli-ewb028rs.js → cli-3bxrrh53.js} +4 -4
- package/dist/{cli-nvqq3232.js → cli-3tzmh38q.js} +9 -9
- package/dist/{cli-0xwb7zpt.js → cli-3xqad83h.js} +2 -2
- package/dist/{cli-0f7n3td3.js → cli-3zrwrnz7.js} +1 -1
- package/dist/{cli-2wde56gv.js → cli-404am6f3.js} +7 -7
- package/dist/{cli-r4fphq38.js → cli-49aq3cyn.js} +4 -4
- package/dist/{cli-8qvte9hn.js → cli-4fpa0zns.js} +3 -3
- package/dist/{cli-x5yb8zc8.js → cli-4pbwg7sn.js} +2 -2
- package/dist/{cli-s08zsqva.js → cli-4q2c8rxw.js} +76 -10
- package/dist/{cli-3mf04tkh.js → cli-4vynxtrb.js} +1 -1
- package/dist/{cli-tbdw3f92.js → cli-5ashycw3.js} +3 -3
- package/dist/{cli-c9bwawf9.js → cli-5rgm8p39.js} +3 -3
- package/dist/{cli-g0b3ma7r.js → cli-5rxsb3wq.js} +6 -6
- package/dist/{cli-a6rzw649.js → cli-60dwk8tx.js} +3 -3
- package/dist/{cli-xhkek467.js → cli-7by7vp6m.js} +30 -4
- package/dist/{cli-62fjschk.js → cli-7g3fg4gf.js} +7 -7
- package/dist/{cli-ka13xx6b.js → cli-7gbff32z.js} +2 -2
- package/dist/{cli-q8aq48v1.js → cli-8b4rpnwj.js} +1 -1
- package/dist/{cli-1f48qdnb.js → cli-8cas2xvp.js} +3 -3
- package/dist/{cli-dnvmwsvc.js → cli-904wk98s.js} +799 -371
- package/dist/{cli-m1wddksc.js → cli-93n305hm.js} +2 -2
- package/dist/{cli-31vt7baf.js → cli-944w9wb4.js} +21 -17
- package/dist/{cli-je587f74.js → cli-94gx6ze9.js} +1 -1
- package/dist/{cli-fcwrd7bh.js → cli-9ah37a8a.js} +6 -6
- package/dist/{cli-rfejbpe1.js → cli-akm6y2a8.js} +1 -1
- package/dist/{cli-f8rcvf2x.js → cli-azj9t1f9.js} +37 -2
- package/dist/{cli-mwxez0pz.js → cli-b768ek79.js} +1 -1
- package/dist/{cli-cmgdptmx.js → cli-bv4vvnmg.js} +31 -7
- package/dist/{cli-1gevjrc1.js → cli-bzcwwebm.js} +1 -1
- package/dist/{cli-sjk85d7v.js → cli-cq4am6vg.js} +3 -3
- package/dist/{cli-f1sdh8ca.js → cli-d5pc8ep0.js} +103 -9
- package/dist/{cli-7m6bbtab.js → cli-ea7nz50q.js} +12 -12
- package/dist/{cli-zkbz8m2q.js → cli-fkpnx3vf.js} +1 -1
- package/dist/{cli-ya1cj689.js → cli-fw67mnyc.js} +1 -1
- package/dist/{cli-5basv0e7.js → cli-gkv0r2hq.js} +1 -1
- package/dist/{cli-nkfv398a.js → cli-gse7bp3z.js} +12 -10
- package/dist/{cli-4djg31jh.js → cli-gtj12v95.js} +1 -1
- package/dist/{cli-qn79645p.js → cli-h9d3sdnc.js} +1 -1
- package/dist/{cli-tgmate57.js → cli-hdhpdrka.js} +6 -23
- package/dist/{cli-fgm2mad9.js → cli-hhtbandk.js} +2 -2
- package/dist/cli-hyqksecw.js +1907 -0
- package/dist/{cli-t25rq8mg.js → cli-ja450998.js} +40 -11
- package/dist/{cli-43dsqhcp.js → cli-jbrc98qb.js} +4 -4
- package/dist/{cli-82j36f2m.js → cli-jjzxsk47.js} +9 -3
- package/dist/{cli-xerdrnqs.js → cli-jyhbvdga.js} +3 -3
- package/dist/{cli-t9nxq30h.js → cli-jzerrzgc.js} +8 -8
- package/dist/{cli-hv3820ez.js → cli-k0nebh10.js} +1 -1
- package/dist/{cli-s6fhqbz1.js → cli-ka48vpev.js} +6 -6
- package/dist/{cli-d2epqm0y.js → cli-kezzteka.js} +1 -1
- package/dist/{cli-getrvmtx.js → cli-kj84fqxz.js} +2 -2
- package/dist/{cli-h0ewec3d.js → cli-kr0jpw9c.js} +1 -1
- package/dist/{cli-gq6qhmrr.js → cli-m1sns1da.js} +3 -3
- package/dist/{cli-bp2rt28p.js → cli-n1kjs58m.js} +5 -5
- package/dist/{cli-rvhaahfv.js → cli-nc4pbwmp.js} +9 -9
- package/dist/{cli-d0jb2qnt.js → cli-p3knvk62.js} +74 -47
- package/dist/{cli-50whymxq.js → cli-p436yrzp.js} +2 -2
- package/dist/{cli-cs26ed89.js → cli-phdzn699.js} +8 -8
- package/dist/{cli-b0kqw55g.js → cli-pz1dp12c.js} +1 -1
- package/dist/{cli-8a4qg44m.js → cli-pz1nq5xm.js} +6 -6
- package/dist/{cli-e87fg3en.js → cli-qzz6tz8s.js} +1 -1
- package/dist/{cli-69eq6gdk.js → cli-rmgvwcmy.js} +38 -29
- package/dist/{cli-5k1hvycs.js → cli-rv3y60bt.js} +4 -4
- package/dist/cli-s33bzmk0.js +27 -0
- package/dist/{cli-at67kvnp.js → cli-srktrbby.js} +1 -1
- package/dist/{cli-6rmryz03.js → cli-t0jmkcah.js} +14 -14
- package/dist/{cli-eetzmsy5.js → cli-t9pzz2eq.js} +2 -2
- package/dist/{cli-wdtqkqnq.js → cli-tr19nyn9.js} +4 -4
- package/dist/{cli-erh1rgh4.js → cli-ts5yv7dn.js} +165 -88
- package/dist/{cli-zqy28rwx.js → cli-tsc3pdfd.js} +4 -4
- package/dist/{cli-x7aqhxj5.js → cli-tzw1jr2t.js} +2 -2
- package/dist/{cli-n14r8h4n.js → cli-x2cem5vy.js} +6 -4
- package/dist/{cli-vx9acp12.js → cli-ybte1fqc.js} +1 -1
- package/dist/{cli-xysy1g8x.js → cli-ysv0k1we.js} +2 -2
- package/dist/{cli-vdfngx2g.js → cli-ywy8yz6t.js} +2 -2
- package/dist/{cli-cpkxh68d.js → cli-z1vam71h.js} +2 -2
- package/dist/{cli-zm6bkx3e.js → cli-zexwhj3f.js} +3 -3
- package/dist/{cli-j2ybkdk2.js → cli-zhwjdhjr.js} +2 -2
- package/dist/{cli-gedf48yw.js → cli-zjdhrzm0.js} +8 -8
- package/dist/cli.js +20 -20
- package/dist/{codex-adapter-x25xfbnh.js → codex-adapter-2fs2c0n6.js} +8 -8
- package/dist/{codex-hook-c0nvm30r.js → codex-hook-jxjv6dy5.js} +10 -3
- package/dist/{codex-login-ven5cz5j.js → codex-login-ktfg1cxk.js} +1 -1
- package/dist/{codex-session-runner-kn5xnrvp.js → codex-session-runner-r55tmx4c.js} +9 -9
- package/dist/{commands-8n59gxmy.js → commands-0mxdy9x8.js} +3 -3
- package/dist/{controller-wn3vd217.js → controller-g3vkfhr4.js} +4 -4
- package/dist/{controllers-connect-09gvkrhc.js → controllers-connect-4wdmncqt.js} +25 -25
- package/dist/core-gsvj5f3z.js +42 -0
- package/dist/{cursor-adapter-w1681kp1.js → cursor-adapter-t9qb96q2.js} +2 -2
- package/dist/{db-e71keqxk.js → db-487vvyv9.js} +3 -3
- package/dist/{db-spg81qtr.js → db-76p7w3gr.js} +2 -2
- package/dist/{devin-adapter-fs90ab4v.js → devin-adapter-3bp6rape.js} +1 -1
- package/dist/{dispatcher-fr4vawwb.js → dispatcher-64rp6w67.js} +22 -22
- package/dist/{docker-1h33jvh9.js → docker-a59g3ebm.js} +2 -2
- package/dist/{dsh-adapter-g9yqv09y.js → dsh-adapter-8abzqk5c.js} +2 -2
- package/dist/{e2b-y7e5kmzf.js → e2b-3ykbe805.js} +2 -2
- package/dist/{e2b-jnk0yeva.js → e2b-dc8f6ctq.js} +2 -2
- package/dist/{easter-egg-3d-ac9tv9a6.js → easter-egg-3d-jrrwyf55.js} +1 -1
- package/dist/{embedding-space-an77f45k.js → embedding-space-001hhhpk.js} +6 -6
- package/dist/{embeddings-jkrehejr.js → embeddings-esj19cnw.js} +1 -1
- package/dist/{event-bus-08t2b4y2.js → event-bus-7gbsr0g4.js} +1 -1
- package/dist/{execute-3mys4nta.js → execute-301hkxqg.js} +1 -1
- package/dist/{external-channel-s6zxpts9.js → external-channel-w10e2j05.js} +2 -2
- package/dist/fx-adapter-4sjrbdne.js +20 -0
- package/dist/grok-adapter-3a0ezfee.js +20 -0
- package/dist/handlers-ef3k11hb.js +41 -0
- package/dist/{heartbeat-jjpb44e5.js → heartbeat-tbrj7vhq.js} +25 -25
- package/dist/hook-3am1sq68.js +22 -0
- package/dist/{hook-y6n23zzj.js → hook-tx917rqw.js} +11 -8
- package/dist/{http-8c6y008s.js → http-3rmemtqy.js} +340 -1841
- package/dist/{index-mbpxhc4w.js → index-126v2d0t.js} +1 -4
- package/dist/{index-xcw7hjt5.js → index-2jw11t8s.js} +26 -26
- package/dist/{index-p2f5xg64.js → index-3j803vnb.js} +36259 -34299
- package/dist/{index-we3nd2t0.js → index-aetfyx6p.js} +1 -1
- package/dist/index-e6bq0exk.js +42 -0
- package/dist/{index-0vthtbc2.js → index-gfnq66t1.js} +231 -25
- package/dist/index-hf2k1vge.js +39 -0
- package/dist/{index-6h3r0vpe.js → index-s7xtvc0f.js} +1 -1
- package/dist/index-taxmejj3.js +44 -0
- package/dist/{k8s-8326q0rq.js → k8s-36gfn847.js} +2 -2
- package/dist/{keepalive-7e9r5dvp.js → keepalive-9px3t7qj.js} +5 -5
- package/dist/lead-5vt6f174.js +83 -0
- package/dist/{maintenance-d3erjvcg.js → maintenance-vwqjwst6.js} +1 -1
- package/dist/{oauth-refresh-sweep-0qh70988.js → oauth-refresh-sweep-yqry3wn4.js} +4 -4
- package/dist/{object-webhooks-ac7v2q5p.js → object-webhooks-8s1wtths.js} +7 -7
- package/dist/{onboard-5yphtken.js → onboard-hb8czx0p.js} +7 -7
- package/dist/{opencode-adapter-0xvyba4m.js → opencode-adapter-djd6m6dk.js} +8 -8
- package/dist/{otel-impl-svqp691q.js → otel-impl-2ymwyczz.js} +2 -2
- package/dist/{pending-bn4xe5br.js → pending-nxavtvx7.js} +23 -23
- package/dist/{pi-mono-adapter-763s8a3w.js → pi-mono-adapter-d2cpmcy4.js} +13 -13
- package/dist/{pricing-refresh-kfc215mf.js → pricing-refresh-1yz8jkqv.js} +2 -2
- package/dist/{rbac-roles-6r4h2ghj.js → rbac-roles-7s6m31xw.js} +6 -4
- package/dist/{rbac-roles-3bznvkpt.js → rbac-roles-dbpx0x9v.js} +3 -3
- package/dist/{render-v2-f3qedbpy.js → render-v2-7y20rjrn.js} +7 -7
- package/dist/{resume-vcag4ann.js → resume-wz546x47.js} +10 -10
- package/dist/{runtime-x0s55z2t.js → runtime-cb5bd9tz.js} +1 -1
- package/dist/{session-access-nwzve8q2.js → session-access-4vcft8kq.js} +5 -5
- package/dist/{session-source-backfill-jpqfzmgz.js → session-source-backfill-57b50tpw.js} +3 -3
- package/dist/{setup-d2smwaem.js → setup-e1tevjyj.js} +1 -1
- package/dist/thread-buffer-686pa1p1.js +42 -0
- package/dist/{tree-visibility-dwzc8en0.js → tree-visibility-07wf1nct.js} +2 -2
- package/dist/{user-merge-jobs-4ce7kma2.js → user-merge-jobs-n20qpv6s.js} +3 -3
- package/dist/{virtual-modules-78a6yw71.js → virtual-modules-6fxmn1yv.js} +3 -3
- package/dist/{work-objects-m0w1e7q8.js → work-objects-eg7y48pe.js} +25 -25
- package/dist/worker-4vp616ms.js +83 -0
- package/dist/{worker-follow-up-e3t6f895.js → worker-follow-up-jnvnnf2b.js} +22 -22
- package/dist/{x-asbrnafg.js → x-d27jj7z7.js} +2 -2
- package/openapi.json +478 -28
- package/package.json +3 -3
- package/src/be/db/approvals.ts +2 -0
- package/src/be/db/runtime.ts +5 -0
- package/src/be/db/script-run-sources.ts +17 -0
- package/src/be/db-retention.ts +1 -1
- package/src/be/db.ts +71 -62
- package/src/be/design-system.ts +63 -0
- package/src/be/migrations/342_script_run_sources.sql +20 -0
- package/src/be/migrations/runner.ts +8 -0
- package/src/be/migrations/script-run-sources.ts +51 -0
- package/src/be/rbac-roles.ts +2 -0
- package/src/be/scripts/typecheck.ts +4 -2
- package/src/be/seed-scripts/catalog/design-system-seed.ts +158 -0
- package/src/be/seed-scripts/index.ts +9 -0
- package/src/be/swarm-config-guard.ts +21 -1
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/runner.ts +62 -6
- package/src/heartbeat/heartbeat.ts +18 -4
- package/src/hooks/codex-hook.ts +15 -4
- package/src/hooks/hook.ts +7 -0
- package/src/http/all-routes.ts +1 -0
- package/src/http/approval-chat-answer.ts +99 -0
- package/src/http/approval-requests.ts +280 -225
- package/src/http/design-system.ts +103 -0
- package/src/http/index.ts +10 -6
- package/src/http/pages-public.ts +25 -10
- package/src/http/pages.ts +17 -0
- package/src/http/person-responder.ts +28 -0
- package/src/http/session-cost-recompute.ts +3 -1
- package/src/http/session-data.ts +3 -0
- package/src/integrations/chat-sdk/adapters.ts +33 -3
- package/src/integrations/chat-sdk/inbound.ts +6 -18
- package/src/integrations/chat-sdk/mentions.ts +188 -0
- package/src/integrations/chat-sdk/outbound.ts +20 -3
- package/src/integrations/chat-sdk/router.ts +8 -0
- package/src/integrations/chat-sdk/telegram-thread.ts +12 -0
- package/src/jira/adf.ts +35 -9
- package/src/kv-reserved-namespaces.ts +5 -0
- package/src/pages/page-head.ts +11 -1
- package/src/prompts/base-prompt.ts +1 -1
- package/src/prompts/session-templates.ts +1 -1
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +21 -1
- package/src/providers/claude-sdk-session.ts +22 -3
- package/src/providers/claude-session-events.ts +76 -1
- package/src/providers/cursor-adapter.ts +1 -1
- package/src/providers/dsh-adapter.ts +48 -13
- package/src/providers/fx-adapter.ts +2 -2
- package/src/providers/pricing-sources.md +3 -0
- package/src/providers/types.ts +13 -0
- package/src/rbac/legacy-policy.ts +4 -0
- package/src/rbac/permissions.ts +8 -0
- package/src/scheduler/index.ts +1 -0
- package/src/scheduler/scheduler.test.ts +32 -1
- package/src/scheduler/scheduler.ts +24 -1
- package/src/script-workflows/executor.ts +6 -0
- package/src/script-workflows/supervisor.ts +2 -1
- package/src/scripts-runtime/sdk-allowlist.ts +2 -0
- package/src/scripts-runtime/swarm-sdk.ts +12 -23
- package/src/scripts-runtime/types/stdlib.d.ts +4 -1
- package/src/scripts-runtime/types/swarm-sdk.d.ts +4 -1
- package/src/server.ts +2 -0
- package/src/slack/actions.ts +3 -0
- package/src/slack/approval-actions.ts +148 -0
- package/src/slack/approval-buttons.ts +28 -0
- package/src/slack/render-v2.ts +27 -7
- package/src/tests/base-prompt.test.ts +6 -2
- package/src/tests/chat-sdk-mentions.test.ts +183 -0
- package/src/tests/claude-adapter.test.ts +115 -0
- package/src/tests/create-page-tool.test.ts +5 -0
- package/src/tests/dsh-adapter.test.ts +53 -1
- package/src/tests/fixtures/compiled-source-schema-boot.ts +24 -0
- package/src/tests/fixtures/fx/acp-updates-recorded.jsonl +1 -1
- package/src/tests/fixtures/secret-corpus.ts +43 -1
- package/src/tests/heartbeat-stall-thresholds.test.ts +174 -0
- package/src/tests/internal-ai/complete-structured.test.ts +105 -0
- package/src/tests/internal-ai/credentials.test.ts +149 -0
- package/src/tests/internal-ai/task-title.test.ts +78 -0
- package/src/tests/jira-adf.test.ts +42 -2
- package/src/tests/mcp-input-caps.test.ts +16 -11
- package/src/tests/merge-gate-detect-changes.test.ts +208 -16
- package/src/tests/migration-342-script-run-sources.test.ts +196 -0
- package/src/tests/migration-bunfs-compat.test.ts +129 -9
- package/src/tests/rbac-e2e-helpers.test.ts +10 -4
- package/src/tests/rbac-e2e-helpers.ts +13 -4
- package/src/tests/rbac-roles.test.ts +2 -0
- package/src/tests/runner-slot-reconcile.test.ts +102 -0
- package/src/tests/runtime-e2b-pools.test.ts +7 -1
- package/src/tests/schedule-target-type.test.ts +4 -1
- package/src/tests/script-connections.test.ts +2 -0
- package/src/tests/script-runs-retention.test.ts +43 -16
- package/src/tests/script-workflows-runtime-e2e.test.ts +56 -22
- package/src/tests/scripts-http.test.ts +9 -3
- package/src/tests/sdk-allowlist.test.ts +26 -13
- package/src/tests/sdk-store-progress-skipped.test.ts +12 -5
- package/src/tests/secret-rules.test.ts +34 -0
- package/src/tests/secret-scrub-gate.test.ts +7 -0
- package/src/tests/secret-scrubber.test.ts +62 -2
- package/src/tests/seed-scripts.test.ts +2 -2
- package/src/tests/slack-render-v2.test.ts +85 -0
- package/src/tests/system-one-hosts-ui-mirror.test.ts +1 -0
- package/src/tests/vcs-azure-devops.test.ts +10 -0
- package/src/tests/vcs-provider.test.ts +8 -0
- package/src/themes/design-system.ts +163 -0
- package/src/themes/page-theme.ts +28 -19
- package/src/tools/chat-post.ts +7 -3
- package/src/tools/create-page.ts +3 -0
- package/src/tools/design-system.ts +102 -0
- package/src/tools/mcp-servers/mcp-server-get.ts +1 -1
- package/src/tools/mcp-servers/mcp-server-list.ts +1 -1
- package/src/tools/register-chat-channel.ts +11 -2
- package/src/tools/skills/skill-get-file.ts +1 -1
- package/src/tools/skills/skill-get.ts +1 -1
- package/src/tools/skills/skill-list.ts +1 -1
- package/src/tools/skills/skill-search.ts +1 -1
- package/src/tools/utils.ts +49 -4
- package/src/tools/workflows/get-workflow-run.ts +1 -1
- package/src/tools/workflows/get-workflow.ts +1 -1
- package/src/tools/workflows/list-workflow-runs.ts +1 -1
- package/src/tools/workflows/list-workflows.ts +1 -1
- package/src/types.ts +67 -1
- package/src/utils/internal-ai/complete-structured.ts +36 -5
- package/src/utils/internal-ai/credentials.ts +78 -2
- package/src/utils/internal-ai/models.ts +37 -1
- package/src/utils/internal-ai/task-title.ts +31 -1
- package/src/utils/secret-rules.generated.ts +149 -149
- package/src/utils/secret-scrubber.ts +111 -5
- package/src/vcs/azure-devops.ts +22 -1
- package/src/vcs/index.ts +3 -1
- package/src/workflows/approval-inline.ts +122 -0
- package/src/workflows/approval-notifications.ts +7 -2
- package/src/workflows/engine.ts +6 -5
- package/src/workflows/executors/agent-task.ts +14 -0
- package/src/workflows/executors/system-one-providers.ts +23 -0
- package/templates/skills/pages/content.md +34 -8
- package/templates/skills/swarm-docs/content.md +13 -0
- package/templates/skills/workflow-iterate/content.md +1 -1
- package/dist/acp-adapter-x1qqgzwx.js +0 -17
- package/dist/cli-n46d87mj.js +0 -98
- package/dist/core-2b8bv6ny.js +0 -42
- package/dist/fx-adapter-4yet1c4f.js +0 -20
- package/dist/grok-adapter-8ge6tw7m.js +0 -20
- package/dist/handlers-0r9evrdj.js +0 -41
- package/dist/hook-68gbs87k.js +0 -19
- package/dist/index-1v23363p.js +0 -39
- package/dist/index-30qw6vyw.js +0 -44
- package/dist/index-6bm3w6cn.js +0 -40
- package/dist/lead-3jpc7kcr.js +0 -79
- package/dist/thread-buffer-8fc703jc.js +0 -42
- package/dist/worker-3p2vq107.js +0 -79
package/src/http/index.ts
CHANGED
|
@@ -94,6 +94,7 @@ import { handleConfig } from "./config";
|
|
|
94
94
|
import { handleContext } from "./context";
|
|
95
95
|
import { getDeploymentEnvValue, handleCore, loadGlobalConfigsIntoEnv } from "./core";
|
|
96
96
|
import { handleDbQuery } from "./db-query";
|
|
97
|
+
import { handleDesignSystem } from "./design-system";
|
|
97
98
|
import { handleEvents } from "./events";
|
|
98
99
|
import { handleExtensions } from "./extensions";
|
|
99
100
|
import { handleFavorites } from "./favorites";
|
|
@@ -434,6 +435,7 @@ const httpServer = createHttpServer(async (req, res) => {
|
|
|
434
435
|
() => handlePagesPublic(req, res, pathSegments, queryParams),
|
|
435
436
|
() => handlePageProxy(req, res),
|
|
436
437
|
() => handlePages(req, res, pathSegments, queryParams, myAgentId),
|
|
438
|
+
() => handleDesignSystem(req, res, pathSegments, queryParams, myAgentId),
|
|
437
439
|
() => handleApiKeys(req, res, pathSegments, queryParams),
|
|
438
440
|
() => handleHeartbeat(req, res, pathSegments),
|
|
439
441
|
() => handleEvents(req, res, pathSegments, queryParams, myAgentId),
|
|
@@ -921,14 +923,16 @@ httpServer
|
|
|
921
923
|
// Reconcile durable script workflow subprocesses
|
|
922
924
|
await startScriptRunSupervisor(getMcpBaseUrl());
|
|
923
925
|
|
|
924
|
-
// Start scheduler (if enabled)
|
|
926
|
+
// Start scheduler (if enabled). The interval is read post-hydration, like
|
|
927
|
+
// heartbeat below, and parsed so an unusable value keeps the 10s default (#3169).
|
|
925
928
|
if (hasCapability("scheduling")) {
|
|
926
|
-
const { startScheduler } = await import("../scheduler");
|
|
929
|
+
const { parseSchedulerIntervalMs, startScheduler } = await import("../scheduler");
|
|
927
930
|
const { getExecutorRegistry } = await import("../workflows");
|
|
928
|
-
|
|
929
|
-
|
|
930
|
-
|
|
931
|
-
|
|
931
|
+
startScheduler(
|
|
932
|
+
getExecutorRegistry(),
|
|
933
|
+
parseSchedulerIntervalMs(process.env.SCHEDULER_INTERVAL_MS),
|
|
934
|
+
{ runId: globalState.__runId! },
|
|
935
|
+
);
|
|
932
936
|
}
|
|
933
937
|
|
|
934
938
|
// Start heartbeat triage (unless disabled). Read post-hydration (this block
|
package/src/http/pages-public.ts
CHANGED
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
25
25
|
import { z } from "zod";
|
|
26
26
|
import { getPage, incrementPageViewCount } from "../be/db";
|
|
27
|
+
import { getActiveDesignSystem } from "../be/design-system";
|
|
27
28
|
import { BROWSER_SDK_JS, SWARM_UI_JS } from "../pages/browser-sdk";
|
|
28
29
|
import { COLOR_LITERAL_THRESHOLD, countColorLiterals } from "../pages/color-literals";
|
|
29
30
|
import {
|
|
@@ -38,6 +39,7 @@ import {
|
|
|
38
39
|
PAGE_THEME_PARAM,
|
|
39
40
|
} from "../pages/page-head";
|
|
40
41
|
import { resolvePageTheme } from "../themes/page-theme";
|
|
42
|
+
import { getThemePreset } from "../themes/presets";
|
|
41
43
|
import { type Page, PageSchema } from "../types";
|
|
42
44
|
import { getAppUrl, getConfiguredAppUrls, getLocalDevAppOrigins } from "../utils/constants";
|
|
43
45
|
import {
|
|
@@ -111,24 +113,37 @@ const publicPageJsonRoute = route({
|
|
|
111
113
|
/**
|
|
112
114
|
* The `<head>` defaults for a page's design version (`src/pages/page-head.ts`).
|
|
113
115
|
* Version 1 is the frozen original head and ignores the viewer params. Version
|
|
114
|
-
* 2 resolves the theme: the page `theme`, else the
|
|
115
|
-
* preset, else Hive, plus the page `themeTokens` on
|
|
116
|
-
*
|
|
116
|
+
* 2 resolves the theme: the page `theme`, else the org design system, else the
|
|
117
|
+
* viewer's `__swarm-theme` preset, else Hive, plus the page `themeTokens` on
|
|
118
|
+
* top. The org design system (its tokens, fonts and mode lock) applies only to
|
|
119
|
+
* a page without its own `theme`. The page is dark for `__swarm-mode=dark`, or
|
|
120
|
+
* always when the design system locks `mode: "dark"`; `mode: "light"` keeps it
|
|
121
|
+
* light. A `?print=1` export is always light. A body with
|
|
117
122
|
* `COLOR_LITERAL_THRESHOLD` or more hardcoded colors also stays light: its
|
|
118
123
|
* hardcoded light surfaces would get the dark-mode text color.
|
|
119
124
|
*/
|
|
120
|
-
function pageHead(
|
|
125
|
+
async function pageHead(
|
|
126
|
+
page: Page,
|
|
127
|
+
queryParams: URLSearchParams,
|
|
128
|
+
wantsPrint: boolean,
|
|
129
|
+
): Promise<string> {
|
|
121
130
|
if (page.designVersion === 1) return PAGE_HEAD_V1;
|
|
131
|
+
const designSystem = getThemePreset(page.theme) ? null : await getActiveDesignSystem();
|
|
122
132
|
const theme = resolvePageTheme({
|
|
123
133
|
pageTheme: page.theme,
|
|
124
134
|
viewerTheme: queryParams.get(PAGE_THEME_PARAM),
|
|
125
135
|
overrides: page.themeTokens,
|
|
136
|
+
designSystem,
|
|
137
|
+
});
|
|
138
|
+
const mode = designSystem?.mode ?? "viewer";
|
|
139
|
+
const wantsDark =
|
|
140
|
+
mode === "dark" || (mode === "viewer" && queryParams.get(PAGE_MODE_PARAM) === "dark");
|
|
141
|
+
const dark = !wantsPrint && wantsDark && countColorLiterals(page.body) < COLOR_LITERAL_THRESHOLD;
|
|
142
|
+
return buildPageHeadV2({
|
|
143
|
+
theme,
|
|
144
|
+
mode: dark ? "dark" : "light",
|
|
145
|
+
fontsHref: designSystem?.fontsHref,
|
|
126
146
|
});
|
|
127
|
-
const dark =
|
|
128
|
-
!wantsPrint &&
|
|
129
|
-
queryParams.get(PAGE_MODE_PARAM) === "dark" &&
|
|
130
|
-
countColorLiterals(page.body) < COLOR_LITERAL_THRESHOLD;
|
|
131
|
-
return buildPageHeadV2({ theme, mode: dark ? "dark" : "light" });
|
|
132
147
|
}
|
|
133
148
|
|
|
134
149
|
/** A doctype at the start of a body (`\s` also matches a BOM). */
|
|
@@ -703,7 +718,7 @@ export async function handlePagesPublic(
|
|
|
703
718
|
const html =
|
|
704
719
|
injectBrowserSdk(page.body, {
|
|
705
720
|
// The viewer meta goes after the head defaults, which start with <base target>.
|
|
706
|
-
head: `${pageHead(page, queryParams, wantsPrint)}<meta name="swarm-viewer" content="${pageViewer(cookiePayload)}">`,
|
|
721
|
+
head: `${await pageHead(page, queryParams, wantsPrint)}<meta name="swarm-viewer" content="${pageViewer(cookiePayload)}">`,
|
|
707
722
|
headFirst: feedback ? feedbackKeyGuardScript() : "",
|
|
708
723
|
standardsMode: page.designVersion !== 1,
|
|
709
724
|
}) +
|
package/src/http/pages.ts
CHANGED
|
@@ -24,6 +24,7 @@ import { snapshotPage } from "../pages/version";
|
|
|
24
24
|
import { resolveTemplate } from "../prompts/resolver";
|
|
25
25
|
// Side-effect import: registers `task.page.feedback`.
|
|
26
26
|
import "../prompts/session-templates";
|
|
27
|
+
import { can } from "../rbac";
|
|
27
28
|
import { createTaskWithSiblingAwareness } from "../tasks/sibling-awareness";
|
|
28
29
|
import { readThemeFields } from "../themes/page-fields";
|
|
29
30
|
import { THEME_PRESET_IDS } from "../themes/presets";
|
|
@@ -41,6 +42,7 @@ import { getAppUrl, getPublicMcpBaseUrl } from "../utils/constants";
|
|
|
41
42
|
import { isLocalDevPageRequest, pageSessionSetCookies } from "../utils/page-session";
|
|
42
43
|
import { authUser, getRequestAuth, isOperatorAuth } from "../utils/request-auth-context";
|
|
43
44
|
import { resolveHttpFavoriteOwner } from "./favorite-owner";
|
|
45
|
+
import { resolveRequestPrincipal } from "./request-principal";
|
|
44
46
|
import { route } from "./route-def";
|
|
45
47
|
import { resolveTaskRequester } from "./tasks";
|
|
46
48
|
import {
|
|
@@ -229,9 +231,11 @@ const launchPageRoute = route({
|
|
|
229
231
|
summary: "Launch a page session (issues HttpOnly cookie)",
|
|
230
232
|
tags: ["Pages"],
|
|
231
233
|
params: z.object({ id: z.string() }),
|
|
234
|
+
rbac: { permission: "page.launch" },
|
|
232
235
|
responses: {
|
|
233
236
|
204: { description: "Cookie issued" },
|
|
234
237
|
400: { description: "Launch not supported for this page (e.g. password mode)" },
|
|
238
|
+
403: { description: "Caller may not open pages" },
|
|
235
239
|
404: { description: "Page not found" },
|
|
236
240
|
},
|
|
237
241
|
});
|
|
@@ -1031,6 +1035,19 @@ export async function handlePages(
|
|
|
1031
1035
|
const parsed = await launchPageRoute.parse(req, res, pathSegments, queryParams);
|
|
1032
1036
|
if (!parsed) return true;
|
|
1033
1037
|
|
|
1038
|
+
// Role grants were checked at admission; this refuses guest and controller sessions.
|
|
1039
|
+
const principal = await resolveRequestPrincipal(req, myAgentId, {
|
|
1040
|
+
unauthenticatedFallback: "operator",
|
|
1041
|
+
});
|
|
1042
|
+
const decision = principal
|
|
1043
|
+
? can({ principal, verb: "page.launch", resource: { kind: "none" }, source: "http" })
|
|
1044
|
+
: { allow: false as const, reason: "no authenticated principal" };
|
|
1045
|
+
if (!decision.allow) {
|
|
1046
|
+
applyLaunchCors(req, res);
|
|
1047
|
+
jsonError(res, decision.reason, 403);
|
|
1048
|
+
return true;
|
|
1049
|
+
}
|
|
1050
|
+
|
|
1034
1051
|
const page = await getPage(parsed.params.id);
|
|
1035
1052
|
if (!page) {
|
|
1036
1053
|
applyLaunchCors(req, res);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage } from "node:http";
|
|
2
2
|
import { getUserGrant } from "../be/rbac-roles";
|
|
3
|
+
import { findUserById } from "../be/users";
|
|
3
4
|
import { can, isRbacEnabled, type PermissionVerb } from "../rbac";
|
|
4
5
|
import type { User } from "../types";
|
|
5
6
|
import { getRequestAuth } from "../utils/request-auth-context";
|
|
@@ -64,3 +65,30 @@ export async function approvalResponder(
|
|
|
64
65
|
export function responderKey(responder: ApprovalResponder): string {
|
|
65
66
|
return responder.kind === "user" ? responder.user.id : "operator";
|
|
66
67
|
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* The responder for a person identified outside HTTP, such as a chat user
|
|
71
|
+
* mapped through `user_external_ids`. Applies the checks `approvalResponder`
|
|
72
|
+
* applies to a user credential: an active, unmerged account (what credential
|
|
73
|
+
* resolution requires), the `approval.respond` verb and, with RBAC on, a role
|
|
74
|
+
* that grants it.
|
|
75
|
+
*/
|
|
76
|
+
export async function userApprovalResponder(
|
|
77
|
+
userId: string,
|
|
78
|
+
): Promise<{ ok: true; responder: ApprovalResponder } | { ok: false; message: string }> {
|
|
79
|
+
const refused = {
|
|
80
|
+
ok: false as const,
|
|
81
|
+
message: "You are not allowed to answer approval requests.",
|
|
82
|
+
};
|
|
83
|
+
const user = await findUserById(userId);
|
|
84
|
+
// Credential resolution refuses invited, suspended and merged-away users, so
|
|
85
|
+
// a chat identity mapped to one must not answer either.
|
|
86
|
+
if (!user || user.status !== "active" || user.mergedIntoUserId) return refused;
|
|
87
|
+
const verb: PermissionVerb = "approval.respond";
|
|
88
|
+
if (!can({ principal: { kind: "user", userId }, verb, source: "http" }).allow) return refused;
|
|
89
|
+
if (isRbacEnabled()) {
|
|
90
|
+
const grant = await getUserGrant(userId);
|
|
91
|
+
if (!grant.grantsAll && !grant.verbs.has(verb)) return refused;
|
|
92
|
+
}
|
|
93
|
+
return { ok: true, responder: { kind: "user", user } };
|
|
94
|
+
}
|
|
@@ -33,6 +33,8 @@ interface SessionCostRecomputeInput {
|
|
|
33
33
|
harnessCostUsd: number;
|
|
34
34
|
/** `harnessCostUsd` is the provider's bill, not a token estimate. */
|
|
35
35
|
harnessCostBilled?: boolean;
|
|
36
|
+
/** The token counts are a fallback sum, so a priced row is tagged `estimated`. */
|
|
37
|
+
estimated?: boolean;
|
|
36
38
|
inputTokens: number;
|
|
37
39
|
outputTokens: number;
|
|
38
40
|
cacheReadTokens: number;
|
|
@@ -278,7 +280,7 @@ export async function recomputeSessionCost(
|
|
|
278
280
|
|
|
279
281
|
return {
|
|
280
282
|
totalCostUsd: pricedCostUsd + sessionFeesUsd,
|
|
281
|
-
costSource: "pricing-table",
|
|
283
|
+
costSource: input.estimated ? "estimated" : "pricing-table",
|
|
282
284
|
modelBreakdown: modelUsageEntries ? pricedModels : undefined,
|
|
283
285
|
};
|
|
284
286
|
}
|
package/src/http/session-data.ts
CHANGED
|
@@ -202,6 +202,8 @@ const createSessionCostRoute = route({
|
|
|
202
202
|
// The adapter's totalCostUsd is the provider's bill (e.g. OpenRouter's
|
|
203
203
|
// `usage.cost`), so it wins over the pricing table.
|
|
204
204
|
harnessCostBilled: z.boolean().optional(),
|
|
205
|
+
// Token counts summed from per-message usage; the priced row is tagged `estimated`.
|
|
206
|
+
estimated: z.boolean().optional(),
|
|
205
207
|
taskId: z.string().optional(),
|
|
206
208
|
// Phase 3: non-negative — the recompute no longer clamps, so negative
|
|
207
209
|
// token counts must be rejected at the wire instead of pricing below $0.
|
|
@@ -451,6 +453,7 @@ export async function handleSessionData(
|
|
|
451
453
|
model,
|
|
452
454
|
harnessCostUsd: parsed.body.totalCostUsd,
|
|
453
455
|
harnessCostBilled: parsed.body.harnessCostBilled,
|
|
456
|
+
estimated: parsed.body.estimated,
|
|
454
457
|
inputTokens,
|
|
455
458
|
outputTokens,
|
|
456
459
|
cacheReadTokens: cachedInputTokens,
|
|
@@ -3,6 +3,11 @@ import type { Adapter, Logger } from "chat";
|
|
|
3
3
|
import { type ChatSdkAdapterName, type ResolvedAdapterConfig, readApiUrlOverrides } from "./config";
|
|
4
4
|
import { isTelegramReplyToBot, type TelegramRawMessage } from "./facts";
|
|
5
5
|
import { withInfoFilter } from "./logger";
|
|
6
|
+
import {
|
|
7
|
+
type DiscordGatewayMessage,
|
|
8
|
+
discordJsMentionLookup,
|
|
9
|
+
resolveDiscordMentions,
|
|
10
|
+
} from "./mentions";
|
|
6
11
|
import { getChatSdkTestHooks } from "./test-hooks";
|
|
7
12
|
|
|
8
13
|
/**
|
|
@@ -110,15 +115,40 @@ export async function loadAdapter(
|
|
|
110
115
|
} as Parameters<typeof createSlackAdapter>[0]);
|
|
111
116
|
}
|
|
112
117
|
case "discord": {
|
|
113
|
-
const {
|
|
118
|
+
const { DiscordAdapter } = await import("@chat-adapter/discord");
|
|
119
|
+
// The adapter turns `<@id>`, `<@&id>` and `<#id>` into bare `@id` /
|
|
120
|
+
// `#id`, so agents would see numbers. The Gateway message carries the
|
|
121
|
+
// names in `mentions`; write them into the content first. The view
|
|
122
|
+
// reads every other field from the real message.
|
|
123
|
+
class SwarmDiscordAdapter extends DiscordAdapter {
|
|
124
|
+
// The parameter is a discord.js `Message`; discord.js is not a direct dependency.
|
|
125
|
+
protected override handleGatewayMessage(
|
|
126
|
+
message: DiscordGatewayMessage,
|
|
127
|
+
isMentioned: boolean,
|
|
128
|
+
): Promise<void> {
|
|
129
|
+
const content = resolveDiscordMentions(
|
|
130
|
+
message.content,
|
|
131
|
+
this.botUserId,
|
|
132
|
+
discordJsMentionLookup(message.mentions),
|
|
133
|
+
);
|
|
134
|
+
if (content === message.content) {
|
|
135
|
+
return super.handleGatewayMessage(message as never, isMentioned);
|
|
136
|
+
}
|
|
137
|
+
const view = new Proxy(message, {
|
|
138
|
+
get: (target, prop) =>
|
|
139
|
+
prop === "content" ? content : Reflect.get(target, prop, target),
|
|
140
|
+
});
|
|
141
|
+
return super.handleGatewayMessage(view as never, isMentioned);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
114
144
|
// `[]` (not undefined) blocks the DISCORD_RESPOND_TO_CHANNEL_IDS and
|
|
115
145
|
// DISCORD_MENTION_ROLE_IDS env fallbacks.
|
|
116
|
-
return
|
|
146
|
+
return new SwarmDiscordAdapter({
|
|
117
147
|
...base,
|
|
118
148
|
logger: withInfoFilter(logger, keepDiscordInfoLine),
|
|
119
149
|
respondToChannelIds: config.respondToChannelIds ?? [],
|
|
120
150
|
mentionRoleIds: config.mentionRoleIds ?? [],
|
|
121
|
-
} as
|
|
151
|
+
} as ConstructorParameters<typeof DiscordAdapter>[0]);
|
|
122
152
|
}
|
|
123
153
|
case "teams": {
|
|
124
154
|
const { createTeamsAdapter } = await import("@chat-adapter/teams");
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Message, Thread } from "chat";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { sessionGroupKey } from "@/assets/key";
|
|
4
4
|
import { sessionSourceKey } from "@/assets/source-key";
|
|
@@ -35,6 +35,7 @@ import {
|
|
|
35
35
|
import { getChatThreadResetAt } from "./commands";
|
|
36
36
|
import { type ChatAddressedReason, formatChatHeaderFacts, readChatMessageFacts } from "./facts";
|
|
37
37
|
import { errorMessage } from "./logger";
|
|
38
|
+
import { botMentionForms, stripBotMention } from "./mentions";
|
|
38
39
|
import { chatMessageText } from "./message-text";
|
|
39
40
|
import { emitChatMessageSent, postChatMessage } from "./outbound";
|
|
40
41
|
import {
|
|
@@ -82,22 +83,6 @@ export const ChatRouteModifySchema = z
|
|
|
82
83
|
const THREAD_CONTEXT_LIMIT = 20;
|
|
83
84
|
const AGENT_MESSAGE_TRUNCATE = 500;
|
|
84
85
|
|
|
85
|
-
function escapeRegex(value: string): string {
|
|
86
|
-
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
/** Remove the bot's own `@name` / `<@id>` mention; other mentions stay. */
|
|
90
|
-
function stripBotMention(text: string, adapter: Adapter): string {
|
|
91
|
-
let out = text;
|
|
92
|
-
if (adapter.userName) {
|
|
93
|
-
out = out.replace(new RegExp(`(?<!\\w)@${escapeRegex(adapter.userName)}(?![\\w-])`, "gi"), "");
|
|
94
|
-
}
|
|
95
|
-
if (adapter.botUserId) {
|
|
96
|
-
out = out.replace(new RegExp(`<@${escapeRegex(adapter.botUserId)}>`, "g"), "");
|
|
97
|
-
}
|
|
98
|
-
return out.trim();
|
|
99
|
-
}
|
|
100
|
-
|
|
101
86
|
/** The adapter name is the thread id's first segment; the rest of the id is opaque. */
|
|
102
87
|
function adapterOf(threadId: string): string {
|
|
103
88
|
const i = threadId.indexOf(":");
|
|
@@ -124,7 +109,10 @@ export async function handleChatInbound(
|
|
|
124
109
|
messageId: message.id,
|
|
125
110
|
});
|
|
126
111
|
|
|
127
|
-
let text = stripBotMention(
|
|
112
|
+
let text = stripBotMention(
|
|
113
|
+
chatMessageText(message),
|
|
114
|
+
await botMentionForms(thread.adapter, message),
|
|
115
|
+
);
|
|
128
116
|
const immediate = /^!now\b/i.test(text);
|
|
129
117
|
if (immediate) text = text.replace(/^!now\s*/i, "").trim();
|
|
130
118
|
const attachments = message.attachments ?? [];
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Mention handling for inbound chat text, over adapter payload shapes. No
|
|
3
|
+
* database access; `botMentionForms` reads the Slack adapter's user cache.
|
|
4
|
+
* Used by `inbound.ts` and `adapters.ts`.
|
|
5
|
+
*
|
|
6
|
+
* Each adapter renders the bot's own mention differently by the time the
|
|
7
|
+
* handler sees the text (checked against the 4.45.0 adapter sources):
|
|
8
|
+
* - Discord: `<@id>` / `<@!id>` becomes bare `@id`.
|
|
9
|
+
* - Slack: `<@U…>` becomes `@<display name>` from `users.info`.
|
|
10
|
+
* - Teams: `<at>Name</at>` becomes `@Name`, the name the client typed.
|
|
11
|
+
* - Telegram and Rocket.Chat: `@username`, the adapter `userName`.
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import type { Adapter, Message } from "chat";
|
|
15
|
+
|
|
16
|
+
export interface BotMentionForms {
|
|
17
|
+
/** Display names or handles; matched as `@name`, case-insensitive. */
|
|
18
|
+
names: readonly string[];
|
|
19
|
+
/** Platform user ids; matched as `<@id>`, `<@!id>` and bare `@id`. */
|
|
20
|
+
ids: readonly string[];
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
function escapeRegex(value: string): string {
|
|
24
|
+
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** Remove the bot's own mention in every form the adapters produce; other mentions stay. */
|
|
28
|
+
export function stripBotMention(text: string, forms: BotMentionForms): string {
|
|
29
|
+
let out = text;
|
|
30
|
+
const names = [...new Set(forms.names.map((name) => name.trim()).filter(Boolean))];
|
|
31
|
+
// Longest first, so `@Agent Swarm` is not cut to ` Swarm` by an `@Agent` handle.
|
|
32
|
+
names.sort((a, b) => b.length - a.length);
|
|
33
|
+
for (const name of names) {
|
|
34
|
+
out = out.replace(new RegExp(`(?<!\\w)@${escapeRegex(name)}(?![\\w-])`, "gi"), "");
|
|
35
|
+
}
|
|
36
|
+
for (const id of new Set(forms.ids.filter(Boolean))) {
|
|
37
|
+
const escaped = escapeRegex(id);
|
|
38
|
+
out = out.replace(new RegExp(`<@!?${escaped}>`, "g"), "");
|
|
39
|
+
out = out.replace(new RegExp(`(?<![\\w<&])@${escaped}(?!\\w)`, "g"), "");
|
|
40
|
+
}
|
|
41
|
+
return out.trim();
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** The part of a Teams mention entity this reads. */
|
|
45
|
+
interface TeamsMentionEntity {
|
|
46
|
+
type?: unknown;
|
|
47
|
+
text?: unknown;
|
|
48
|
+
mentioned?: { id?: unknown; name?: unknown };
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** Teams ids carry a channel prefix (`28:<appId>`); compare the part after the last colon. */
|
|
52
|
+
function teamsIdTail(id: string): string {
|
|
53
|
+
return id.slice(id.lastIndexOf(":") + 1).toLowerCase();
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Names the bot was mentioned by in a Teams Activity: `mentioned.name` and
|
|
58
|
+
* the `<at>…</at>` label of each mention entity that points at the bot.
|
|
59
|
+
* The adapter renders that label as `@label`.
|
|
60
|
+
*/
|
|
61
|
+
export function teamsBotMentionNames(raw: unknown, botUserId: string | undefined): string[] {
|
|
62
|
+
if (!botUserId || !raw || typeof raw !== "object") return [];
|
|
63
|
+
const entities = (raw as { entities?: unknown }).entities;
|
|
64
|
+
if (!Array.isArray(entities)) return [];
|
|
65
|
+
const bot = teamsIdTail(botUserId);
|
|
66
|
+
const names: string[] = [];
|
|
67
|
+
for (const entity of entities as TeamsMentionEntity[]) {
|
|
68
|
+
if (entity?.type !== "mention") continue;
|
|
69
|
+
const id = entity.mentioned?.id;
|
|
70
|
+
if (typeof id !== "string" || teamsIdTail(id) !== bot) continue;
|
|
71
|
+
if (typeof entity.mentioned?.name === "string") names.push(entity.mentioned.name);
|
|
72
|
+
if (typeof entity.text === "string") {
|
|
73
|
+
const label = /<at\b[^>]*>(.*?)<\/at>/is.exec(entity.text)?.[1];
|
|
74
|
+
if (label) names.push(decodeTeamsLabel(label));
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return names;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
function decodeTeamsLabel(label: string): string {
|
|
81
|
+
return label
|
|
82
|
+
.replace(/<[^>]*>/g, "")
|
|
83
|
+
.replace(/"/g, '"')
|
|
84
|
+
.replace(/</g, "<")
|
|
85
|
+
.replace(/>/g, ">")
|
|
86
|
+
.replace(/&/g, "&")
|
|
87
|
+
.trim();
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/** Name lookups for the ids in one Discord message. `undefined` keeps the id. */
|
|
91
|
+
export interface DiscordMentionLookup {
|
|
92
|
+
user(id: string): string | undefined;
|
|
93
|
+
role(id: string): string | undefined;
|
|
94
|
+
channel(id: string): string | undefined;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* Rewrite Discord mention markup to names before the adapter parses it:
|
|
99
|
+
* `<@id>` / `<@!id>` to `@name`, `<@&id>` to `@role`, `<#id>` to `#channel`.
|
|
100
|
+
* The bot's own mention and any id without a name stay as markup, so the
|
|
101
|
+
* adapter still turns them into `@id` / `#id` and no text is lost.
|
|
102
|
+
*/
|
|
103
|
+
export function resolveDiscordMentions(
|
|
104
|
+
content: string,
|
|
105
|
+
botUserId: string | undefined,
|
|
106
|
+
lookup: DiscordMentionLookup,
|
|
107
|
+
): string {
|
|
108
|
+
return content.replace(/<(@!?|@&|#)(\d+)>/g, (markup, kind: string, id: string) => {
|
|
109
|
+
if (kind === "#") {
|
|
110
|
+
const name = lookup.channel(id);
|
|
111
|
+
return name ? `#${name}` : markup;
|
|
112
|
+
}
|
|
113
|
+
if (kind === "@&") {
|
|
114
|
+
const name = lookup.role(id);
|
|
115
|
+
return name ? `@${name}` : markup;
|
|
116
|
+
}
|
|
117
|
+
if (id === botUserId) return markup;
|
|
118
|
+
const name = lookup.user(id);
|
|
119
|
+
return name ? `@${name}` : markup;
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/** The part of a discord.js `Message` the lookup reads. */
|
|
124
|
+
export interface DiscordJsMentions {
|
|
125
|
+
users?: { get(id: string): { displayName?: string; username?: string } | undefined };
|
|
126
|
+
members?: { get(id: string): { displayName?: string } | undefined } | null;
|
|
127
|
+
roles?: { get(id: string): { name?: string } | undefined };
|
|
128
|
+
channels?: { get(id: string): object | undefined };
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
/** The part of a discord.js Gateway `Message` the swarm rewrites. */
|
|
132
|
+
export interface DiscordGatewayMessage {
|
|
133
|
+
content: string;
|
|
134
|
+
mentions?: DiscordJsMentions;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
function safeName(read: () => unknown): string | undefined {
|
|
138
|
+
try {
|
|
139
|
+
const value = read();
|
|
140
|
+
return typeof value === "string" && value.trim() ? value : undefined;
|
|
141
|
+
} catch {
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* Lookup over a Gateway message's `mentions` collections. Discord sends the
|
|
148
|
+
* mentioned users (with guild member data) in the message; roles and
|
|
149
|
+
* channels resolve from the guild cache the Guilds intent fills.
|
|
150
|
+
*/
|
|
151
|
+
export function discordJsMentionLookup(
|
|
152
|
+
mentions: DiscordJsMentions | undefined,
|
|
153
|
+
): DiscordMentionLookup {
|
|
154
|
+
return {
|
|
155
|
+
user: (id) =>
|
|
156
|
+
safeName(() => mentions?.members?.get(id)?.displayName) ??
|
|
157
|
+
safeName(() => mentions?.users?.get(id)?.displayName) ??
|
|
158
|
+
safeName(() => mentions?.users?.get(id)?.username),
|
|
159
|
+
role: (id) => safeName(() => mentions?.roles?.get(id)?.name),
|
|
160
|
+
channel: (id) =>
|
|
161
|
+
safeName(() => (mentions?.channels?.get(id) as { name?: unknown } | undefined)?.name),
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/** The part of the Slack adapter used for the bot's own display name (protected in its types). */
|
|
166
|
+
type SlackUserLookup = {
|
|
167
|
+
lookupUser?: (userId: string) => Promise<{ displayName?: string } | null>;
|
|
168
|
+
};
|
|
169
|
+
|
|
170
|
+
/**
|
|
171
|
+
* Every form the bot's own mention takes in this message's text. Slack and
|
|
172
|
+
* Teams render it under a display name that can differ from `userName`.
|
|
173
|
+
*/
|
|
174
|
+
export async function botMentionForms(
|
|
175
|
+
adapter: Adapter,
|
|
176
|
+
message: Message,
|
|
177
|
+
): Promise<BotMentionForms> {
|
|
178
|
+
const names = [adapter.userName];
|
|
179
|
+
const ids = adapter.botUserId ? [adapter.botUserId] : [];
|
|
180
|
+
if (adapter.name === "teams") names.push(...teamsBotMentionNames(message.raw, adapter.botUserId));
|
|
181
|
+
if (adapter.name === "slack" && adapter.botUserId) {
|
|
182
|
+
const lookup = (adapter as Adapter & SlackUserLookup).lookupUser;
|
|
183
|
+
// Cached by the adapter: it already looked the bot up to render the mention.
|
|
184
|
+
const bot = await lookup?.call(adapter, adapter.botUserId).catch(() => null);
|
|
185
|
+
if (bot?.displayName) names.push(bot.displayName);
|
|
186
|
+
}
|
|
187
|
+
return { names, ids };
|
|
188
|
+
}
|
|
@@ -10,8 +10,10 @@ import {
|
|
|
10
10
|
TELEGRAM_PHOTO_LIMIT,
|
|
11
11
|
} from "./limits";
|
|
12
12
|
import { errorMessage } from "./logger";
|
|
13
|
+
import { getChatChannelMapping } from "./router";
|
|
13
14
|
import { getChatInstance } from "./runtime";
|
|
14
15
|
import { assertTrustedChatTarget } from "./teams-origin";
|
|
16
|
+
import { assertTelegramTopicThreadId } from "./telegram-thread";
|
|
15
17
|
|
|
16
18
|
/** The adapter is not configured, failed to start, or is shutting down. */
|
|
17
19
|
export class ChatAdapterUnavailableError extends Error {
|
|
@@ -370,9 +372,24 @@ export async function postChatMessage(args: {
|
|
|
370
372
|
files?: OutboundChatFile[];
|
|
371
373
|
replyToMessageId?: string;
|
|
372
374
|
}): Promise<ChatPostResult> {
|
|
375
|
+
let threadId = args.threadId;
|
|
376
|
+
if (!threadId && args.channelId && args.adapter === "telegram") {
|
|
377
|
+
const mapping = await getChatChannelMapping(args.adapter, args.channelId);
|
|
378
|
+
if (mapping?.defaultThreadId !== undefined) {
|
|
379
|
+
assertTelegramTopicThreadId(mapping.defaultThreadId, args.channelId);
|
|
380
|
+
threadId = mapping.defaultThreadId;
|
|
381
|
+
}
|
|
382
|
+
}
|
|
383
|
+
if (
|
|
384
|
+
args.adapter === "telegram" &&
|
|
385
|
+
threadId?.split(":").length === 3 &&
|
|
386
|
+
!threadId.startsWith("telegram:biz:")
|
|
387
|
+
) {
|
|
388
|
+
assertTelegramTopicThreadId(threadId);
|
|
389
|
+
}
|
|
373
390
|
// Ids come from tools and stored context keys. Check the Teams origin
|
|
374
391
|
// before the adapter sends its token.
|
|
375
|
-
assertTrustedChatTarget(
|
|
392
|
+
assertTrustedChatTarget(threadId ?? args.channelId ?? "");
|
|
376
393
|
const chat = getChatInstance(args.adapter);
|
|
377
394
|
if (!chat) throw new ChatAdapterUnavailableError(args.adapter);
|
|
378
395
|
const parts = (typeof args.text === "string" ? [args.text] : args.text).map(scrubSecrets);
|
|
@@ -383,8 +400,8 @@ export async function postChatMessage(args: {
|
|
|
383
400
|
|
|
384
401
|
let result: ChatPostResult;
|
|
385
402
|
let target: PostTarget;
|
|
386
|
-
if (
|
|
387
|
-
const thread = chat.thread(
|
|
403
|
+
if (threadId) {
|
|
404
|
+
const thread = chat.thread(threadId);
|
|
388
405
|
target = thread;
|
|
389
406
|
// Only adapters with a native reply (Telegram in this SDK version) anchor;
|
|
390
407
|
// the others post unanchored, as before.
|
|
@@ -11,6 +11,7 @@ import { isAgentReachable } from "@/be/runtime-pools/reachability";
|
|
|
11
11
|
import { chatSdkContextKey } from "@/tasks/context-key";
|
|
12
12
|
import type { Agent, RoutingReason } from "@/types";
|
|
13
13
|
import { scrubSecrets } from "@/utils/secret-scrubber";
|
|
14
|
+
import { assertTelegramTopicThreadId } from "./telegram-thread";
|
|
14
15
|
|
|
15
16
|
/** KV namespace of the channel-to-agent/workflow mapping, written by `register-chat-channel`. */
|
|
16
17
|
export const CHAT_CHANNELS_NAMESPACE = "integrations:chat:channels";
|
|
@@ -18,6 +19,7 @@ export const CHAT_CHANNELS_NAMESPACE = "integrations:chat:channels";
|
|
|
18
19
|
export interface ChatChannelMapping {
|
|
19
20
|
agentId?: string;
|
|
20
21
|
workflowId?: string;
|
|
22
|
+
defaultThreadId?: string;
|
|
21
23
|
name?: string;
|
|
22
24
|
createdAt?: string;
|
|
23
25
|
}
|
|
@@ -66,6 +68,12 @@ export async function putChatChannelMapping(
|
|
|
66
68
|
mapping: ChatChannelMapping,
|
|
67
69
|
): Promise<string> {
|
|
68
70
|
const key = chatChannelKey(adapter, channelId);
|
|
71
|
+
if (mapping.defaultThreadId !== undefined) {
|
|
72
|
+
if (adapter !== "telegram") {
|
|
73
|
+
throw new Error("Default topics are supported only for Telegram channels.");
|
|
74
|
+
}
|
|
75
|
+
assertTelegramTopicThreadId(mapping.defaultThreadId, key);
|
|
76
|
+
}
|
|
69
77
|
await upsertKv({
|
|
70
78
|
namespace: CHAT_CHANNELS_NAMESPACE,
|
|
71
79
|
key,
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/** Validate a topic ID before the adapter's permissive parseInt can change its destination. */
|
|
2
|
+
export function assertTelegramTopicThreadId(threadId: string, channelId?: string): void {
|
|
3
|
+
const match = /^telegram:([^:]+):([1-9]\d*)$/.exec(threadId);
|
|
4
|
+
if (!match || match[1] === "biz" || !Number.isSafeInteger(Number(match[2]))) {
|
|
5
|
+
throw new Error(
|
|
6
|
+
"Invalid Telegram topic threadId. Use telegram:<chatId>:<positive integer topicId>.",
|
|
7
|
+
);
|
|
8
|
+
}
|
|
9
|
+
if (channelId !== undefined && `telegram:${match[1]}` !== channelId) {
|
|
10
|
+
throw new Error("The default Telegram topic must belong to the registered channel.");
|
|
11
|
+
}
|
|
12
|
+
}
|