@desplega.ai/agent-swarm 2.8.1 → 2.8.3
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-xq6s2z6t.js +14 -0
- package/dist/{actions-pwjpn0j6.js → actions-ewz7bp4g.js} +20 -19
- package/dist/{amp-adapter-cq9jgj6x.js → amp-adapter-f25tqhnf.js} +3 -3
- package/dist/{app-cnfffgwg.js → app-mkptw0k7.js} +4 -4
- package/dist/{assistant-kpn317y1.js → assistant-c47rfe77.js} +23 -22
- package/dist/{boot-args-schema-pbbnhmc3.js → boot-args-schema-4vb0xsat.js} +1 -1
- package/dist/{boot-reembed-9m0ysxma.js → boot-reembed-1ghy2sab.js} +1 -1
- package/dist/{boot-reembed-majbn53m.js → boot-reembed-htr73hbs.js} +1 -1
- package/dist/{boot-scrub-sweep-app8g8ym.js → boot-scrub-sweep-yrytg42z.js} +4 -4
- package/dist/{boot-seeds-pbtmvcjm.js → boot-seeds-n2b3dx4e.js} +4 -4
- package/dist/{boxd-qbkxy6ap.js → boxd-jmfqgkqa.js} +2 -2
- package/dist/{claude-adapter-wn1g3qp5.js → claude-adapter-r33pqnzx.js} +8 -9
- package/dist/{claude-managed-adapter-jh6c523j.js → claude-managed-adapter-hddmxjyj.js} +4 -4
- package/dist/{claude-managed-setup-pd47nzch.js → claude-managed-setup-hfvry1bd.js} +5 -5
- package/dist/{claude-sdk-session-3a2a6589.js → claude-sdk-session-0hamqzc7.js} +10 -11
- package/dist/{cli-v1dv1r37.js → cli-0bcgyj5b.js} +74 -3
- package/dist/{cli-a3b239vq.js → cli-0vksaxvr.js} +2 -2
- package/dist/{cli-mrt48bx7.js → cli-15204js0.js} +1 -1
- package/dist/{cli-8aes17e4.js → cli-1m96dc36.js} +3 -3
- package/dist/{cli-2r0jcc3k.js → cli-2d0cghfn.js} +1 -1
- package/dist/{cli-wk18cm92.js → cli-4ax9mvvg.js} +4 -4
- package/dist/{cli-9wngrawf.js → cli-4dpkjc2e.js} +6 -6
- package/dist/{cli-x1wa213s.js → cli-4e1hfbpq.js} +5 -5
- package/dist/{cli-7349va39.js → cli-500c09j9.js} +921 -431
- package/dist/{cli-m4dqmnbp.js → cli-54qr8mcd.js} +2 -2
- package/dist/{cli-m88rpzkh.js → cli-5a7szzfh.js} +2 -2
- package/dist/{cli-bst1vp7e.js → cli-5y2fvw4z.js} +13 -5
- package/dist/{cli-vj75tyaw.js → cli-6yygkr0w.js} +7 -7
- package/dist/{cli-7b8sbmag.js → cli-7c5tgqhf.js} +5 -5
- package/dist/{cli-2gxeg5gr.js → cli-8476gtwf.js} +1 -1
- package/dist/{cli-yncmerje.js → cli-922z7gwm.js} +4 -4
- package/dist/{cli-jrzkw01m.js → cli-93t5s4zq.js} +2 -2
- package/dist/{cli-sn7rtnj4.js → cli-9zmb7ptc.js} +9 -9
- package/dist/{cli-tk7cjj8h.js → cli-am1ptset.js} +3 -3
- package/dist/{cli-cyhbbd1z.js → cli-awwptga4.js} +1 -1
- package/dist/{cli-89cqnasv.js → cli-bhsfbmk8.js} +19 -7
- package/dist/{cli-9vhebtjz.js → cli-bj6qhgte.js} +15 -32
- package/dist/{cli-g70vxtjh.js → cli-c0xjnr8z.js} +2 -2
- package/dist/{cli-vqptjbr7.js → cli-c3ng0mb4.js} +14 -14
- package/dist/{cli-re4raaj0.js → cli-c71n3bxq.js} +11 -6
- package/dist/{cli-7p1kvkck.js → cli-crpf163n.js} +25 -18
- package/dist/{cli-k0wwfqbg.js → cli-dns0y538.js} +4 -0
- package/dist/{cli-d3p5vwbk.js → cli-dpsfwh7n.js} +13 -21
- package/dist/{cli-xzm9vcfg.js → cli-dtdht77h.js} +2 -2
- package/dist/{cli-bb431xey.js → cli-e2w34h6z.js} +231 -68
- package/dist/{cli-eddnyg3t.js → cli-emekyyhr.js} +1 -1
- package/dist/{cli-d84byzn8.js → cli-f1kwb5fc.js} +109 -33
- package/dist/{cli-0jzra9ad.js → cli-gn9y6fn7.js} +2 -2
- package/dist/{cli-tqegb8eq.js → cli-gpz1d0t2.js} +4 -4
- package/dist/{cli-7w69ne2f.js → cli-h9yy18gy.js} +239 -67
- package/dist/{cli-m5akxq8q.js → cli-j8cjdzan.js} +1 -1
- package/dist/{cli-m9s2qff2.js → cli-jg5txpm6.js} +187 -93
- package/dist/{cli-k26bkr9t.js → cli-k2rw11py.js} +3 -3
- package/dist/{cli-93k32c37.js → cli-k96cecs7.js} +377 -61
- package/dist/{cli-3vjhs18n.js → cli-kd56bmk4.js} +1 -1
- package/dist/{cli-k0615eh8.js → cli-kmemts3w.js} +13 -13
- package/dist/{cli-pcad4cb1.js → cli-knva3nmx.js} +2 -2
- package/dist/{cli-b085njxz.js → cli-kw44j53p.js} +15 -14
- package/dist/{cli-bsywb58a.js → cli-mdpbjnzq.js} +10 -10
- package/dist/{cli-syybb0p1.js → cli-me0r8gzr.js} +35 -76
- package/dist/{cli-4r05hnqa.js → cli-mwwmka77.js} +15 -15
- package/dist/{cli-1xh9a7hn.js → cli-n5t077me.js} +2 -2
- package/dist/{cli-rvhdmjvt.js → cli-nx2n3z6p.js} +1 -1
- package/dist/{cli-28fq781p.js → cli-pe4d96rb.js} +1 -1
- package/dist/{cli-3rkdne1h.js → cli-pxwtcgcp.js} +2 -2
- package/dist/{cli-zcsw143p.js → cli-qmqt520k.js} +2 -2
- package/dist/{cli-2zp0et3v.js → cli-qps8je6j.js} +70 -19
- package/dist/{cli-xae4g51r.js → cli-rh15cakt.js} +1 -1
- package/dist/{cli-k93bq1wq.js → cli-rjvsf9qa.js} +5 -5
- package/dist/{cli-6mma83xa.js → cli-rqfvkx5t.js} +7 -7
- package/dist/{cli-dy32zecz.js → cli-s7zz734a.js} +1 -1
- package/dist/{cli-yn2bbre9.js → cli-s8p8hhty.js} +2 -2
- package/dist/{cli-vbh10fqa.js → cli-sdvcrq5x.js} +5 -5
- package/dist/{cli-b5rs97a6.js → cli-sg27rk2t.js} +5 -5
- package/dist/{cli-d6521kb5.js → cli-skmhsnqh.js} +1 -1
- package/dist/{cli-5mrq3ake.js → cli-t4dv07kr.js} +1 -1
- package/dist/{cli-hxpyc9sn.js → cli-t5ys4ebm.js} +3 -3
- package/dist/{cli-qmqk2yc2.js → cli-tas6ckky.js} +2 -2
- package/dist/{cli-p1w18yhx.js → cli-tf79ryyy.js} +1 -1
- package/dist/{cli-kc7v1nfv.js → cli-tnzebztn.js} +1 -1
- package/dist/{cli-gax7fk3t.js → cli-vx421edw.js} +3 -3
- package/dist/{cli-kchjb7qy.js → cli-x3ex5bqf.js} +1 -1
- package/dist/cli-yss07azk.js +142 -0
- package/dist/{cli-0ntbxyaa.js → cli-z8cvws4c.js} +363 -47
- package/dist/{cli-tacge1w0.js → cli-zdaypkq9.js} +146 -52
- package/dist/{cli-b8e9nb04.js → cli-zeaehgyd.js} +2 -2
- package/dist/{cli-jcpr5smb.js → cli-ztq5z4e1.js} +4 -4
- package/dist/cli.js +21 -21
- package/dist/{codex-adapter-nha71q3n.js → codex-adapter-2brxx5ta.js} +7 -8
- package/dist/{codex-hook-h3vk6xzr.js → codex-hook-c930c3ea.js} +2 -2
- package/dist/{codex-login-bcda78ge.js → codex-login-cbrs1h5w.js} +1 -1
- package/dist/{codex-session-runner-ak9x1k1h.js → codex-session-runner-y9anfj0r.js} +8 -9
- package/dist/{commands-f587qpq8.js → commands-wn9q06qr.js} +3 -3
- package/dist/{controller-hxx8wwy1.js → controller-fw608czd.js} +4 -4
- package/dist/{controllers-connect-k5sg9m9h.js → controllers-connect-63j5rdcm.js} +20 -20
- package/dist/{cursor-adapter-n5nc3mfe.js → cursor-adapter-6mb9jme8.js} +2 -2
- package/dist/{db-nzf8zb5z.js → db-0m6v5tq4.js} +3 -3
- package/dist/{db-amm8w15a.js → db-y4wfrzbm.js} +4 -2
- package/dist/{devin-adapter-xedz98zv.js → devin-adapter-r0yx3gv8.js} +1 -1
- package/dist/{dispatcher-89zrts8f.js → dispatcher-9tq2zzdj.js} +17 -17
- package/dist/{docker-866qpzt9.js → docker-j75atvpt.js} +2 -2
- package/dist/{dsh-adapter-nrhbrjz8.js → dsh-adapter-t09sv4tq.js} +2 -2
- package/dist/{e2b-s16txnpx.js → e2b-7s9dscap.js} +3 -3
- package/dist/{e2b-jkwfhbcv.js → e2b-a7vzs2vj.js} +3 -3
- package/dist/{easter-egg-3d-533knw22.js → easter-egg-3d-fbwvmwhe.js} +1 -1
- package/dist/{embedding-space-ezwenjmj.js → embedding-space-wh8de1t9.js} +6 -6
- package/dist/{embeddings-np74ht6g.js → embeddings-3hpbdtjr.js} +1 -1
- package/dist/{event-bus-e66gh7cc.js → event-bus-tr6h3gv8.js} +1 -1
- package/dist/{execute-b3mrb1mv.js → execute-4bdf8sdy.js} +1 -1
- package/dist/{external-channel-z46yx9d7.js → external-channel-ts2fwqh0.js} +2 -2
- package/dist/fx-adapter-1rnxnf56.js +17 -0
- package/dist/grok-adapter-efhmf1r8.js +17 -0
- package/dist/handlers-anrr3py9.js +32 -0
- package/dist/{heartbeat-dt9qw9c8.js → heartbeat-2ze5fzpc.js} +20 -20
- package/dist/{hook-8k6fbz9b.js → hook-ca54yd4s.js} +5 -5
- package/dist/{hook-jgcgygex.js → hook-gaehe2w5.js} +8 -8
- package/dist/{http-haw4r8ne.js → http-jfg8t2yk.js} +3839 -122
- package/dist/{index-tvfafeyy.js → index-3gv6sc4z.js} +1 -1
- package/dist/{index-tez78qj3.js → index-3yvzbhxd.js} +100 -23
- package/dist/index-8w2aznds.js +33 -0
- package/dist/{index-5gk12my8.js → index-csgrxedz.js} +1 -1
- package/dist/index-qnjvr362.js +37 -0
- package/dist/index-yzxd3sn9.js +32 -0
- package/dist/{keepalive-xn6s7rmg.js → keepalive-k2a3qe73.js} +4 -4
- package/dist/lead-zhxqbfdv.js +69 -0
- package/dist/{maintenance-vdts800b.js → maintenance-gb5sd5nc.js} +1 -1
- package/dist/{node-4c5jqxr3.js → node-7qsx5kvm.js} +1 -1
- package/dist/{oauth-refresh-sweep-094c8wfk.js → oauth-refresh-sweep-y7rm6bkb.js} +3 -3
- package/dist/{onboard-v99eh56m.js → onboard-jmc5qerv.js} +4 -4
- package/dist/{opencode-adapter-dsagkhtw.js → opencode-adapter-7eade9ev.js} +6 -7
- package/dist/{otel-impl-q7yr9yp0.js → otel-impl-8j1xhxqd.js} +2 -2
- package/dist/{pi-mono-adapter-546cd1cc.js → pi-mono-adapter-yqmaf32x.js} +14 -13
- package/dist/{pricing-refresh-7dh2yase.js → pricing-refresh-1nj722h6.js} +2 -2
- package/dist/{rbac-roles-mdmc96p4.js → rbac-roles-b1mtr6dr.js} +3 -3
- package/dist/{rbac-roles-npbmdh77.js → rbac-roles-n1f3frk1.js} +2 -2
- package/dist/{render-v2-twhhwmms.js → render-v2-1gfpd8rj.js} +4 -4
- package/dist/{resume-5gsrjd5e.js → resume-w1s1eh5v.js} +7 -7
- package/dist/{runtime-1hv06jsn.js → runtime-84g5egsc.js} +1 -1
- package/dist/{session-access-m191x30x.js → session-access-y6z1txk4.js} +4 -4
- package/dist/{session-source-backfill-nt923ask.js → session-source-backfill-gxxwfh12.js} +3 -3
- package/dist/{setup-wv467afy.js → setup-r91gstyk.js} +1 -1
- package/dist/{virtual-modules-gazyapte.js → virtual-modules-cgnj6kme.js} +3 -3
- package/dist/{work-objects-8zkrpy13.js → work-objects-qcxzg61c.js} +20 -20
- package/dist/worker-7j2907g6.js +69 -0
- package/dist/{worker-follow-up-cecqszem.js → worker-follow-up-y2d2h7km.js} +19 -17
- package/dist/{x-2fyrt5pp.js → x-qhxq2ama.js} +2 -2
- package/openapi.json +2908 -351
- package/package.json +4 -4
- package/src/apps/catalog.generated.json +120 -1
- package/src/apps/definition.ts +38 -11
- package/src/apps/page-validator.ts +88 -0
- package/src/be/db/model-profiles.ts +110 -11
- package/src/be/db/tasks/read.ts +53 -0
- package/src/be/db/workflow-run-definitions.ts +19 -8
- package/src/be/db-client.ts +43 -5
- package/src/be/db.ts +40 -9
- package/src/be/migrations/284_model_profile_fallbacks.sql +9 -0
- package/src/be/migrations/289_automation_savings_daily.sql +47 -0
- package/src/be/migrations/291_task_slack_participants.sql +4 -0
- package/src/be/migrations/293_savings_component_links.sql +58 -0
- package/src/be/migrations/296_automation_savings_daily_read_index.sql +6 -0
- package/src/be/model-profile-check.ts +53 -20
- package/src/be/runtime-pools/routing.ts +1 -0
- package/src/be/savings/calibrate.ts +468 -0
- package/src/be/savings/compute.ts +677 -0
- package/src/be/savings/model.ts +674 -0
- package/src/be/savings/read.ts +1500 -0
- package/src/be/savings/rollup.ts +571 -0
- package/src/be/scripts/run-credential.ts +15 -3
- package/src/be/scripts/typecheck.ts +91 -4
- package/src/be/seed/agent-fs-provision.ts +48 -11
- package/src/be/seed/workflows-seeder.ts +67 -23
- package/src/be/seed-scripts/catalog/dreaming-learnings.ts +10 -2
- package/src/be/seed-scripts/catalog/dreaming-memtax-create.ts +70 -4
- package/src/be/skill-parser.ts +19 -7
- package/src/be/swarm-config-guard.ts +8 -0
- package/src/be/users.ts +29 -2
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/provider-error-class.ts +97 -0
- package/src/commands/runner.ts +258 -58
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/http/all-routes.ts +2 -0
- package/src/http/fs.ts +8 -2
- package/src/http/index.ts +11 -0
- package/src/http/model-profiles.ts +43 -10
- package/src/http/poll.ts +15 -1
- package/src/http/requested-by.ts +97 -1
- package/src/http/savings-calibration.ts +277 -0
- package/src/http/savings.ts +849 -0
- package/src/http/scripts.ts +26 -15
- package/src/http/tasks.ts +89 -9
- package/src/http/trackers/authorize-gate.ts +41 -0
- package/src/http/trackers/jira.ts +26 -4
- package/src/http/trackers/linear.ts +26 -4
- package/src/integrations/chat-sdk/limits.ts +6 -1
- package/src/jira/oauth.ts +7 -1
- package/src/linear/README.md +2 -1
- package/src/linear/oauth.ts +7 -1
- package/src/prompts/session-templates.ts +80 -3
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +0 -20
- package/src/providers/claude-flag-settings.ts +12 -10
- package/src/providers/codex-adapter.ts +12 -34
- package/src/providers/opencode-adapter.ts +34 -12
- package/src/providers/pi-mono-adapter.ts +6 -5
- package/src/providers/types.ts +7 -0
- package/src/scheduler/scheduler.ts +20 -14
- package/src/scripts-runtime/ctx.ts +1 -1
- package/src/scripts-runtime/executors/quickjs-bundle.ts +1 -0
- package/src/scripts-runtime/executors/quickjs-prelude.ts +162 -2
- package/src/scripts-runtime/executors/quickjs-runner.ts +4 -1
- package/src/scripts-runtime/sdk-allowlist.ts +11 -1
- package/src/scripts-runtime/stdlib/fetch.ts +113 -15
- package/src/scripts-runtime/stdlib/index.ts +3 -1
- package/src/scripts-runtime/stdlib/retry.ts +174 -0
- package/src/scripts-runtime/swarm-sdk.ts +192 -17
- package/src/scripts-runtime/types/stdlib.d.ts +95 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +60 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +69 -2
- package/src/slack/actions.ts +1 -0
- package/src/slack/assistant.ts +2 -0
- package/src/slack/enrich.ts +144 -50
- package/src/slack/handlers.ts +37 -95
- package/src/slack/templates.ts +9 -0
- package/src/slack/thread-buffer.ts +45 -71
- package/src/slack/thread-participants.ts +187 -0
- package/src/tasks/worker-follow-up.ts +142 -3
- package/src/tests/agent-fs-provision-seeder.test.ts +81 -0
- package/src/tests/apps-chart-shell.test.ts +170 -0
- package/src/tests/apps-icon.test.ts +156 -2
- package/src/tests/base-prompt.test.ts +5 -4
- package/src/tests/chat-sdk-relay.test.ts +12 -0
- package/src/tests/claude-adapter-binary.test.ts +7 -1
- package/src/tests/claude-adapter.test.ts +10 -64
- package/src/tests/claude-flag-settings.test.ts +15 -11
- package/src/tests/claude-hook-credentials.test.ts +0 -1
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -1
- package/src/tests/codex-adapter.test.ts +28 -78
- package/src/tests/comb-default.test.ts +6 -0
- package/src/tests/core-auth.test.ts +7 -6
- package/src/tests/create-task-vcs-repo.test.ts +136 -0
- package/src/tests/db-client-busy-retry.test.ts +58 -6
- package/src/tests/db-task-read-contract.test.ts +2 -0
- package/src/tests/db-task-write-contract.test.ts +1 -0
- package/src/tests/deploy-guard.test.ts +154 -0
- package/src/tests/docs-index-footprint.test.js +3 -3
- package/src/tests/dreaming-learnings.test.ts +104 -0
- package/src/tests/extensions-pre-task.test.ts +4 -2
- package/src/tests/fetch-resolved-env.test.ts +47 -1
- package/src/tests/fixtures/app-shell-charts-definition.json.txt +180 -0
- package/src/tests/model-profile-fallbacks.test.ts +482 -0
- package/src/tests/model-profiles-api.test.ts +1 -0
- package/src/tests/opencode-adapter.test.ts +53 -6
- package/src/tests/pi-mono-session-cost-on-abort.test.ts +115 -0
- package/src/tests/prompt-template-session.test.ts +17 -1
- package/src/tests/provider-error-class.test.ts +174 -0
- package/src/tests/runner-provider-fallback.test.ts +197 -0
- package/src/tests/runner-requester-profile.test.ts +139 -1
- package/src/tests/savings-calibration-api.test.ts +264 -0
- package/src/tests/savings-calibration.test.ts +201 -0
- package/src/tests/savings-compound.test.ts +774 -0
- package/src/tests/savings-compute.test.ts +215 -0
- package/src/tests/savings-fleet-latency.test.ts +143 -0
- package/src/tests/savings-fleet-read.test.ts +195 -0
- package/src/tests/savings-fleet-scale.test.ts +222 -0
- package/src/tests/savings-model.test.ts +499 -0
- package/src/tests/savings-read.test.ts +367 -0
- package/src/tests/savings-rollup.test.ts +766 -0
- package/src/tests/savings-scripts.test.ts +611 -0
- package/src/tests/script-connections.test.ts +4 -0
- package/src/tests/script-executor-conformance.test.ts +444 -0
- package/src/tests/scripts-http.test.ts +55 -0
- package/src/tests/scripts-runtime-fetch.test.ts +2 -2
- package/src/tests/sdk-allowlist.test.ts +40 -0
- package/src/tests/secret-rules.test.ts +124 -1
- package/src/tests/secret-scrubber.test.ts +1 -1
- package/src/tests/seed-workflows.test.ts +167 -11
- package/src/tests/skill-parser.test.ts +45 -0
- package/src/tests/slack-dm-implicit-mention.test.ts +20 -1
- package/src/tests/slack-identity-resolution.test.ts +23 -0
- package/src/tests/slack-inbound-files.test.ts +2 -1
- package/src/tests/slack-thread-participants.test.ts +429 -0
- package/src/tests/tool-annotations.test.ts +30 -0
- package/src/tests/tracker-oauth-authorize-auth.test.ts +262 -0
- package/src/tests/workflow-definition-pinning.test.ts +128 -3
- package/src/tests/workflow-script-principal.test.ts +94 -4
- package/src/tools/app-upsert.ts +1 -1
- package/src/tools/model-profiles/list-model-profiles.ts +4 -2
- package/src/tools/update-profile.ts +1 -1
- package/src/types.ts +146 -33
- package/src/utils/constants.ts +2 -0
- package/src/utils/mcp-server-fetcher.test.ts +89 -0
- package/src/utils/mcp-server-fetcher.ts +13 -5
- package/src/utils/request-auth-context.ts +24 -0
- package/src/utils/secret-rules.generated.ts +1 -1
- package/src/utils/secret-scrubber.ts +154 -29
- package/src/workflows/executors/swarm-script.ts +23 -19
- package/templates/skills/apps/SKILL.md +62 -3
- package/templates/skills/apps/content.md +62 -3
- package/templates/skills/swarm-docs/content.md +2 -0
- package/templates/skills/swarm-scripts/SKILL.md +5 -4
- package/templates/skills/swarm-scripts/content.md +5 -4
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/templates/workflows/dreaming/content.md +1 -1
- package/dist/acp-adapter-pdy3qsvg.js +0 -15
- package/dist/cli-4bd1rck6.js +0 -4
- package/dist/cli-jywyhqws.js +0 -104
- package/dist/fx-adapter-3q12snn6.js +0 -18
- package/dist/grok-adapter-ahb1w033.js +0 -18
- package/dist/handlers-vbww69re.js +0 -32
- package/dist/index-4xwaf5th.js +0 -32
- package/dist/index-f0hcrs8e.js +0 -33
- package/dist/index-s4ewdma4.js +0 -37
- package/dist/lead-6ygbfhbh.js +0 -70
- package/dist/worker-mz5z7kj0.js +0 -70
- package/src/providers/ctx-mode-env.ts +0 -10
|
@@ -9,11 +9,35 @@ declare module "stdlib" {
|
|
|
9
9
|
meta<T>(self: Redacted<T>): { type: "system" | "user"; isSecret: boolean };
|
|
10
10
|
isSecret<T>(self: Redacted<T>): boolean;
|
|
11
11
|
};
|
|
12
|
-
export function fetch(input: string | URL | Request, init?:
|
|
13
|
-
export function fetchJson(input: string | URL | Request, init?:
|
|
12
|
+
export function fetch(input: string | URL | Request, init?: FetchOptions): Promise<Response>;
|
|
13
|
+
export function fetchJson(input: string | URL | Request, init?: FetchOptions): Promise<unknown>;
|
|
14
14
|
export function grep(pattern: string, files?: string | string[]): Promise<string>;
|
|
15
15
|
export function glob(pattern: string): Promise<string[]>;
|
|
16
16
|
export function table(rows: Array<Record<string, unknown>>): string;
|
|
17
|
+
export interface RetryOptions {
|
|
18
|
+
retries?: number;
|
|
19
|
+
minDelayMs?: number;
|
|
20
|
+
maxDelayMs?: number;
|
|
21
|
+
budgetMs?: number;
|
|
22
|
+
retryOn?: (errorOrResult: unknown, attempt: number) => boolean | Promise<boolean>;
|
|
23
|
+
signal?: AbortSignal;
|
|
24
|
+
}
|
|
25
|
+
export interface FetchRetryOptions extends RetryOptions {
|
|
26
|
+
idempotencyKey?: boolean | string;
|
|
27
|
+
}
|
|
28
|
+
export type FetchOptions = RequestInit & {
|
|
29
|
+
retry?: boolean | FetchRetryOptions;
|
|
30
|
+
/** @deprecated Use retry: { retries }. Total attempts. */
|
|
31
|
+
retries?: number;
|
|
32
|
+
timeoutMs?: number;
|
|
33
|
+
};
|
|
34
|
+
export const retry: {
|
|
35
|
+
<T>(fn: (attempt: number) => T | Promise<T>, options?: RetryOptions): Promise<Awaited<T>>;
|
|
36
|
+
wrap<A extends unknown[], T>(
|
|
37
|
+
fn: (...args: A) => T | Promise<T>,
|
|
38
|
+
options?: RetryOptions,
|
|
39
|
+
): (...args: A) => Promise<Awaited<T>>;
|
|
40
|
+
};
|
|
17
41
|
}
|
|
18
42
|
|
|
19
43
|
declare module "swarm-sdk" {
|
|
@@ -310,6 +334,15 @@ declare module "swarm-sdk" {
|
|
|
310
334
|
executor?: ScriptExecutorName | null;
|
|
311
335
|
idempotencyKey?: string;
|
|
312
336
|
}): Promise<unknown>;
|
|
337
|
+
// --- savings calibration (REST only) ---
|
|
338
|
+
/** The savings curve in use (shipped or derived from this deployment) and the stored row's metadata. */
|
|
339
|
+
savings_calibrationGet(): Promise<unknown>;
|
|
340
|
+
/** Derive the curve from the last `days` of sessions. Read-only unless `apply` is true (needs config write access). One run at a time; takes up to 120 s, so call it from a script with a long enough timeout. */
|
|
341
|
+
savings_calibrationRun(args?: {
|
|
342
|
+
days?: number;
|
|
343
|
+
end?: string;
|
|
344
|
+
apply?: boolean;
|
|
345
|
+
}): Promise<unknown>;
|
|
313
346
|
// --- swarm / agent ---
|
|
314
347
|
swarm_get(args?: { includeFull?: boolean }): Promise<unknown>;
|
|
315
348
|
agent_info(args?: Record<string, unknown>): Promise<unknown>;
|
|
@@ -741,12 +774,70 @@ declare module "swarm-sdk" {
|
|
|
741
774
|
}): Promise<unknown>;
|
|
742
775
|
}
|
|
743
776
|
|
|
777
|
+
export interface RetryOptions {
|
|
778
|
+
/** Retries after the first call. Default 3, so at most 4 calls. */
|
|
779
|
+
retries?: number;
|
|
780
|
+
/** First backoff delay in ms. Doubles on each retry, with jitter. Default 200. */
|
|
781
|
+
minDelayMs?: number;
|
|
782
|
+
/** Cap on a single wait, including a Retry-After wait. Default 5000. */
|
|
783
|
+
maxDelayMs?: number;
|
|
784
|
+
/** Total time across all calls and waits, in ms. Default 30000. */
|
|
785
|
+
budgetMs?: number;
|
|
786
|
+
/**
|
|
787
|
+
* Decides whether to retry: gets the thrown error or the returned value and
|
|
788
|
+
* the 1-based attempt. Default: retry any throw, plus a failed fetch Response,
|
|
789
|
+
* ctx.api raw result or ctx.swarm envelope with status 429, 502, 503 or 504.
|
|
790
|
+
*/
|
|
791
|
+
retryOn?: (errorOrResult: unknown, attempt: number) => boolean | Promise<boolean>;
|
|
792
|
+
/** Stops the retries: once it aborts, the wait ends and retry rejects with its reason. */
|
|
793
|
+
signal?: AbortSignal;
|
|
794
|
+
}
|
|
795
|
+
|
|
796
|
+
export interface FetchRetryOptions extends RetryOptions {
|
|
797
|
+
/**
|
|
798
|
+
* Sends an Idempotency-Key header, the same value on every attempt: true
|
|
799
|
+
* generates a UUID per call, a string is used as is. A POST or PATCH with
|
|
800
|
+
* the header also retries 502/503/504 and network errors. It only prevents
|
|
801
|
+
* a duplicate when the server dedupes by the key.
|
|
802
|
+
*/
|
|
803
|
+
idempotencyKey?: boolean | string;
|
|
804
|
+
}
|
|
805
|
+
|
|
806
|
+
/**
|
|
807
|
+
* ctx.stdlib.fetch options. Default retries: 429 on every method (Retry-After
|
|
808
|
+
* honoured); 502/503/504 and network errors on GET, HEAD, OPTIONS, PUT, DELETE,
|
|
809
|
+
* or any request with an Idempotency-Key. A stream body gets one attempt.
|
|
810
|
+
*/
|
|
811
|
+
export type FetchOptions = RequestInit & {
|
|
812
|
+
/** false: one attempt. true or omitted: the defaults above. An object tunes them. */
|
|
813
|
+
retry?: boolean | FetchRetryOptions;
|
|
814
|
+
/** @deprecated Use retry: { retries }. Total attempts, so retries: 1 is one attempt. */
|
|
815
|
+
retries?: number;
|
|
816
|
+
/** Per-attempt timeout in ms. Default 30000. */
|
|
817
|
+
timeoutMs?: number;
|
|
818
|
+
};
|
|
819
|
+
|
|
820
|
+
export interface Retry {
|
|
821
|
+
/**
|
|
822
|
+
* Calls fn(attempt) (sync or async) until it succeeds or a retry is not
|
|
823
|
+
* warranted. Out of attempts or budget: rethrows the last error or returns
|
|
824
|
+
* the last result. Honours Retry-After on a 429, capped by maxDelayMs.
|
|
825
|
+
*/
|
|
826
|
+
<T>(fn: (attempt: number) => T | Promise<T>, options?: RetryOptions): Promise<Awaited<T>>;
|
|
827
|
+
/** Returns a reusable function with fn's arguments that retries each call. */
|
|
828
|
+
wrap<A extends unknown[], T>(
|
|
829
|
+
fn: (...args: A) => T | Promise<T>,
|
|
830
|
+
options?: RetryOptions,
|
|
831
|
+
): (...args: A) => Promise<Awaited<T>>;
|
|
832
|
+
}
|
|
833
|
+
|
|
744
834
|
export interface ScriptStdlib {
|
|
745
|
-
fetch(input: string | URL | Request, init?:
|
|
746
|
-
fetchJson(input: string | URL | Request, init?:
|
|
835
|
+
fetch(input: string | URL | Request, init?: FetchOptions): Promise<Response>;
|
|
836
|
+
fetchJson(input: string | URL | Request, init?: FetchOptions): Promise<unknown>;
|
|
747
837
|
grep(pattern: string, files?: string | string[]): Promise<string>;
|
|
748
838
|
glob(pattern: string): Promise<string[]>;
|
|
749
839
|
table(rows: Array<Record<string, unknown>>): string;
|
|
840
|
+
retry: Retry;
|
|
750
841
|
Redacted: RedactedStatic;
|
|
751
842
|
}
|
|
752
843
|
|
|
@@ -41,6 +41,19 @@ declare module "swarm-extension" {
|
|
|
41
41
|
slackThreadTs?: string | undefined;
|
|
42
42
|
slackTriggerMessageTs?: string | undefined;
|
|
43
43
|
slackUserId?: string | undefined;
|
|
44
|
+
slackParticipants?:
|
|
45
|
+
| {
|
|
46
|
+
people: {
|
|
47
|
+
slackUserId: string;
|
|
48
|
+
trust: "external" | "unknown" | "internal";
|
|
49
|
+
userId?: string | undefined;
|
|
50
|
+
starter?: boolean | undefined;
|
|
51
|
+
newest?: boolean | undefined;
|
|
52
|
+
asked?: boolean | undefined;
|
|
53
|
+
}[];
|
|
54
|
+
more: number;
|
|
55
|
+
}
|
|
56
|
+
| undefined;
|
|
44
57
|
overrideSlackContext?: boolean | undefined;
|
|
45
58
|
vcsProvider?: "github" | "gitlab" | "azure-devops" | "bitbucket" | undefined;
|
|
46
59
|
vcsRepo?: string | undefined;
|
|
@@ -62,6 +75,23 @@ declare module "swarm-extension" {
|
|
|
62
75
|
modelTier?: "smol" | "regular" | "smart" | "ultra" | undefined;
|
|
63
76
|
effort?: "low" | "medium" | "high" | "max" | "off" | "xhigh" | undefined;
|
|
64
77
|
profile?: string | undefined;
|
|
78
|
+
fallbackHops?:
|
|
79
|
+
| {
|
|
80
|
+
from: string;
|
|
81
|
+
profile: string;
|
|
82
|
+
errorClass:
|
|
83
|
+
| "rate_limit"
|
|
84
|
+
| "model_window"
|
|
85
|
+
| "seat"
|
|
86
|
+
| "credits"
|
|
87
|
+
| "overloaded"
|
|
88
|
+
| "server_error"
|
|
89
|
+
| "auth"
|
|
90
|
+
| "pool_empty";
|
|
91
|
+
at: string;
|
|
92
|
+
skipped?: { profile: string; reason: string }[] | undefined;
|
|
93
|
+
}[]
|
|
94
|
+
| undefined;
|
|
65
95
|
scheduleId?: string | undefined;
|
|
66
96
|
workflowRunId?: string | undefined;
|
|
67
97
|
workflowRunStepId?: string | undefined;
|
|
@@ -175,6 +205,19 @@ declare module "swarm-extension" {
|
|
|
175
205
|
slackThreadTs?: string | undefined;
|
|
176
206
|
slackTriggerMessageTs?: string | undefined;
|
|
177
207
|
slackUserId?: string | undefined;
|
|
208
|
+
slackParticipants?:
|
|
209
|
+
| {
|
|
210
|
+
people: {
|
|
211
|
+
slackUserId: string;
|
|
212
|
+
trust: "external" | "unknown" | "internal";
|
|
213
|
+
userId?: string | undefined;
|
|
214
|
+
starter?: boolean | undefined;
|
|
215
|
+
newest?: boolean | undefined;
|
|
216
|
+
asked?: boolean | undefined;
|
|
217
|
+
}[];
|
|
218
|
+
more: number;
|
|
219
|
+
}
|
|
220
|
+
| undefined;
|
|
178
221
|
slackProgressMessageTs?: string | undefined;
|
|
179
222
|
slackTreeRootMessageTs?: string | undefined;
|
|
180
223
|
vcsProvider?: "github" | "gitlab" | "azure-devops" | "bitbucket" | undefined;
|
|
@@ -204,6 +247,23 @@ declare module "swarm-extension" {
|
|
|
204
247
|
resolvedEffort?: "low" | "medium" | "high" | "max" | "off" | "xhigh" | undefined;
|
|
205
248
|
profile?: string | undefined;
|
|
206
249
|
resolvedProfile?: string | undefined;
|
|
250
|
+
fallbackHops?:
|
|
251
|
+
| {
|
|
252
|
+
from: string;
|
|
253
|
+
profile: string;
|
|
254
|
+
errorClass:
|
|
255
|
+
| "rate_limit"
|
|
256
|
+
| "model_window"
|
|
257
|
+
| "seat"
|
|
258
|
+
| "credits"
|
|
259
|
+
| "overloaded"
|
|
260
|
+
| "server_error"
|
|
261
|
+
| "auth"
|
|
262
|
+
| "pool_empty";
|
|
263
|
+
at: string;
|
|
264
|
+
skipped?: { profile: string; reason: string }[] | undefined;
|
|
265
|
+
}[]
|
|
266
|
+
| undefined;
|
|
207
267
|
scheduleId?: string | undefined;
|
|
208
268
|
workflowRunId?: string | null | undefined;
|
|
209
269
|
workflowRunStepId?: string | null | undefined;
|
|
@@ -292,6 +292,15 @@ declare module "swarm-sdk" {
|
|
|
292
292
|
executor?: ScriptExecutorName | null;
|
|
293
293
|
idempotencyKey?: string;
|
|
294
294
|
}): Promise<unknown>;
|
|
295
|
+
// --- savings calibration (REST only) ---
|
|
296
|
+
/** The savings curve in use (shipped or derived from this deployment) and the stored row's metadata. */
|
|
297
|
+
savings_calibrationGet(): Promise<unknown>;
|
|
298
|
+
/** Derive the curve from the last `days` of sessions. Read-only unless `apply` is true (needs config write access). One run at a time; takes up to 120 s, so call it from a script with a long enough timeout. */
|
|
299
|
+
savings_calibrationRun(args?: {
|
|
300
|
+
days?: number;
|
|
301
|
+
end?: string;
|
|
302
|
+
apply?: boolean;
|
|
303
|
+
}): Promise<unknown>;
|
|
295
304
|
// --- swarm / agent ---
|
|
296
305
|
swarm_get(args?: { includeFull?: boolean }): Promise<unknown>;
|
|
297
306
|
agent_info(args?: Record<string, unknown>): Promise<unknown>;
|
|
@@ -723,12 +732,70 @@ declare module "swarm-sdk" {
|
|
|
723
732
|
}): Promise<unknown>;
|
|
724
733
|
}
|
|
725
734
|
|
|
735
|
+
export interface RetryOptions {
|
|
736
|
+
/** Retries after the first call. Default 3, so at most 4 calls. */
|
|
737
|
+
retries?: number;
|
|
738
|
+
/** First backoff delay in ms. Doubles on each retry, with jitter. Default 200. */
|
|
739
|
+
minDelayMs?: number;
|
|
740
|
+
/** Cap on a single wait, including a Retry-After wait. Default 5000. */
|
|
741
|
+
maxDelayMs?: number;
|
|
742
|
+
/** Total time across all calls and waits, in ms. Default 30000. */
|
|
743
|
+
budgetMs?: number;
|
|
744
|
+
/**
|
|
745
|
+
* Decides whether to retry: gets the thrown error or the returned value and
|
|
746
|
+
* the 1-based attempt. Default: retry any throw, plus a failed fetch Response,
|
|
747
|
+
* ctx.api raw result or ctx.swarm envelope with status 429, 502, 503 or 504.
|
|
748
|
+
*/
|
|
749
|
+
retryOn?: (errorOrResult: unknown, attempt: number) => boolean | Promise<boolean>;
|
|
750
|
+
/** Stops the retries: once it aborts, the wait ends and retry rejects with its reason. */
|
|
751
|
+
signal?: AbortSignal;
|
|
752
|
+
}
|
|
753
|
+
|
|
754
|
+
export interface FetchRetryOptions extends RetryOptions {
|
|
755
|
+
/**
|
|
756
|
+
* Sends an Idempotency-Key header, the same value on every attempt: true
|
|
757
|
+
* generates a UUID per call, a string is used as is. A POST or PATCH with
|
|
758
|
+
* the header also retries 502/503/504 and network errors. It only prevents
|
|
759
|
+
* a duplicate when the server dedupes by the key.
|
|
760
|
+
*/
|
|
761
|
+
idempotencyKey?: boolean | string;
|
|
762
|
+
}
|
|
763
|
+
|
|
764
|
+
/**
|
|
765
|
+
* ctx.stdlib.fetch options. Default retries: 429 on every method (Retry-After
|
|
766
|
+
* honoured); 502/503/504 and network errors on GET, HEAD, OPTIONS, PUT, DELETE,
|
|
767
|
+
* or any request with an Idempotency-Key. A stream body gets one attempt.
|
|
768
|
+
*/
|
|
769
|
+
export type FetchOptions = RequestInit & {
|
|
770
|
+
/** false: one attempt. true or omitted: the defaults above. An object tunes them. */
|
|
771
|
+
retry?: boolean | FetchRetryOptions;
|
|
772
|
+
/** @deprecated Use retry: { retries }. Total attempts, so retries: 1 is one attempt. */
|
|
773
|
+
retries?: number;
|
|
774
|
+
/** Per-attempt timeout in ms. Default 30000. */
|
|
775
|
+
timeoutMs?: number;
|
|
776
|
+
};
|
|
777
|
+
|
|
778
|
+
export interface Retry {
|
|
779
|
+
/**
|
|
780
|
+
* Calls fn(attempt) (sync or async) until it succeeds or a retry is not
|
|
781
|
+
* warranted. Out of attempts or budget: rethrows the last error or returns
|
|
782
|
+
* the last result. Honours Retry-After on a 429, capped by maxDelayMs.
|
|
783
|
+
*/
|
|
784
|
+
<T>(fn: (attempt: number) => T | Promise<T>, options?: RetryOptions): Promise<Awaited<T>>;
|
|
785
|
+
/** Returns a reusable function with fn's arguments that retries each call. */
|
|
786
|
+
wrap<A extends unknown[], T>(
|
|
787
|
+
fn: (...args: A) => T | Promise<T>,
|
|
788
|
+
options?: RetryOptions,
|
|
789
|
+
): (...args: A) => Promise<Awaited<T>>;
|
|
790
|
+
}
|
|
791
|
+
|
|
726
792
|
export interface ScriptStdlib {
|
|
727
|
-
fetch(input: string | URL | Request, init?:
|
|
728
|
-
fetchJson(input: string | URL | Request, init?:
|
|
793
|
+
fetch(input: string | URL | Request, init?: FetchOptions): Promise<Response>;
|
|
794
|
+
fetchJson(input: string | URL | Request, init?: FetchOptions): Promise<unknown>;
|
|
729
795
|
grep(pattern: string, files?: string | string[]): Promise<string>;
|
|
730
796
|
glob(pattern: string): Promise<string[]>;
|
|
731
797
|
table(rows: Array<Record<string, unknown>>): string;
|
|
798
|
+
retry: Retry;
|
|
732
799
|
Redacted: RedactedStatic;
|
|
733
800
|
}
|
|
734
801
|
|
package/src/slack/actions.ts
CHANGED
|
@@ -112,6 +112,7 @@ export function registerActionHandlers(app: App): void {
|
|
|
112
112
|
const requestedByUserId = await resolveSlackUserId(client, body.user.id, {
|
|
113
113
|
sampleEventType: "view_submission",
|
|
114
114
|
sampleContext: view.callback_id || "follow_up_submit",
|
|
115
|
+
userTeam: body.user.team_id,
|
|
115
116
|
});
|
|
116
117
|
noteSlackInboundSideEffect("task_created");
|
|
117
118
|
const followUpTask = await createTaskWithSiblingAwareness(
|
package/src/slack/assistant.ts
CHANGED
|
@@ -230,6 +230,7 @@ export function createAssistant(
|
|
|
230
230
|
? await resolveSlackUserId(client, userId, {
|
|
231
231
|
sampleEventType: "assistant_message",
|
|
232
232
|
sampleContext: rawText,
|
|
233
|
+
userTeam: msg.user_team as string | undefined,
|
|
233
234
|
})
|
|
234
235
|
: undefined;
|
|
235
236
|
|
|
@@ -247,6 +248,7 @@ export function createAssistant(
|
|
|
247
248
|
message.ts,
|
|
248
249
|
files,
|
|
249
250
|
cachedBotUserId ?? undefined,
|
|
251
|
+
msg.user_team as string | undefined,
|
|
250
252
|
);
|
|
251
253
|
const count = getBufferMessageCount(`${channelId}:${threadTs}`);
|
|
252
254
|
const event = count === 1 ? "accepted" : "buffered";
|
package/src/slack/enrich.ts
CHANGED
|
@@ -27,10 +27,12 @@ import { type IdentityResolution, resolveIdentity } from "../be/identity";
|
|
|
27
27
|
import { recordUnmappedIdentity } from "../be/unmapped-identities";
|
|
28
28
|
import {
|
|
29
29
|
findOrCreateUserByEmail,
|
|
30
|
+
findUserByEmail,
|
|
30
31
|
findUserByExternalId,
|
|
31
32
|
type IdentityActor,
|
|
32
33
|
linkIdentity,
|
|
33
34
|
} from "../be/users";
|
|
35
|
+
import type { SlackParticipantTrust } from "../types";
|
|
34
36
|
|
|
35
37
|
const ENRICHMENT_NAMESPACE = "integration:user-enrichment:slack";
|
|
36
38
|
const ENRICHMENT_TTL_MS = 24 * 60 * 60 * 1000; // 24h
|
|
@@ -107,62 +109,145 @@ export async function enrichSlackUserEmail(
|
|
|
107
109
|
const SLACK_WEBHOOK_ACTOR: IdentityActor = { kind: "system", id: "webhook:slack" };
|
|
108
110
|
|
|
109
111
|
/**
|
|
110
|
-
*
|
|
111
|
-
*
|
|
112
|
+
* Company email domains, read at call time so a config edit applies without a
|
|
113
|
+
* restart. `COMPANY_EMAIL_DOMAINS` wins; unset, it falls back to
|
|
114
|
+
* `SLACK_ALLOWED_EMAIL_DOMAINS`, which in practice lists the same domains.
|
|
115
|
+
*/
|
|
116
|
+
export function getCompanyEmailDomains(): string[] {
|
|
117
|
+
const raw = process.env.COMPANY_EMAIL_DOMAINS?.trim()
|
|
118
|
+
? process.env.COMPANY_EMAIL_DOMAINS
|
|
119
|
+
: process.env.SLACK_ALLOWED_EMAIL_DOMAINS;
|
|
120
|
+
return (raw ?? "")
|
|
121
|
+
.split(",")
|
|
122
|
+
.map((domain) => domain.trim().toLowerCase())
|
|
123
|
+
.filter(Boolean);
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
function isCompanyEmail(email: string, domains: string[]): boolean {
|
|
127
|
+
const domain = email.split("@").pop()?.toLowerCase();
|
|
128
|
+
return !!domain && domains.includes(domain);
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
export interface SlackParticipantResolution {
|
|
132
|
+
userId?: string;
|
|
133
|
+
trust: SlackParticipantTrust;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* Map a Slack user to a canonical `users.id` and a trust level:
|
|
112
138
|
*
|
|
113
|
-
* 1.
|
|
114
|
-
* 2.
|
|
115
|
-
*
|
|
116
|
-
*
|
|
117
|
-
* followed by an `identity_added` event for the Slack alias itself.
|
|
118
|
-
* 3. If no email is recoverable, record into the kv unmapped tracker so the
|
|
119
|
-
* operator can triage manually. Returns `undefined` — task creation
|
|
120
|
-
* proceeds without `requestedByUserId`.
|
|
139
|
+
* 1. Existing `(slack, <userId>)` alias, else the Slack profile email.
|
|
140
|
+
* 2. A company-domain email links or creates the user (`role: "member"`);
|
|
141
|
+
* any other email links an existing user and never creates one.
|
|
142
|
+
* 3. No email: recorded in the unmapped tracker, trust `unknown`.
|
|
121
143
|
*
|
|
122
|
-
* `
|
|
123
|
-
*
|
|
144
|
+
* Trust: `users.metadata.audience` wins; then another Slack team (`userTeam`
|
|
145
|
+
* differs from `ourTeamId`) is external; then the email domain decides, and
|
|
146
|
+
* no email is `unknown`. With no company domains configured, linked users are
|
|
147
|
+
* internal and nobody is created.
|
|
148
|
+
*/
|
|
149
|
+
export async function resolveSlackParticipant(
|
|
150
|
+
client: WebClient,
|
|
151
|
+
slackUserId: string,
|
|
152
|
+
eventContext: {
|
|
153
|
+
sampleEventType: string;
|
|
154
|
+
sampleContext: string;
|
|
155
|
+
userTeam?: string;
|
|
156
|
+
ourTeamId?: string;
|
|
157
|
+
},
|
|
158
|
+
): Promise<SlackParticipantResolution> {
|
|
159
|
+
const domains = getCompanyEmailDomains();
|
|
160
|
+
const foreignTeam =
|
|
161
|
+
!!eventContext.userTeam &&
|
|
162
|
+
!!eventContext.ourTeamId &&
|
|
163
|
+
eventContext.userTeam !== eventContext.ourTeamId;
|
|
164
|
+
|
|
165
|
+
let user = await findUserByExternalId("slack", slackUserId);
|
|
166
|
+
const email = user?.email || (await enrichSlackUserEmail(client, slackUserId));
|
|
167
|
+
|
|
168
|
+
if (!user && email) {
|
|
169
|
+
if (!foreignTeam && isCompanyEmail(email, domains)) {
|
|
170
|
+
// Pull the cached name back out for the user-row hints. The kv read is
|
|
171
|
+
// cheap (single primary-key lookup) and avoids a second `users.info`.
|
|
172
|
+
const cached = await getKv(ENRICHMENT_NAMESPACE, slackUserId);
|
|
173
|
+
const name = (cached?.value as EnrichedSlackUser | undefined)?.name ?? undefined;
|
|
174
|
+
user = (await findOrCreateUserByEmail(email, { name, role: "member" }, SLACK_WEBHOOK_ACTOR))
|
|
175
|
+
.user;
|
|
176
|
+
} else {
|
|
177
|
+
// Attribution only: an outside email never creates a user row.
|
|
178
|
+
user = await findUserByEmail(email);
|
|
179
|
+
}
|
|
180
|
+
if (user) {
|
|
181
|
+
// A concurrent enroll can win the `(slack, <id>)` PK; guard so the
|
|
182
|
+
// webhook does not 500, then trust the alias row below.
|
|
183
|
+
try {
|
|
184
|
+
await linkIdentity(user.id, "slack", slackUserId, SLACK_WEBHOOK_ACTOR);
|
|
185
|
+
} catch (error) {
|
|
186
|
+
console.warn(
|
|
187
|
+
`[Slack] linkIdentity('slack', ${slackUserId}) failed — likely a concurrent enroll`,
|
|
188
|
+
error,
|
|
189
|
+
);
|
|
190
|
+
}
|
|
191
|
+
user = (await findUserByExternalId("slack", slackUserId)) ?? user;
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
if (!user && !email) {
|
|
196
|
+
await recordUnmappedIdentity("slack", slackUserId, eventContext);
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
const audience = (user?.metadata as { audience?: unknown } | undefined)?.audience;
|
|
200
|
+
const trust: SlackParticipantTrust =
|
|
201
|
+
audience === "internal" || audience === "external"
|
|
202
|
+
? audience
|
|
203
|
+
: foreignTeam
|
|
204
|
+
? "external"
|
|
205
|
+
: domains.length === 0
|
|
206
|
+
? user
|
|
207
|
+
? "internal"
|
|
208
|
+
: email
|
|
209
|
+
? "external"
|
|
210
|
+
: "unknown"
|
|
211
|
+
: !email
|
|
212
|
+
? "unknown"
|
|
213
|
+
: isCompanyEmail(email, domains)
|
|
214
|
+
? "internal"
|
|
215
|
+
: "external";
|
|
216
|
+
return { userId: user?.id, trust };
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
/**
|
|
220
|
+
* The canonical `users.id` for a Slack user, or `undefined` (task creation
|
|
221
|
+
* then proceeds without a `requestedByUserId`). See `resolveSlackParticipant`.
|
|
124
222
|
*/
|
|
125
223
|
export async function resolveSlackUserId(
|
|
126
224
|
client: WebClient,
|
|
127
225
|
slackUserId: string,
|
|
128
|
-
|
|
226
|
+
// `userTeam` is required (pass `undefined` when the event has none) so no
|
|
227
|
+
// call site can silently drop it: a Slack Connect sender with a company
|
|
228
|
+
// email must not get a member row.
|
|
229
|
+
eventContext: { sampleEventType: string; sampleContext: string; userTeam: string | undefined },
|
|
129
230
|
): Promise<string | undefined> {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
// 2. Enrich → auto-link by email.
|
|
135
|
-
const email = await enrichSlackUserEmail(client, slackUserId);
|
|
136
|
-
if (email) {
|
|
137
|
-
// Pull the cached name back out for the user-row hints. The kv read is
|
|
138
|
-
// cheap (single primary-key lookup) and avoids a second `users.info`.
|
|
139
|
-
const cached = await getKv(ENRICHMENT_NAMESPACE, slackUserId);
|
|
140
|
-
const name = (cached?.value as EnrichedSlackUser | undefined)?.name ?? undefined;
|
|
141
|
-
|
|
142
|
-
const { user } = await findOrCreateUserByEmail(email, { name }, SLACK_WEBHOOK_ACTOR);
|
|
143
|
-
|
|
144
|
-
// Link the Slack identity to whichever user we resolved to. PK collision
|
|
145
|
-
// on `(slack, <id>)` shouldn't happen — we just confirmed no existing
|
|
146
|
-
// mapping in step 1 — but guard defensively so a race doesn't 500 the
|
|
147
|
-
// webhook.
|
|
148
|
-
try {
|
|
149
|
-
await linkIdentity(user.id, "slack", slackUserId, SLACK_WEBHOOK_ACTOR);
|
|
150
|
-
} catch (error) {
|
|
151
|
-
console.warn(
|
|
152
|
-
`[Slack] linkIdentity('slack', ${slackUserId}) failed — likely a concurrent enroll`,
|
|
153
|
-
error,
|
|
154
|
-
);
|
|
155
|
-
}
|
|
231
|
+
const ourTeamId = eventContext.userTeam ? await getOurSlackTeamId(client) : undefined;
|
|
232
|
+
return (await resolveSlackParticipant(client, slackUserId, { ...eventContext, ourTeamId }))
|
|
233
|
+
.userId;
|
|
234
|
+
}
|
|
156
235
|
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
236
|
+
/** Our own Slack team id (`auth.test`), cached per process. */
|
|
237
|
+
let cachedTeamId: string | undefined;
|
|
238
|
+
export async function getOurSlackTeamId(client: WebClient): Promise<string | undefined> {
|
|
239
|
+
if (cachedTeamId) return cachedTeamId;
|
|
240
|
+
try {
|
|
241
|
+
cachedTeamId = ((await client.auth.test()).team_id as string | undefined) ?? undefined;
|
|
242
|
+
} catch (error) {
|
|
243
|
+
console.error("[Slack] auth.test failed while reading the team id:", error);
|
|
161
244
|
}
|
|
245
|
+
return cachedTeamId;
|
|
246
|
+
}
|
|
162
247
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
248
|
+
/** Reset the team-id cache between tests. */
|
|
249
|
+
export function resetSlackTeamIdCacheForTesting(): void {
|
|
250
|
+
cachedTeamId = undefined;
|
|
166
251
|
}
|
|
167
252
|
|
|
168
253
|
/**
|
|
@@ -172,7 +257,11 @@ export async function resolveSlackUserId(
|
|
|
172
257
|
* message bodies — both are just this same token. Pure DB reads via
|
|
173
258
|
* `resolveIdentity`; zero Slack API calls, no cache.
|
|
174
259
|
*/
|
|
175
|
-
export async function rewriteSlackMentions(
|
|
260
|
+
export async function rewriteSlackMentions(
|
|
261
|
+
text: string,
|
|
262
|
+
botUserId?: string,
|
|
263
|
+
trust?: ReadonlyMap<string, SlackParticipantTrust>,
|
|
264
|
+
): Promise<string> {
|
|
176
265
|
const userIds = new Set<string>();
|
|
177
266
|
for (const match of text.matchAll(/<@([A-Z0-9]+)>/g)) {
|
|
178
267
|
const userId = match[1];
|
|
@@ -189,8 +278,13 @@ export async function rewriteSlackMentions(text: string, botUserId?: string): Pr
|
|
|
189
278
|
return text.replace(/<@([A-Z0-9]+)>/g, (_match, userId: string) => {
|
|
190
279
|
if (userId === botUserId) return `<@${userId}> (that's you)`;
|
|
191
280
|
const resolution = resolutions.get(userId);
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
281
|
+
const level = trust?.get(userId);
|
|
282
|
+
const untrusted = level === "external" || level === "unknown" ? level : undefined;
|
|
283
|
+
if (resolution?.status === "resolved") {
|
|
284
|
+
return untrusted
|
|
285
|
+
? `<@${userId}|${resolution.name}> (${untrusted}, untrusted)`
|
|
286
|
+
: `<@${userId}|${resolution.name}>`;
|
|
287
|
+
}
|
|
288
|
+
return untrusted ? `<@${userId}> (unknown user, untrusted)` : `<@${userId}> (unknown user)`;
|
|
195
289
|
});
|
|
196
290
|
}
|