@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
|
@@ -1,16 +1,112 @@
|
|
|
1
|
+
import { type RetryOptions, retry } from "./retry";
|
|
2
|
+
|
|
3
|
+
export type FetchRetryOptions = RetryOptions & {
|
|
4
|
+
/**
|
|
5
|
+
* Sends an `Idempotency-Key` header, the same value on every attempt: `true`
|
|
6
|
+
* generates a UUID per call, a string is used as is. A POST or PATCH with
|
|
7
|
+
* the header also retries 502/503/504 and network errors. The key only
|
|
8
|
+
* prevents a duplicate when the server dedupes by it.
|
|
9
|
+
*/
|
|
10
|
+
idempotencyKey?: boolean | string;
|
|
11
|
+
};
|
|
12
|
+
|
|
1
13
|
export type RuntimeFetchOptions = RequestInit & {
|
|
14
|
+
/** `false`: one attempt. `true` or omitted: method-aware defaults. An object tunes them. */
|
|
15
|
+
retry?: boolean | FetchRetryOptions;
|
|
16
|
+
/** @deprecated Use `retry: { retries }`. Total attempts, so `retries: 1` is one attempt. */
|
|
2
17
|
retries?: number;
|
|
18
|
+
/** Per-attempt timeout. Default 30000. */
|
|
3
19
|
timeoutMs?: number;
|
|
4
20
|
};
|
|
5
21
|
|
|
22
|
+
/** Methods a server must treat as idempotent, so a repeat after a 5xx is safe. */
|
|
23
|
+
export const IDEMPOTENT_METHODS: ReadonlySet<string> = new Set([
|
|
24
|
+
"GET",
|
|
25
|
+
"HEAD",
|
|
26
|
+
"OPTIONS",
|
|
27
|
+
"PUT",
|
|
28
|
+
"DELETE",
|
|
29
|
+
]);
|
|
30
|
+
const TRANSIENT_5XX = new Set([502, 503, 504]);
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Default fetch retry rule. 429 always retries (the server refused before any
|
|
34
|
+
* work). 502/503/504 and network errors retry only when a repeat is safe: an
|
|
35
|
+
* idempotent method, or a request carrying an `Idempotency-Key`.
|
|
36
|
+
*/
|
|
37
|
+
export function shouldRetryFetch(value: unknown, repeatSafe: boolean): boolean {
|
|
38
|
+
if (value instanceof Response) {
|
|
39
|
+
return value.status === 429 || (repeatSafe && TRANSIENT_5XX.has(value.status));
|
|
40
|
+
}
|
|
41
|
+
return repeatSafe;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** A body that fetch can send again. A stream or async iterable is read once. */
|
|
45
|
+
function isReplayableBody(body: unknown): boolean {
|
|
46
|
+
return (
|
|
47
|
+
body === undefined ||
|
|
48
|
+
body === null ||
|
|
49
|
+
typeof body === "string" ||
|
|
50
|
+
body instanceof URLSearchParams ||
|
|
51
|
+
body instanceof ArrayBuffer ||
|
|
52
|
+
ArrayBuffer.isView(body) ||
|
|
53
|
+
body instanceof Blob ||
|
|
54
|
+
body instanceof FormData
|
|
55
|
+
);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
function resolveRetry(
|
|
59
|
+
option: RuntimeFetchOptions["retry"],
|
|
60
|
+
legacyAttempts: number | undefined,
|
|
61
|
+
): FetchRetryOptions {
|
|
62
|
+
if (option === false) return { retries: 0 };
|
|
63
|
+
if (option && typeof option === "object") return option;
|
|
64
|
+
if (option === undefined && legacyAttempts !== undefined) {
|
|
65
|
+
return { retries: Math.max(0, legacyAttempts - 1) };
|
|
66
|
+
}
|
|
67
|
+
return {};
|
|
68
|
+
}
|
|
69
|
+
|
|
6
70
|
export async function runtimeFetch(
|
|
7
71
|
input: string | URL | Request,
|
|
8
72
|
options: RuntimeFetchOptions = {},
|
|
9
73
|
): Promise<Response> {
|
|
10
|
-
const {
|
|
11
|
-
|
|
74
|
+
const {
|
|
75
|
+
retry: retryOption,
|
|
76
|
+
retries: legacyAttempts,
|
|
77
|
+
timeoutMs = 30_000,
|
|
78
|
+
signal,
|
|
79
|
+
...init
|
|
80
|
+
} = options;
|
|
81
|
+
const {
|
|
82
|
+
idempotencyKey,
|
|
83
|
+
retryOn: userRetryOn,
|
|
84
|
+
...retryOptions
|
|
85
|
+
} = resolveRetry(retryOption, legacyAttempts);
|
|
86
|
+
const inputRequest = input instanceof Request ? input : undefined;
|
|
87
|
+
|
|
88
|
+
if (idempotencyKey) {
|
|
89
|
+
const headers = new Headers(init.headers ?? inputRequest?.headers);
|
|
90
|
+
if (!headers.has("idempotency-key")) {
|
|
91
|
+
headers.set(
|
|
92
|
+
"idempotency-key",
|
|
93
|
+
idempotencyKey === true ? crypto.randomUUID() : String(idempotencyKey),
|
|
94
|
+
);
|
|
95
|
+
}
|
|
96
|
+
init.headers = headers;
|
|
97
|
+
}
|
|
98
|
+
const method = (init.method ?? inputRequest?.method ?? "GET").toUpperCase();
|
|
99
|
+
const hasKey = new Headers(init.headers ?? inputRequest?.headers).has("idempotency-key");
|
|
100
|
+
const repeatSafe = IDEMPOTENT_METHODS.has(method) || hasKey;
|
|
101
|
+
const replayable =
|
|
102
|
+
init.body !== undefined
|
|
103
|
+
? isReplayableBody(init.body)
|
|
104
|
+
: !inputRequest || inputRequest.body === null || !inputRequest.bodyUsed;
|
|
105
|
+
// A Request with an unread body is cloned per attempt; the clone tees it.
|
|
106
|
+
const target = (): string | URL | Request =>
|
|
107
|
+
inputRequest && inputRequest.body !== null ? (inputRequest.clone() as Request) : input;
|
|
12
108
|
|
|
13
|
-
|
|
109
|
+
const attempt = async (): Promise<Response> => {
|
|
14
110
|
if (signal?.aborted) {
|
|
15
111
|
throw signal.reason ?? new DOMException("This operation was aborted", "AbortError");
|
|
16
112
|
}
|
|
@@ -19,26 +115,28 @@ export async function runtimeFetch(
|
|
|
19
115
|
const onAbort = () => controller.abort();
|
|
20
116
|
signal?.addEventListener("abort", onAbort, { once: true });
|
|
21
117
|
if (signal?.aborted) controller.abort();
|
|
22
|
-
|
|
23
118
|
try {
|
|
24
|
-
|
|
25
|
-
if (!res.ok && attempt < retries - 1 && res.status >= 500) {
|
|
26
|
-
lastError = new Error(`fetch failed with ${res.status}`);
|
|
27
|
-
continue;
|
|
28
|
-
}
|
|
29
|
-
return res;
|
|
119
|
+
return await fetch(target(), { ...init, signal: controller.signal });
|
|
30
120
|
} catch (error) {
|
|
31
|
-
// Caller abort is terminal
|
|
121
|
+
// Caller abort is terminal; the retry rule below sees `signal.aborted`.
|
|
32
122
|
if (signal?.aborted) throw signal.reason ?? error;
|
|
33
|
-
|
|
34
|
-
if (attempt === retries - 1) break;
|
|
123
|
+
throw error;
|
|
35
124
|
} finally {
|
|
36
125
|
clearTimeout(timeout);
|
|
37
126
|
signal?.removeEventListener("abort", onAbort);
|
|
38
127
|
}
|
|
39
|
-
}
|
|
128
|
+
};
|
|
40
129
|
|
|
41
|
-
|
|
130
|
+
if (!replayable) return attempt();
|
|
131
|
+
return retry(attempt, {
|
|
132
|
+
...retryOptions,
|
|
133
|
+
signal: signal ?? retryOptions.signal,
|
|
134
|
+
retryOn: async (value, attemptNumber) => {
|
|
135
|
+
if (signal?.aborted) return false;
|
|
136
|
+
if (userRetryOn) return userRetryOn(value, attemptNumber);
|
|
137
|
+
return shouldRetryFetch(value, repeatSafe);
|
|
138
|
+
},
|
|
139
|
+
});
|
|
42
140
|
}
|
|
43
141
|
|
|
44
142
|
export async function runtimeFetchJson(
|
|
@@ -2,6 +2,7 @@ import { Redacted } from "../redacted";
|
|
|
2
2
|
import { runtimeFetch, runtimeFetchJson } from "./fetch";
|
|
3
3
|
import { glob } from "./glob";
|
|
4
4
|
import { grep } from "./grep";
|
|
5
|
+
import { retry } from "./retry";
|
|
5
6
|
import { table } from "./table";
|
|
6
7
|
|
|
7
8
|
export const stdlib = {
|
|
@@ -10,7 +11,8 @@ export const stdlib = {
|
|
|
10
11
|
grep,
|
|
11
12
|
glob,
|
|
12
13
|
table,
|
|
14
|
+
retry,
|
|
13
15
|
Redacted,
|
|
14
16
|
};
|
|
15
17
|
|
|
16
|
-
export { runtimeFetch as fetch, runtimeFetchJson as fetchJson, glob, grep, table, Redacted };
|
|
18
|
+
export { runtimeFetch as fetch, runtimeFetchJson as fetchJson, glob, grep, table, retry, Redacted };
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `retry` for scripts: calls a sync or async function until it succeeds, a
|
|
3
|
+
* retry is not warranted, attempts run out, or the time budget is spent.
|
|
4
|
+
*
|
|
5
|
+
* The quickjs executor has its own copy in `executors/quickjs-prelude.ts`
|
|
6
|
+
* (it sleeps through `__host_sleep`). Keep the two in step; the executor
|
|
7
|
+
* conformance tests run the same scripts against both.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
export type RetryOptions = {
|
|
11
|
+
/** Retries after the first call. Default 3, so at most 4 calls. */
|
|
12
|
+
retries?: number;
|
|
13
|
+
/** First backoff delay in ms. Doubles on each retry, with jitter. Default 200. */
|
|
14
|
+
minDelayMs?: number;
|
|
15
|
+
/** Cap on a single wait, including a `Retry-After` wait. Default 5000. */
|
|
16
|
+
maxDelayMs?: number;
|
|
17
|
+
/** Total time across all calls and waits, in ms. Default 30000. */
|
|
18
|
+
budgetMs?: number;
|
|
19
|
+
/**
|
|
20
|
+
* Decides whether to retry. Gets the thrown error or the returned value and
|
|
21
|
+
* the 1-based attempt number. Replaces the default rule.
|
|
22
|
+
*/
|
|
23
|
+
retryOn?: (errorOrResult: unknown, attempt: number) => boolean | Promise<boolean>;
|
|
24
|
+
/** Stops the retries: once it aborts, the wait ends and `retry` rejects with its reason. */
|
|
25
|
+
signal?: AbortSignal;
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
/** Statuses the default rule (and the swarm bridge) treat as transient. */
|
|
29
|
+
export const RETRYABLE_STATUSES: ReadonlySet<number> = new Set([429, 502, 503, 504]);
|
|
30
|
+
|
|
31
|
+
const DEFAULTS = { retries: 3, minDelayMs: 200, maxDelayMs: 5_000, budgetMs: 30_000 };
|
|
32
|
+
|
|
33
|
+
/** Parses a `Retry-After` header (seconds or HTTP date) into ms; undefined if absent or invalid. */
|
|
34
|
+
export function retryAfterMs(
|
|
35
|
+
value: string | null | undefined,
|
|
36
|
+
now = Date.now(),
|
|
37
|
+
): number | undefined {
|
|
38
|
+
if (value === null || value === undefined) return undefined;
|
|
39
|
+
const trimmed = String(value).trim();
|
|
40
|
+
if (trimmed === "") return undefined;
|
|
41
|
+
if (/^\d+(\.\d+)?$/.test(trimmed)) return Math.round(Number(trimmed) * 1000);
|
|
42
|
+
const date = Date.parse(trimmed);
|
|
43
|
+
return Number.isNaN(date) ? undefined : Math.max(0, date - now);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Exponential backoff with equal jitter: a value in [d/2, d], d = min(max, min * 2^(attempt-1)). */
|
|
47
|
+
export function backoffMs(attempt: number, minDelayMs: number, maxDelayMs: number): number {
|
|
48
|
+
const ceiling = Math.min(maxDelayMs, minDelayMs * 2 ** (attempt - 1));
|
|
49
|
+
return Math.round(ceiling / 2 + (Math.random() * ceiling) / 2);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
type StatusInfo = { status: number; retryAfter?: string | null };
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Reads the status of a failed fetch `Response`, a `ctx.api` raw result
|
|
56
|
+
* (`ok: false`), or a `ctx.swarm` envelope (`success: false`).
|
|
57
|
+
*/
|
|
58
|
+
function failedStatus(value: unknown): StatusInfo | undefined {
|
|
59
|
+
if (!value || typeof value !== "object") return undefined;
|
|
60
|
+
const candidate = value as {
|
|
61
|
+
status?: unknown;
|
|
62
|
+
ok?: unknown;
|
|
63
|
+
success?: unknown;
|
|
64
|
+
headers?: unknown;
|
|
65
|
+
};
|
|
66
|
+
if (typeof candidate.status !== "number") return undefined;
|
|
67
|
+
if (candidate.ok !== false && candidate.success !== false) return undefined;
|
|
68
|
+
const headers = candidate.headers as
|
|
69
|
+
| { get?: (name: string) => string | null }
|
|
70
|
+
| Record<string, unknown>
|
|
71
|
+
| undefined;
|
|
72
|
+
let retryAfter: string | null | undefined;
|
|
73
|
+
if (headers && typeof headers.get === "function") {
|
|
74
|
+
retryAfter = (headers as { get: (name: string) => string | null }).get("retry-after");
|
|
75
|
+
} else if (headers && typeof headers === "object") {
|
|
76
|
+
const raw = (headers as Record<string, unknown>)["retry-after"];
|
|
77
|
+
retryAfter = typeof raw === "string" ? raw : undefined;
|
|
78
|
+
}
|
|
79
|
+
return { status: candidate.status, retryAfter };
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** The default rule for a returned value: a failed response with a transient status. */
|
|
83
|
+
export function isRetryableResult(value: unknown): boolean {
|
|
84
|
+
const info = failedStatus(value);
|
|
85
|
+
return info !== undefined && RETRYABLE_STATUSES.has(info.status);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function checkNumber(name: string, value: unknown, fallback: number, integer = false): number {
|
|
89
|
+
if (value === undefined) return fallback;
|
|
90
|
+
if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
|
|
91
|
+
throw new TypeError(`retry: \`${name}\` must be a non-negative number`);
|
|
92
|
+
}
|
|
93
|
+
if (integer && !Number.isInteger(value)) {
|
|
94
|
+
throw new TypeError(`retry: \`${name}\` must be a non-negative integer`);
|
|
95
|
+
}
|
|
96
|
+
return value;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
function abortReason(signal: AbortSignal): unknown {
|
|
100
|
+
return signal.reason ?? new DOMException("This operation was aborted", "AbortError");
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/** Waits `ms`, or rejects with the signal's reason as soon as it aborts. */
|
|
104
|
+
function sleep(ms: number, signal?: AbortSignal): Promise<void> {
|
|
105
|
+
return new Promise((resolve, reject) => {
|
|
106
|
+
if (signal?.aborted) return reject(abortReason(signal));
|
|
107
|
+
const onAbort = () => {
|
|
108
|
+
clearTimeout(timer);
|
|
109
|
+
reject(abortReason(signal as AbortSignal));
|
|
110
|
+
};
|
|
111
|
+
const timer = setTimeout(() => {
|
|
112
|
+
signal?.removeEventListener("abort", onAbort);
|
|
113
|
+
resolve();
|
|
114
|
+
}, ms);
|
|
115
|
+
signal?.addEventListener("abort", onAbort, { once: true });
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
async function retryCall<T>(
|
|
120
|
+
fn: (attempt: number) => T | Promise<T>,
|
|
121
|
+
options: RetryOptions = {},
|
|
122
|
+
): Promise<Awaited<T>> {
|
|
123
|
+
if (typeof fn !== "function") throw new TypeError("retry: first argument must be a function");
|
|
124
|
+
const retries = checkNumber("retries", options.retries, DEFAULTS.retries, true);
|
|
125
|
+
const minDelayMs = checkNumber("minDelayMs", options.minDelayMs, DEFAULTS.minDelayMs);
|
|
126
|
+
const maxDelayMs = checkNumber("maxDelayMs", options.maxDelayMs, DEFAULTS.maxDelayMs);
|
|
127
|
+
const budgetMs = checkNumber("budgetMs", options.budgetMs, DEFAULTS.budgetMs);
|
|
128
|
+
const retryOn = options.retryOn;
|
|
129
|
+
if (retryOn !== undefined && typeof retryOn !== "function") {
|
|
130
|
+
throw new TypeError("retry: `retryOn` must be a function");
|
|
131
|
+
}
|
|
132
|
+
const signal = options.signal;
|
|
133
|
+
const started = Date.now();
|
|
134
|
+
|
|
135
|
+
for (let attempt = 1; ; attempt++) {
|
|
136
|
+
if (signal?.aborted) throw abortReason(signal);
|
|
137
|
+
let threw = false;
|
|
138
|
+
let value: unknown;
|
|
139
|
+
try {
|
|
140
|
+
// `await` turns a sync throw and an async rejection into the same catch.
|
|
141
|
+
value = await fn(attempt);
|
|
142
|
+
} catch (error) {
|
|
143
|
+
threw = true;
|
|
144
|
+
value = error;
|
|
145
|
+
}
|
|
146
|
+
const settle = (): Awaited<T> => {
|
|
147
|
+
if (threw) throw value;
|
|
148
|
+
return value as Awaited<T>;
|
|
149
|
+
};
|
|
150
|
+
if (attempt > retries) return settle();
|
|
151
|
+
const again = retryOn ? await retryOn(value, attempt) : threw || isRetryableResult(value);
|
|
152
|
+
if (!again) return settle();
|
|
153
|
+
|
|
154
|
+
const info = threw ? undefined : failedStatus(value);
|
|
155
|
+
const waitFor = info?.status === 429 ? retryAfterMs(info.retryAfter) : undefined;
|
|
156
|
+
const delay =
|
|
157
|
+
waitFor !== undefined
|
|
158
|
+
? Math.min(maxDelayMs, waitFor)
|
|
159
|
+
: backoffMs(attempt, minDelayMs, maxDelayMs);
|
|
160
|
+
if (Date.now() - started + delay > budgetMs) return settle();
|
|
161
|
+
await sleep(delay, signal);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
function wrap<A extends unknown[], T>(
|
|
166
|
+
fn: (...args: A) => T | Promise<T>,
|
|
167
|
+
options?: RetryOptions,
|
|
168
|
+
): (...args: A) => Promise<Awaited<T>> {
|
|
169
|
+
if (typeof fn !== "function")
|
|
170
|
+
throw new TypeError("retry.wrap: first argument must be a function");
|
|
171
|
+
return (...args: A) => retryCall(() => fn(...args), options);
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
export const retry = Object.assign(retryCall, { wrap });
|
|
@@ -2,6 +2,7 @@ import { scrubObject } from "../utils/secret-scrubber";
|
|
|
2
2
|
import { Redacted } from "./redacted";
|
|
3
3
|
import { readScriptSdkJsonResponse } from "./response-limit";
|
|
4
4
|
import { isSdkToolAllowed, mcpToolNameForSdkMethod } from "./sdk-allowlist";
|
|
5
|
+
import { backoffMs, retryAfterMs } from "./stdlib/retry";
|
|
5
6
|
import type { SwarmConfig } from "./swarm-config";
|
|
6
7
|
|
|
7
8
|
type BridgeRequest = {
|
|
@@ -237,6 +238,12 @@ function bridgeRequestFor(name: string, args: unknown): BridgeRequest | null {
|
|
|
237
238
|
case "script_run":
|
|
238
239
|
return { method: "POST", path: "/api/scripts/run", body };
|
|
239
240
|
|
|
241
|
+
// ── savings calibration (REST only, no MCP tool) ──
|
|
242
|
+
case "savings_calibrationGet":
|
|
243
|
+
return { method: "GET", path: "/api/savings/calibration" };
|
|
244
|
+
case "savings_calibrationRun":
|
|
245
|
+
return { method: "POST", path: "/api/savings/calibration", body };
|
|
246
|
+
|
|
240
247
|
// ── swarm / agent ──
|
|
241
248
|
case "db_query":
|
|
242
249
|
return { method: "POST", path: "/api/db-query", body };
|
|
@@ -468,11 +475,158 @@ function bridgeRequestFor(name: string, args: unknown): BridgeRequest | null {
|
|
|
468
475
|
}
|
|
469
476
|
}
|
|
470
477
|
|
|
478
|
+
// ── transient-failure retries ──
|
|
479
|
+
// Every ctx.swarm call retries a 429 (the rate limiter refused it before any
|
|
480
|
+
// work ran). A 502/503/504 or a network error retries only when a repeat is
|
|
481
|
+
// safe: a read, or a write whose route dedupes by its `Idempotency-Key`
|
|
482
|
+
// header (workflow_trigger with `idempotencyKey`). Any other write may have
|
|
483
|
+
// landed, and a second call would repeat it. script_run's `idempotencyKey`
|
|
484
|
+
// does not count: it overwrites a KV entry and does not dedupe the run.
|
|
485
|
+
const BRIDGE_MAX_RETRIES = 3;
|
|
486
|
+
const BRIDGE_MIN_DELAY_MS = 250;
|
|
487
|
+
const BRIDGE_MAX_DELAY_MS = 2_000;
|
|
488
|
+
/** Total retry time per call, so retries cannot eat the script's wall clock. */
|
|
489
|
+
const BRIDGE_RETRY_BUDGET_MS = 5_000;
|
|
490
|
+
const READ_RETRY_STATUSES = new Set([502, 503, 504]);
|
|
491
|
+
|
|
492
|
+
// MCP tool names that only read. Prefix/suffix rules cover get-* / list-* /
|
|
493
|
+
// *-get / *-list / *-search; the set lists the rest. A tool missing here is
|
|
494
|
+
// treated as a write, which is the safe default. tool-annotations.test.ts
|
|
495
|
+
// fails when a tool annotated `readOnlyHint: true` is missing here.
|
|
496
|
+
// read-messages may mark messages read; repeating that is harmless.
|
|
497
|
+
const READ_TOOL_PATTERN = /^(get|list)-|-(get|list|search)$/;
|
|
498
|
+
const READ_TOOLS = new Set([
|
|
499
|
+
"db-query",
|
|
500
|
+
"kv-get",
|
|
501
|
+
"kv-list",
|
|
502
|
+
"my-agent-info",
|
|
503
|
+
"script-query-types",
|
|
504
|
+
"skill-get-file",
|
|
505
|
+
"slack-read",
|
|
506
|
+
"slack-list-channels",
|
|
507
|
+
"chat-read-thread",
|
|
508
|
+
"app-rows-list",
|
|
509
|
+
"app-row-get",
|
|
510
|
+
"app-history",
|
|
511
|
+
"app-diff",
|
|
512
|
+
"context-history",
|
|
513
|
+
"context-diff",
|
|
514
|
+
"extension-catalog",
|
|
515
|
+
"tracker-status",
|
|
516
|
+
"tracker-sync-status",
|
|
517
|
+
"app-query",
|
|
518
|
+
"resolve-user",
|
|
519
|
+
"room-decode",
|
|
520
|
+
"read-messages",
|
|
521
|
+
"check-model-profile",
|
|
522
|
+
"preview-prompt-template",
|
|
523
|
+
]);
|
|
524
|
+
// GET routes that change state: polling claims work.
|
|
525
|
+
const NON_READ_GET_METHODS = new Set(["task_poll"]);
|
|
526
|
+
|
|
527
|
+
export function isReadOnlyBridgeCall(name: string, method: string): boolean {
|
|
528
|
+
if (method === "GET") return !NON_READ_GET_METHODS.has(name);
|
|
529
|
+
const tool = mcpToolNameForSdkMethod(name);
|
|
530
|
+
return READ_TOOL_PATTERN.test(tool) || READ_TOOLS.has(tool);
|
|
531
|
+
}
|
|
532
|
+
|
|
533
|
+
function hasIdempotencyKey(headers: Record<string, string> | undefined): boolean {
|
|
534
|
+
return Object.keys(headers ?? {}).some((key) => key.toLowerCase() === "idempotency-key");
|
|
535
|
+
}
|
|
536
|
+
|
|
537
|
+
/** A keyed write may repeat, but it stays a write: only a read gets the retry deadline. */
|
|
538
|
+
function bridgeSafety(readOnly: boolean, keyed: boolean) {
|
|
539
|
+
return { repeatSafe: readOnly || keyed, readOnly };
|
|
540
|
+
}
|
|
541
|
+
|
|
542
|
+
/** Waits `ms`, or less when `signal` aborts first. */
|
|
543
|
+
function sleep(ms: number, signal: AbortSignal | undefined): Promise<void> {
|
|
544
|
+
return new Promise((resolve) => {
|
|
545
|
+
const done = () => {
|
|
546
|
+
clearTimeout(timer);
|
|
547
|
+
signal?.removeEventListener("abort", done);
|
|
548
|
+
resolve();
|
|
549
|
+
};
|
|
550
|
+
const timer = setTimeout(done, ms);
|
|
551
|
+
signal?.addEventListener("abort", done, { once: true });
|
|
552
|
+
});
|
|
553
|
+
}
|
|
554
|
+
|
|
555
|
+
/**
|
|
556
|
+
* What a retry that ran out of budget hands back: the failure the caller would
|
|
557
|
+
* have seen with no retry, the earlier status with a note in place of its
|
|
558
|
+
* already-cancelled body.
|
|
559
|
+
*/
|
|
560
|
+
function budgetSpentResponse(previous: Response): Response {
|
|
561
|
+
return Response.json(
|
|
562
|
+
{
|
|
563
|
+
error: `HTTP ${previous.status}; the retry did not answer within the ${BRIDGE_RETRY_BUDGET_MS}ms retry budget`,
|
|
564
|
+
},
|
|
565
|
+
{ status: previous.status, statusText: previous.statusText },
|
|
566
|
+
);
|
|
567
|
+
}
|
|
568
|
+
|
|
569
|
+
/**
|
|
570
|
+
* `signal` is the run's own signal (quickjs aborts it when the run ends): an
|
|
571
|
+
* aborted run gets the current outcome at once, never another wait or attempt.
|
|
572
|
+
*
|
|
573
|
+
* `repeatSafe`: a 502/503/504 or a network error may be retried (a read, or a
|
|
574
|
+
* keyed write). `readOnly`: the call only reads.
|
|
575
|
+
*
|
|
576
|
+
* The first attempt runs unbounded, as it did before retries existed. A retry
|
|
577
|
+
* of a read is cut off when the retry budget is spent, and the caller gets
|
|
578
|
+
* the earlier failure. A write's retry, keyed or not, is never cut off: it may
|
|
579
|
+
* be the write's first real run (after a 429) or start the work a keyed route
|
|
580
|
+
* dedupes, and cutting it off reports a failure for work that went ahead.
|
|
581
|
+
*/
|
|
582
|
+
async function bridgeFetch(
|
|
583
|
+
url: string,
|
|
584
|
+
init: RequestInit,
|
|
585
|
+
{ repeatSafe, readOnly }: { repeatSafe: boolean; readOnly: boolean },
|
|
586
|
+
signal: AbortSignal | undefined,
|
|
587
|
+
): Promise<Response> {
|
|
588
|
+
const started = Date.now();
|
|
589
|
+
const remaining = () => BRIDGE_RETRY_BUDGET_MS - (Date.now() - started);
|
|
590
|
+
const fits = (delay: number) => delay <= remaining();
|
|
591
|
+
let previous: { response: Response } | { error: unknown } | undefined;
|
|
592
|
+
for (let attempt = 1; ; attempt++) {
|
|
593
|
+
const budget = previous && readOnly ? AbortSignal.timeout(Math.max(1, remaining())) : undefined;
|
|
594
|
+
let res: Response;
|
|
595
|
+
try {
|
|
596
|
+
res = await fetch(url, budget ? { ...init, signal: budget } : init);
|
|
597
|
+
} catch (error) {
|
|
598
|
+
if (budget?.aborted && !signal?.aborted && previous) {
|
|
599
|
+
if ("error" in previous) throw previous.error;
|
|
600
|
+
return budgetSpentResponse(previous.response);
|
|
601
|
+
}
|
|
602
|
+
const delay = backoffMs(attempt, BRIDGE_MIN_DELAY_MS, BRIDGE_MAX_DELAY_MS);
|
|
603
|
+
// An abort means the run is ending: settle now, never wait and retry.
|
|
604
|
+
const aborted = signal?.aborted || (error instanceof Error && error.name === "AbortError");
|
|
605
|
+
if (aborted || !repeatSafe || attempt > BRIDGE_MAX_RETRIES || !fits(delay)) throw error;
|
|
606
|
+
previous = { error };
|
|
607
|
+
await sleep(delay, signal);
|
|
608
|
+
if (signal?.aborted) throw error;
|
|
609
|
+
continue;
|
|
610
|
+
}
|
|
611
|
+
const retryable = res.status === 429 || (repeatSafe && READ_RETRY_STATUSES.has(res.status));
|
|
612
|
+
if (!retryable || attempt > BRIDGE_MAX_RETRIES || signal?.aborted) return res;
|
|
613
|
+
const delay =
|
|
614
|
+
(res.status === 429 ? retryAfterMs(res.headers.get("retry-after")) : undefined) ??
|
|
615
|
+
backoffMs(attempt, BRIDGE_MIN_DELAY_MS, BRIDGE_MAX_DELAY_MS);
|
|
616
|
+
// A Retry-After past the budget: hand the 429 back rather than wait.
|
|
617
|
+
if (!fits(delay)) return res;
|
|
618
|
+
await res.body?.cancel().catch(() => {});
|
|
619
|
+
previous = { response: res };
|
|
620
|
+
await sleep(delay, signal);
|
|
621
|
+
if (signal?.aborted) return res;
|
|
622
|
+
}
|
|
623
|
+
}
|
|
624
|
+
|
|
471
625
|
async function callBridgeApi(
|
|
472
626
|
name: string,
|
|
473
627
|
args: unknown,
|
|
474
628
|
config: SwarmConfig,
|
|
475
|
-
options: { throwOnError?: boolean; preserveData?: boolean } = {},
|
|
629
|
+
options: { throwOnError?: boolean; preserveData?: boolean; signal?: AbortSignal } = {},
|
|
476
630
|
): Promise<unknown> {
|
|
477
631
|
const baseUrl = Redacted.value(config.mcpBaseUrl).replace(/\/$/, "");
|
|
478
632
|
const request = bridgeRequestFor(name, args);
|
|
@@ -480,11 +634,16 @@ async function callBridgeApi(
|
|
|
480
634
|
// Tools without a specific REST route go through the generic MCP bridge
|
|
481
635
|
if (!request) {
|
|
482
636
|
const mcpToolName = mcpToolNameForSdkMethod(name);
|
|
483
|
-
const res = await
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
637
|
+
const res = await bridgeFetch(
|
|
638
|
+
`${baseUrl}/api/mcp-bridge`,
|
|
639
|
+
{
|
|
640
|
+
method: "POST",
|
|
641
|
+
headers: headers(config),
|
|
642
|
+
body: JSON.stringify({ tool: mcpToolName, args: args ?? {} }),
|
|
643
|
+
},
|
|
644
|
+
bridgeSafety(isReadOnlyBridgeCall(name, "POST"), false),
|
|
645
|
+
options.signal,
|
|
646
|
+
);
|
|
488
647
|
const data = await readScriptSdkJsonResponse(res, `ctx.swarm.${name}`);
|
|
489
648
|
if (!res.ok && options.throwOnError) {
|
|
490
649
|
const message =
|
|
@@ -513,11 +672,16 @@ async function callBridgeApi(
|
|
|
513
672
|
});
|
|
514
673
|
}
|
|
515
674
|
|
|
516
|
-
const res = await
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
675
|
+
const res = await bridgeFetch(
|
|
676
|
+
`${baseUrl}${request.path}`,
|
|
677
|
+
{
|
|
678
|
+
method: request.method,
|
|
679
|
+
headers: { ...headers(config), ...request.headers },
|
|
680
|
+
body: request.body === undefined ? undefined : JSON.stringify(request.body),
|
|
681
|
+
},
|
|
682
|
+
bridgeSafety(isReadOnlyBridgeCall(name, request.method), hasIdempotencyKey(request.headers)),
|
|
683
|
+
options.signal,
|
|
684
|
+
);
|
|
521
685
|
const data = await readScriptSdkJsonResponse(res, `ctx.swarm.${name}`);
|
|
522
686
|
if (!res.ok && options.throwOnError) {
|
|
523
687
|
const message =
|
|
@@ -530,7 +694,12 @@ async function callBridgeApi(
|
|
|
530
694
|
return options.preserveData ? result : scrubObject(result);
|
|
531
695
|
}
|
|
532
696
|
|
|
533
|
-
async function callTool(
|
|
697
|
+
async function callTool(
|
|
698
|
+
name: string,
|
|
699
|
+
args: unknown,
|
|
700
|
+
config: SwarmConfig,
|
|
701
|
+
signal: AbortSignal | undefined,
|
|
702
|
+
): Promise<unknown> {
|
|
534
703
|
if (!isSdkToolAllowed(name)) {
|
|
535
704
|
throw new Error(
|
|
536
705
|
`Tool '${name}' is not exposed to scripts (lifecycle/cred tool); use the MCP surface directly if you're an agent`,
|
|
@@ -538,11 +707,11 @@ async function callTool(name: string, args: unknown, config: SwarmConfig): Promi
|
|
|
538
707
|
}
|
|
539
708
|
|
|
540
709
|
if (name === "script_search" || name === "script_run") {
|
|
541
|
-
return callBridgeApi(name, args, config, { throwOnError: true });
|
|
710
|
+
return callBridgeApi(name, args, config, { throwOnError: true, signal });
|
|
542
711
|
}
|
|
543
712
|
|
|
544
713
|
if (name === "kv_getOrNull") {
|
|
545
|
-
const result = (await callBridgeApi(name, args, config)) as {
|
|
714
|
+
const result = (await callBridgeApi(name, args, config, { signal })) as {
|
|
546
715
|
success: boolean;
|
|
547
716
|
status: number;
|
|
548
717
|
data: unknown;
|
|
@@ -558,7 +727,7 @@ async function callTool(name: string, args: unknown, config: SwarmConfig): Promi
|
|
|
558
727
|
return result.data;
|
|
559
728
|
}
|
|
560
729
|
|
|
561
|
-
return callBridgeApi(name, args, config);
|
|
730
|
+
return callBridgeApi(name, args, config, { signal });
|
|
562
731
|
}
|
|
563
732
|
|
|
564
733
|
type RoomMethods = Record<
|
|
@@ -567,11 +736,17 @@ type RoomMethods = Record<
|
|
|
567
736
|
>;
|
|
568
737
|
type RuntimeSwarmSdk = Record<string, (args?: unknown) => Promise<unknown>> & { room: RoomMethods };
|
|
569
738
|
|
|
570
|
-
|
|
739
|
+
/** `signal`: the run's abort signal; it stops bridge retries when the run ends. */
|
|
740
|
+
export function createSwarmSdk(
|
|
741
|
+
config: SwarmConfig,
|
|
742
|
+
options: { signal?: AbortSignal } = {},
|
|
743
|
+
): RuntimeSwarmSdk {
|
|
744
|
+
const { signal } = options;
|
|
571
745
|
const roomCall = (method: keyof RoomMethods) => async (args?: unknown) => {
|
|
572
746
|
const result = (await callBridgeApi(`room_${method}`, args, config, {
|
|
573
747
|
throwOnError: true,
|
|
574
748
|
preserveData: true,
|
|
749
|
+
signal,
|
|
575
750
|
})) as { data: { room?: unknown } };
|
|
576
751
|
return method === "decode" ? result.data : result.data.room;
|
|
577
752
|
};
|
|
@@ -586,7 +761,7 @@ export function createSwarmSdk(config: SwarmConfig): RuntimeSwarmSdk {
|
|
|
586
761
|
get(target, prop) {
|
|
587
762
|
if (typeof prop !== "string") return undefined;
|
|
588
763
|
if (prop in target) return target[prop];
|
|
589
|
-
return (args?: unknown) => callTool(prop, args, config);
|
|
764
|
+
return (args?: unknown) => callTool(prop, args, config, signal);
|
|
590
765
|
},
|
|
591
766
|
}) as RuntimeSwarmSdk;
|
|
592
767
|
}
|