@desplega.ai/agent-swarm 2.13.3 → 2.13.5
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-tbt61zkm.js +17 -0
- package/dist/{acp-targets-k8xs4tj8.js → acp-targets-w8dbs4nr.js} +10 -10
- package/dist/{actions-pg5fxjer.js → actions-8zrcbjrx.js} +237 -27
- package/dist/{agent-fs-provision-vbk3fppw.js → agent-fs-provision-cbt2ttds.js} +4 -4
- package/dist/{amp-adapter-adbhxsz9.js → amp-adapter-8x6zp8w4.js} +3 -3
- package/dist/{anthropic-messages-88b7s3n9.js → anthropic-messages-vdd1zmha.js} +10 -10
- package/dist/{app-b267ggx1.js → app-zfa9dwjw.js} +7 -7
- package/dist/{approval-notifications-evc1a9z5.js → approval-notifications-rv92zmza.js} +8 -8
- package/dist/{assistant-wgz2ab84.js → assistant-q7s7rm1q.js} +25 -25
- package/dist/{boot-args-schema-6tpk28j4.js → boot-args-schema-g27kpzr1.js} +1 -1
- package/dist/{boot-reembed-r1zyvefv.js → boot-reembed-1mjs52nt.js} +1 -1
- package/dist/{boot-reembed-ankp369c.js → boot-reembed-m62dpdkg.js} +1 -1
- package/dist/{boot-scrub-sweep-cgb6r5bd.js → boot-scrub-sweep-ss1vcamw.js} +2 -2
- package/dist/{boot-seeds-bjceqg7b.js → boot-seeds-hwnvgbb3.js} +4 -4
- package/dist/{boxd-hr8rsxzq.js → boxd-y0szhp0g.js} +2 -2
- package/dist/{claude-adapter-knztdnff.js → claude-adapter-0rjmbhjk.js} +9 -9
- package/dist/{claude-managed-adapter-qwejzqkk.js → claude-managed-adapter-6k032agg.js} +4 -4
- package/dist/{claude-managed-setup-0vgz4d1j.js → claude-managed-setup-6czvve8q.js} +5 -5
- package/dist/{claude-sdk-session-c3g6dv0g.js → claude-sdk-session-pr0znb81.js} +12671 -11885
- package/dist/{cli-2v4xxnx2.js → cli-0h8skzss.js} +1 -1
- package/dist/{cli-7fa6yv98.js → cli-0qt3epg4.js} +7 -7
- package/dist/{cli-aytna2fm.js → cli-19d6v8er.js} +7 -7
- package/dist/{cli-8m6gqnf1.js → cli-1jq2em7b.js} +4 -4
- package/dist/{cli-fp65jdp2.js → cli-1kvcsd2f.js} +219 -155
- package/dist/{cli-8fj8yfmk.js → cli-2vp0z049.js} +1 -1
- package/dist/{cli-61p7ty8d.js → cli-2wzkvfgm.js} +3 -3
- package/dist/{cli-tjf1bh1v.js → cli-34fygf87.js} +6 -4
- package/dist/{cli-czeh7x13.js → cli-3860pmrq.js} +4 -4
- package/dist/{cli-dq30fq3q.js → cli-3vw6dd4g.js} +2 -2
- package/dist/{cli-4dyhzhpx.js → cli-4gaf3tx5.js} +1 -1
- package/dist/{cli-3mf04tkh.js → cli-4vynxtrb.js} +1 -1
- package/dist/{cli-hpxcfvdm.js → cli-55h8m1x3.js} +10 -7
- package/dist/{cli-hxj888w3.js → cli-5n9w2xzx.js} +2 -2
- package/dist/{cli-50whymxq.js → cli-5tq15aa7.js} +2 -2
- package/dist/{cli-8sayvj48.js → cli-5web09sb.js} +3 -3
- package/dist/{cli-gc715jrc.js → cli-69zzpjgh.js} +1 -1
- package/dist/{cli-vgh5adn9.js → cli-6msnpj1z.js} +8 -8
- package/dist/{cli-f8rcvf2x.js → cli-7r9tvk8v.js} +76 -3
- package/dist/{cli-fbmgpt72.js → cli-7ypg8hka.js} +3 -3
- package/dist/{cli-xc8m5cjn.js → cli-887vhew6.js} +3 -3
- package/dist/{cli-q8aq48v1.js → cli-8b4rpnwj.js} +1 -1
- package/dist/{cli-pzsedyb0.js → cli-8pd1t17c.js} +14 -14
- package/dist/{cli-je587f74.js → cli-94gx6ze9.js} +1 -1
- package/dist/{cli-h9d3sdnc.js → cli-94mxerrp.js} +1 -1
- package/dist/{cli-ef590376.js → cli-9n6g14vs.js} +3 -3
- package/dist/{cli-80d5g0fa.js → cli-abby987g.js} +3 -3
- package/dist/{cli-grk77aen.js → cli-avax5mp9.js} +2 -2
- package/dist/{cli-hd2a204w.js → cli-b42yfn17.js} +14 -14
- package/dist/{cli-gkjw33x5.js → cli-b9ygp1kz.js} +2 -2
- package/dist/{cli-bh53ppqm.js → cli-bvamr9g0.js} +4 -4
- package/dist/{cli-ka4tqjzd.js → cli-ced4azn1.js} +15 -12
- package/dist/{cli-v1v49t36.js → cli-cmbb2t8a.js} +3 -3
- package/dist/{cli-hhb8kbwd.js → cli-cp163xga.js} +31 -16
- package/dist/{cli-55fqpd9q.js → cli-ebpq3c5z.js} +8 -8
- package/dist/{cli-9gmkw6xn.js → cli-ehg90jd1.js} +128 -48
- package/dist/{cli-jg5txpm6.js → cli-emdfd8fh.js} +75 -1
- package/dist/{cli-gxqwm3k3.js → cli-evy3egte.js} +104 -10
- package/dist/{cli-a21cwm89.js → cli-ewk3sg68.js} +3 -3
- package/dist/{cli-syqcny89.js → cli-f7b9nyvk.js} +9 -9
- package/dist/{cli-268b3dgn.js → cli-f9xw9pr4.js} +5 -5
- package/dist/{cli-61fzwtjk.js → cli-ffn0a515.js} +9 -9
- package/dist/{cli-ya1cj689.js → cli-fw67mnyc.js} +1 -1
- package/dist/{cli-dqgnbnxs.js → cli-grbngev5.js} +6 -1
- package/dist/{cli-sy2ge2ye.js → cli-hd5bm1e1.js} +4 -4
- package/dist/{cli-rfejbpe1.js → cli-htb5bpz2.js} +1 -1
- package/dist/{cli-w24741sm.js → cli-j69pzrrz.js} +7 -7
- package/dist/{cli-g4dhd3pr.js → cli-jdq3jmny.js} +6 -23
- package/dist/{cli-hv3820ez.js → cli-k0nebh10.js} +1 -1
- package/dist/{cli-d2epqm0y.js → cli-kezzteka.js} +1 -1
- package/dist/{cli-h0ewec3d.js → cli-kr0jpw9c.js} +1 -1
- package/dist/{cli-t25rq8mg.js → cli-ks06cd0n.js} +40 -11
- package/dist/{cli-1gnf5c7x.js → cli-kwj3131p.js} +1 -1
- package/dist/{cli-wtffytm8.js → cli-m8f4379k.js} +3 -3
- package/dist/{cli-43dsqhcp.js → cli-n79j1vxc.js} +4 -4
- package/dist/{cli-b768ek79.js → cli-nrt048ys.js} +1 -0
- package/dist/{cli-h3drhntp.js → cli-pedm2kht.js} +2 -2
- package/dist/{cli-eds5xnsz.js → cli-phmy14hb.js} +2 -2
- package/dist/{cli-7kv5d674.js → cli-prz1p3ft.js} +5 -5
- package/dist/{cli-nbawx3s0.js → cli-q1h041y8.js} +6 -6
- package/dist/{cli-cah298e5.js → cli-q41qar56.js} +104 -119
- package/dist/{cli-kwm1bek7.js → cli-qmx8bnt4.js} +2 -2
- package/dist/{cli-1wew39p0.js → cli-qrvk9nka.js} +28 -19
- package/dist/{cli-v8rpjrnx.js → cli-r3dxpmyt.js} +1 -1
- package/dist/{cli-0j4qmc80.js → cli-ryem5cfq.js} +8 -8
- package/dist/{cli-8pnawt98.js → cli-s8dhq7rj.js} +5 -5
- package/dist/{cli-zkbz8m2q.js → cli-sejvnjvw.js} +3 -2
- package/dist/{cli-at67kvnp.js → cli-srktrbby.js} +1 -1
- package/dist/{cli-wsnradtk.js → cli-srre41gb.js} +2 -2
- package/dist/{cli-r6xnchva.js → cli-t0n9svkb.js} +7 -7
- package/dist/{cli-y0q92v4r.js → cli-t879ww0y.js} +2 -2
- package/dist/{cli-eetzmsy5.js → cli-t9pzz2eq.js} +2 -2
- package/dist/{cli-xwsm6xkr.js → cli-tgc1kgg3.js} +1 -1
- package/dist/{cli-dw43pnzp.js → cli-tt7dkwjj.js} +7 -7
- package/dist/{cli-y754psdt.js → cli-tvyt8w6n.js} +5 -5
- package/dist/cli-v09eza21.js +1907 -0
- package/dist/{cli-mgr3gatr.js → cli-vbge4rsp.js} +4 -4
- package/dist/{cli-ppf9ap9n.js → cli-vcpyttcw.js} +1 -1
- package/dist/{cli-1606qw3n.js → cli-wzecestt.js} +1100 -432
- package/dist/{cli-5basv0e7.js → cli-x2adbg4j.js} +71 -9
- package/dist/{cli-vx9acp12.js → cli-ybte1fqc.js} +1 -1
- package/dist/{cli-vdfngx2g.js → cli-ywy8yz6t.js} +2 -2
- package/dist/{cli-cpkxh68d.js → cli-z1vam71h.js} +2 -2
- package/dist/{cli-djwt4mtn.js → cli-z3x7h79n.js} +15 -9
- package/dist/cli-z40t85ms.js +27 -0
- package/dist/{cli-ea367bdn.js → cli-zbbtp02a.js} +104 -27
- package/dist/{cli-88np9va3.js → cli-zntvmqmm.js} +2 -2
- package/dist/{cli-snwz16eg.js → cli-zxa1vmx7.js} +2 -2
- package/dist/{cli-50wa8k4h.js → cli-zy9bb22b.js} +1 -2
- package/dist/{cli-e4gx499y.js → cli-zzq96q57.js} +273 -106
- package/dist/cli.js +21 -21
- package/dist/{codex-adapter-493vb8cv.js → codex-adapter-bn7eaxk5.js} +8 -8
- package/dist/{codex-hook-ej8hn6z5.js → codex-hook-nnmezjg9.js} +3 -3
- package/dist/{codex-login-ven5cz5j.js → codex-login-ktfg1cxk.js} +1 -1
- package/dist/{codex-session-runner-ps5m4z1g.js → codex-session-runner-j1e9hffc.js} +9 -9
- package/dist/{commands-shktk0b8.js → commands-amhpafrr.js} +3 -3
- package/dist/{controller-wn3vd217.js → controller-tw7g10j2.js} +4 -4
- package/dist/{controllers-connect-yft057ws.js → controllers-connect-2ssqz7f4.js} +25 -25
- package/dist/core-bwp98v4w.js +42 -0
- package/dist/{cursor-adapter-8fpm4dng.js → cursor-adapter-d6knjmwa.js} +2 -2
- package/dist/{db-0ezhdhz5.js → db-fd6xxm77.js} +3 -3
- package/dist/{db-84pz2w5c.js → db-sc59379z.js} +2 -2
- package/dist/{devin-adapter-fs90ab4v.js → devin-adapter-3bp6rape.js} +1 -1
- package/dist/{dispatcher-h2rz69f6.js → dispatcher-a2gdqz8c.js} +22 -22
- package/dist/{docker-1h33jvh9.js → docker-a59g3ebm.js} +2 -2
- package/dist/{dsh-adapter-g9yqv09y.js → dsh-adapter-43ygwqn7.js} +2 -2
- package/dist/{e2b-jnk0yeva.js → e2b-cn7cvjqy.js} +3 -3
- package/dist/{e2b-y7e5kmzf.js → e2b-qnxyfea6.js} +3 -3
- package/dist/{easter-egg-3d-m41ad78v.js → easter-egg-3d-a0pphy71.js} +1 -1
- package/dist/{embedding-space-yam9zwzj.js → embedding-space-qepzrach.js} +6 -6
- package/dist/{embeddings-g2be0y8q.js → embeddings-d7vr881x.js} +1 -1
- package/dist/{event-bus-08t2b4y2.js → event-bus-7gbsr0g4.js} +1 -1
- package/dist/{execute-hhdejgzf.js → execute-6afts2bn.js} +1 -1
- package/dist/{external-channel-kjt2yzfj.js → external-channel-881zq1x4.js} +2 -2
- package/dist/fx-adapter-cr2hq17y.js +20 -0
- package/dist/grok-adapter-ayddnbsc.js +20 -0
- package/dist/handlers-7ghs84x2.js +41 -0
- package/dist/{heartbeat-2e5jdexj.js → heartbeat-4c022m6a.js} +25 -25
- package/dist/{hook-acg9saz7.js → hook-4k84x499.js} +6 -6
- package/dist/{hook-34s8cmgn.js → hook-a7eh6zty.js} +9 -9
- package/dist/{http-ra2zr2f8.js → http-6aw5wanc.js} +456 -1864
- package/dist/{index-mbpxhc4w.js → index-126v2d0t.js} +1 -4
- package/dist/index-dtt0d634.js +44 -0
- package/dist/index-hmszyqkk.js +42 -0
- package/dist/index-j6rm1rtn.js +39 -0
- package/dist/{index-9q42cr54.js → index-rwwhsmjg.js} +1 -1
- package/dist/{index-93bw5wds.js → index-xhad0n8m.js} +1 -1
- package/dist/{index-2z1z7qx6.js → index-yq9hhhhy.js} +26 -26
- package/dist/{index-9r4j0a60.js → index-z2g9469g.js} +410 -27
- package/dist/{k8s-8326q0rq.js → k8s-36gfn847.js} +2 -2
- package/dist/{keepalive-vjnnqbkm.js → keepalive-zhbmztqw.js} +5 -5
- package/dist/lead-g2j4q39z.js +83 -0
- package/dist/{maintenance-px2g599e.js → maintenance-rsp0591h.js} +1 -1
- package/dist/{node-2wfcey7d.js → node-0as4n1ef.js} +3 -3
- package/dist/{node-zd6shky9.js → node-dhxbt01p.js} +3 -3
- package/dist/{node-z67yjre7.js → node-rxte5hc6.js} +290 -70
- package/dist/{node-hjn5n1yp.js → node-t0ct2zpw.js} +3 -5
- package/dist/{oauth-refresh-sweep-nkykf09m.js → oauth-refresh-sweep-w3cqmxq7.js} +4 -4
- package/dist/{object-webhooks-gt9xnq21.js → object-webhooks-331hay92.js} +7 -7
- package/dist/{onboard-1f134p65.js → onboard-n2w80m2n.js} +7 -7
- package/dist/{opencode-adapter-94976yab.js → opencode-adapter-z98127cz.js} +8 -8
- package/dist/{otel-impl-5d4p2fqs.js → otel-impl-xsk35tvf.js} +2 -2
- package/dist/{pending-vkk0vx6n.js → pending-2e6trkxd.js} +23 -23
- package/dist/{pi-mono-adapter-cyzdv5er.js → pi-mono-adapter-wh6yndtm.js} +13 -13
- package/dist/{pricing-refresh-jtmjwss9.js → pricing-refresh-9355dj1t.js} +2 -2
- package/dist/{rbac-roles-yd1fgpsn.js → rbac-roles-58y3m912.js} +3 -3
- package/dist/{rbac-roles-1fvmdyeb.js → rbac-roles-8eajw4s6.js} +6 -4
- package/dist/{render-v2-kb5s3vx4.js → render-v2-7gskkmd4.js} +7 -7
- package/dist/{resume-z1vs44n5.js → resume-0drnmpja.js} +10 -10
- package/dist/{runtime-gk6ct7r7.js → runtime-d2tcmqte.js} +1 -1
- package/dist/{session-access-nz6nre4d.js → session-access-0ztys6bd.js} +5 -5
- package/dist/{session-source-backfill-wb60zjkd.js → session-source-backfill-cdm5s046.js} +3 -3
- package/dist/{setup-2x8g8j4s.js → setup-pqwb9tcc.js} +1 -1
- package/dist/thread-buffer-epx3san4.js +42 -0
- package/dist/{tree-visibility-ts3z30kw.js → tree-visibility-rwz67mje.js} +2 -2
- package/dist/{user-merge-jobs-zetg26e0.js → user-merge-jobs-mxrhamwt.js} +3 -3
- package/dist/{virtual-modules-674fka8x.js → virtual-modules-71y1gsmg.js} +3 -3
- package/dist/{work-objects-w52yyjxm.js → work-objects-3k4ykt9j.js} +25 -25
- package/dist/worker-09gqn9xy.js +83 -0
- package/dist/{worker-follow-up-dyfxyjbj.js → worker-follow-up-y0h64xpr.js} +22 -22
- package/dist/{x-asbrnafg.js → x-d27jj7z7.js} +2 -2
- package/openapi.json +861 -33
- package/package.json +4 -4
- package/src/apps/sync.ts +20 -5
- package/src/azure-devops/boards-sync.ts +1 -1
- package/src/be/db/approvals.ts +2 -0
- package/src/be/db/runtime.ts +5 -0
- package/src/be/db/script-run-sources.ts +17 -0
- package/src/be/db/slack-trees.ts +12 -1
- package/src/be/db/tasks/read.ts +25 -1
- package/src/be/db/tasks/write.ts +47 -12
- package/src/be/db/users/avatar.ts +12 -0
- package/src/be/db-retention.ts +1 -1
- package/src/be/db.ts +149 -67
- package/src/be/design-system.ts +63 -0
- package/src/be/migrations/342_script_run_sources.sql +20 -0
- package/src/be/migrations/344_user_avatar.sql +4 -0
- package/src/be/migrations/345_task_status_kind.sql +6 -0
- package/src/be/migrations/runner.ts +8 -0
- package/src/be/migrations/script-run-sources.ts +51 -0
- package/src/be/primitives/object-embed.ts +2 -2
- package/src/be/primitives/objects.ts +2 -2
- package/src/be/rbac-roles.ts +2 -0
- package/src/be/runtime-pools/supervisor.ts +1 -0
- package/src/be/scripts/typecheck.ts +5 -3
- package/src/be/seed-scripts/catalog/design-system-seed.ts +158 -0
- package/src/be/seed-scripts/index.ts +9 -0
- package/src/be/swarm-config-guard.ts +25 -1
- package/src/bitbucket/handlers.ts +1 -1
- package/src/commands/credential-outcome-report.ts +96 -0
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/runner.ts +49 -3
- package/src/event-waits/github.ts +39 -6
- package/src/event-waits/index.ts +4 -2
- package/src/event-waits/types.ts +10 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/github/app.ts +177 -13
- package/src/github/handlers.ts +7 -2
- package/src/github/pull-request-state.ts +100 -11
- package/src/gitlab/handlers.ts +2 -2
- package/src/heartbeat/heartbeat.ts +24 -5
- package/src/http/all-routes.ts +1 -0
- package/src/http/api-keys.ts +26 -0
- package/src/http/approval-chat-answer.ts +99 -0
- package/src/http/approval-requests.ts +280 -225
- package/src/http/asset-key-write.ts +45 -0
- package/src/http/assets.ts +4 -3
- package/src/http/design-system.ts +103 -0
- package/src/http/github-token.ts +27 -6
- package/src/http/index.ts +10 -6
- package/src/http/pages-public.ts +25 -10
- package/src/http/pages.ts +21 -10
- package/src/http/person-responder.ts +28 -0
- package/src/http/schedules.ts +6 -6
- package/src/http/sessions.ts +7 -2
- package/src/http/tasks.ts +23 -5
- package/src/http/users.ts +5 -0
- package/src/http/webhooks.ts +19 -1
- package/src/http/workflows.ts +5 -10
- package/src/integrations/chat-sdk/adapters.ts +33 -3
- package/src/integrations/chat-sdk/commands.ts +3 -1
- package/src/integrations/chat-sdk/inbound.ts +6 -18
- package/src/integrations/chat-sdk/mentions.ts +188 -0
- package/src/integrations/chat-sdk/outbound.ts +20 -3
- package/src/integrations/chat-sdk/router.ts +8 -0
- package/src/integrations/chat-sdk/telegram-thread.ts +12 -0
- package/src/jira/adf.ts +35 -9
- package/src/jira/sync.ts +1 -1
- package/src/kv-reserved-namespaces.ts +5 -0
- package/src/linear/sync.ts +5 -3
- package/src/pages/page-head.ts +11 -1
- package/src/prompts/session-templates.ts +1 -0
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +5 -0
- package/src/providers/claude-sdk-session.ts +5 -0
- package/src/providers/dsh-adapter.ts +48 -13
- package/src/providers/runtime-dependencies.ts +1 -1
- package/src/rbac/legacy-policy.ts +4 -0
- package/src/rbac/permissions.ts +8 -0
- package/src/scheduler/deferred-task-waits.ts +74 -13
- package/src/scheduler/index.ts +1 -0
- package/src/scheduler/scheduler.test.ts +32 -1
- package/src/scheduler/scheduler.ts +24 -1
- package/src/script-workflows/executor.ts +6 -0
- package/src/script-workflows/supervisor.ts +2 -1
- package/src/scripts-runtime/sdk-allowlist.ts +2 -0
- package/src/scripts-runtime/swarm-sdk.ts +20 -24
- package/src/scripts-runtime/types/stdlib.d.ts +12 -2
- package/src/scripts-runtime/types/swarm-extension.d.ts +19 -2
- package/src/scripts-runtime/types/swarm-sdk.d.ts +12 -2
- package/src/server.ts +2 -0
- package/src/slack/actions.ts +4 -1
- package/src/slack/approval-actions.ts +148 -0
- package/src/slack/approval-buttons.ts +28 -0
- package/src/slack/render-v2.ts +148 -7
- package/src/tests/api-drain-worker-e2e.test.ts +0 -2
- package/src/tests/approval-auto-cancellation-migration.test.ts +8 -19
- package/src/tests/approval-card-resolution.test.ts +2 -17
- package/src/tests/approval-requests-notifications.test.ts +41 -27
- package/src/tests/approval-requests.test.ts +137 -369
- package/src/tests/apps-sync-engine.test.ts +5 -3
- package/src/tests/apps-table-filters-migration.test.ts +44 -25
- package/src/tests/bitbucket-handlers.test.ts +2 -0
- package/src/tests/chat-sdk-commands.test.ts +1 -0
- package/src/tests/chat-sdk-mentions.test.ts +183 -0
- package/src/tests/claude-adapter.test.ts +35 -0
- package/src/tests/codex-adapter.test.ts +3 -92
- package/src/tests/codex-gpt6-release.test.ts +0 -9
- package/src/tests/codex-oauth-credential-info.test.ts +35 -18
- package/src/tests/codex-oauth.test.ts +0 -6
- package/src/tests/codex-pool.test.ts +5 -214
- package/src/tests/codex-rate-limit-parse.test.ts +0 -7
- package/src/tests/codex-swarm-events.test.ts +11 -54
- package/src/tests/create-page-tool.test.ts +5 -0
- package/src/tests/db-client-busy-retry.test.ts +49 -16
- package/src/tests/defer-task.test.ts +1 -0
- package/src/tests/dsh-adapter.test.ts +53 -1
- package/src/tests/e2e-shards.test.ts +9 -9
- package/src/tests/enabled-tools.test.ts +0 -2
- package/src/tests/fixtures/base-prompt-baseline.json +6 -6
- package/src/tests/fixtures/compiled-source-schema-boot.ts +24 -0
- package/src/tests/fixtures/secret-corpus.ts +43 -1
- package/src/tests/github-app-worker-auth-helper.test.ts +147 -1
- package/src/tests/gitlab-handlers.test.ts +2 -0
- package/src/tests/heartbeat-jev-gate.test.ts +9 -241
- package/src/tests/heartbeat-reroute-decision.test.ts +2 -0
- package/src/tests/heartbeat-stall-thresholds.test.ts +174 -0
- package/src/tests/heartbeat-supersede-resume.test.ts +2 -0
- package/src/tests/heartbeat.test.ts +1 -0
- package/src/tests/jira-adf.test.ts +42 -2
- package/src/tests/key-usage-selection.test.ts +302 -0
- package/src/tests/memory-e2e.test.ts +34 -103
- package/src/tests/memory-key-paths.test.ts +5 -0
- package/src/tests/memory-rater-llm.test.ts +33 -149
- package/src/tests/memory-store.test.ts +24 -125
- package/src/tests/memory.test.ts +31 -100
- package/src/tests/merge-gate-detect-changes.test.ts +314 -16
- package/src/tests/migration-342-script-run-sources.test.ts +196 -0
- package/src/tests/migration-bunfs-compat.test.ts +129 -9
- package/src/tests/otel-service-name.test.ts +0 -9
- package/src/tests/otel-session-cost-metrics.test.ts +1 -38
- package/src/tests/pool-session-logs.test.ts +8 -42
- package/src/tests/pre-push-affected-tests.test.ts +106 -0
- package/src/tests/prompt-template-session.test.ts +3 -0
- package/src/tests/rbac-e2e-helpers.test.ts +10 -4
- package/src/tests/rbac-e2e-helpers.ts +13 -4
- package/src/tests/rbac-roles.test.ts +2 -0
- package/src/tests/runner-api-drain.test.ts +2 -17
- package/src/tests/runner-terminal-window-report.test.ts +132 -0
- package/src/tests/runtime-e2b-pools.test.ts +7 -1
- package/src/tests/runtime-supervisor-failures.test.ts +1 -0
- package/src/tests/sandboxed-process.test.ts +26 -21
- package/src/tests/schedule-http-triage-tools.test.ts +12 -9
- package/src/tests/schedule-target-type.test.ts +4 -1
- package/src/tests/scheduled-tasks.test.ts +14 -51
- package/src/tests/script-connections.test.ts +2 -0
- package/src/tests/script-executor-conformance.test.ts +4 -48
- package/src/tests/script-executor-quickjs-pool.test.ts +9 -7
- package/src/tests/script-native-startup.test.ts +21 -25
- package/src/tests/script-runs-retention.test.ts +43 -16
- package/src/tests/script-workflows-runtime-e2e.test.ts +56 -22
- package/src/tests/scripts-http.test.ts +9 -3
- package/src/tests/sdk-allowlist.test.ts +26 -13
- package/src/tests/sdk-store-progress-skipped.test.ts +12 -5
- package/src/tests/secret-rules.test.ts +38 -2
- package/src/tests/secret-scrub-gate.test.ts +7 -0
- package/src/tests/secret-scrubber.test.ts +62 -2
- package/src/tests/seed-scripts.test.ts +2 -2
- package/src/tests/session-logs.test.ts +1 -260
- package/src/tests/slack-render-v2.test.ts +5 -148
- package/src/tests/system-one-hosts-ui-mirror.test.ts +1 -0
- package/src/tests/task-cascade-fail.test.ts +1 -0
- package/src/tests/task-supersede-resume.test.ts +1 -0
- package/src/tests/test-proc.ts +5 -2
- package/src/tests/vcs-azure-devops.test.ts +10 -0
- package/src/tests/vcs-provider.test.ts +8 -0
- package/src/tests/window-stream-reporter.test.ts +122 -0
- package/src/tests/workflow-agent-task-retry.test.ts +1 -3
- package/src/tests/workflow-cascade-cancel.test.ts +1 -0
- package/src/tests/workflow-retry-v2.test.ts +34 -43
- package/src/tests/workflow-retry-validation.test.ts +8 -48
- package/src/tests/worktree-reaper.test.ts +2 -2
- package/src/themes/design-system.ts +163 -0
- package/src/themes/page-theme.ts +28 -19
- package/src/tools/cancel-task.ts +2 -2
- package/src/tools/chat-post.ts +7 -3
- package/src/tools/create-page.ts +3 -0
- package/src/tools/defer-task.ts +7 -2
- package/src/tools/design-system.ts +102 -0
- package/src/tools/get-task-details.ts +8 -4
- package/src/tools/get-tasks.ts +13 -2
- package/src/tools/manage-user.ts +9 -0
- package/src/tools/mcp-servers/mcp-server-get.ts +1 -1
- package/src/tools/mcp-servers/mcp-server-list.ts +1 -1
- package/src/tools/register-chat-channel.ts +11 -2
- package/src/tools/skills/skill-get-file.ts +1 -1
- package/src/tools/skills/skill-get.ts +1 -1
- package/src/tools/skills/skill-list.ts +1 -1
- package/src/tools/skills/skill-search.ts +1 -1
- package/src/tools/store-progress.ts +5 -3
- package/src/tools/utils.ts +49 -4
- package/src/tools/workflows/get-workflow-run.ts +1 -1
- package/src/tools/workflows/get-workflow.ts +1 -1
- package/src/tools/workflows/list-workflow-runs.ts +1 -1
- package/src/tools/workflows/list-workflows.ts +1 -1
- package/src/types.ts +158 -0
- package/src/utils/constants.ts +12 -0
- package/src/utils/credentials.ts +42 -5
- package/src/utils/error-tracker.ts +6 -0
- package/src/utils/key-usage.ts +114 -0
- package/src/utils/sandboxed-process.ts +1 -0
- package/src/utils/secret-rules.generated.ts +149 -149
- package/src/utils/secret-scrubber.ts +111 -5
- package/src/vcs/azure-devops.ts +22 -1
- package/src/vcs/index.ts +3 -1
- package/src/workflows/approval-inline.ts +122 -0
- package/src/workflows/approval-notifications.ts +7 -2
- package/src/workflows/engine.ts +6 -5
- package/src/workflows/executors/agent-task.ts +14 -0
- package/src/workflows/executors/system-one-providers.ts +23 -0
- package/src/workflows/resume.ts +5 -2
- package/templates/skills/apps/SKILL.md +2 -0
- package/templates/skills/apps/content.md +2 -0
- package/templates/skills/boards-and-sheets/content.md +4 -2
- package/templates/skills/pages/content.md +41 -8
- package/templates/skills/swarm-docs/content.md +6 -0
- package/templates/skills/swarm-scripts/SKILL.md +1 -0
- package/templates/skills/swarm-scripts/content.md +1 -0
- package/templates/skills/workflow-iterate/content.md +1 -1
- package/dist/acp-adapter-t2q6nsqv.js +0 -17
- package/dist/cli-kh973792.js +0 -98
- package/dist/core-nheayfgm.js +0 -42
- package/dist/fx-adapter-8g7xsp8q.js +0 -20
- package/dist/grok-adapter-ztk2zkz1.js +0 -20
- package/dist/handlers-9ywssz71.js +0 -41
- package/dist/index-6mgbdtv1.js +0 -44
- package/dist/index-hqdsn2t2.js +0 -39
- package/dist/index-st231bqv.js +0 -40
- package/dist/lead-mk0xkth2.js +0 -82
- package/dist/thread-buffer-d50rqpev.js +0 -42
- package/dist/worker-662x1vse.js +0 -82
- package/src/tests/apps-table-selection-migration.test.ts +0 -95
- package/src/tests/extensions-example-heartbeat-remediate.test.ts +0 -69
- package/src/tests/extensions-example-rewrite-and-suppress.test.ts +0 -70
package/src/types.ts
CHANGED
|
@@ -353,6 +353,80 @@ export function isTerminalTaskStatus(status: string): status is TerminalTaskStat
|
|
|
353
353
|
return (TERMINAL_TASK_STATUSES as readonly string[]).includes(status);
|
|
354
354
|
}
|
|
355
355
|
|
|
356
|
+
/**
|
|
357
|
+
* Why a task reached its terminal status, stored in `agent_tasks.statusKind`.
|
|
358
|
+
* It refines `status` and never replaces it: every reader of `status` keeps
|
|
359
|
+
* working, and a NULL kind (rows written before the column existed) means
|
|
360
|
+
* unknown. The values are validated here, not by a DB CHECK, so a new kind
|
|
361
|
+
* is one entry in this registry and needs no migration.
|
|
362
|
+
*
|
|
363
|
+
* - `agent`: the agent decided (store-progress, the cancel-task tool).
|
|
364
|
+
* - `error`: the system gave up on the run (runner exit, crash, provider
|
|
365
|
+
* error, stall, provisioning, reboot) without the agent deciding.
|
|
366
|
+
* - `cascade`: a task it depends on ended without completing.
|
|
367
|
+
* - `external`: a tracker or VCS event ended it (PR merged, issue deleted).
|
|
368
|
+
* - `runner`: the runner wrapper finished it after the session ended.
|
|
369
|
+
* - `deferred`: defer-task completed it and a wake-up task continues it.
|
|
370
|
+
* - `user`: a person ended it from the dashboard, Slack, chat or a tracker.
|
|
371
|
+
* - `workflow`: the workflow engine ended it (run or step cancelled).
|
|
372
|
+
* - `system`: the heartbeat ended it as housekeeping.
|
|
373
|
+
* - superseded kinds mirror `ResumeReasonSchema`, plus `workflow_retry` for a
|
|
374
|
+
* workflow step the engine queued a retry for.
|
|
375
|
+
*/
|
|
376
|
+
export const TASK_STATUS_KINDS = {
|
|
377
|
+
completed: ["agent", "runner", "deferred"],
|
|
378
|
+
failed: ["agent", "error", "cascade", "external"],
|
|
379
|
+
cancelled: ["user", "agent", "workflow", "external", "system"],
|
|
380
|
+
skipped: ["agent", "runner"],
|
|
381
|
+
superseded: [
|
|
382
|
+
"graceful_shutdown",
|
|
383
|
+
"context_limits",
|
|
384
|
+
"manual_supersede",
|
|
385
|
+
"crash_recovery",
|
|
386
|
+
"provider_fallback",
|
|
387
|
+
"workflow_retry",
|
|
388
|
+
],
|
|
389
|
+
} as const satisfies Record<TerminalTaskStatus, readonly string[]>;
|
|
390
|
+
|
|
391
|
+
/** The kinds valid for one terminal status, e.g. `TaskStatusKindFor<"failed">`. */
|
|
392
|
+
export type TaskStatusKindFor<S extends TerminalTaskStatus> = (typeof TASK_STATUS_KINDS)[S][number];
|
|
393
|
+
export type TaskStatusKind = TaskStatusKindFor<TerminalTaskStatus>;
|
|
394
|
+
|
|
395
|
+
// Literal list so scripts/generate-mcp-docs.ts can render the values; the
|
|
396
|
+
// assertion below fails tsc when it drifts from TASK_STATUS_KINDS.
|
|
397
|
+
export const TaskStatusKindSchema = z.enum([
|
|
398
|
+
"agent",
|
|
399
|
+
"runner",
|
|
400
|
+
"deferred",
|
|
401
|
+
"error",
|
|
402
|
+
"cascade",
|
|
403
|
+
"external",
|
|
404
|
+
"user",
|
|
405
|
+
"workflow",
|
|
406
|
+
"system",
|
|
407
|
+
"graceful_shutdown",
|
|
408
|
+
"context_limits",
|
|
409
|
+
"manual_supersede",
|
|
410
|
+
"crash_recovery",
|
|
411
|
+
"provider_fallback",
|
|
412
|
+
"workflow_retry",
|
|
413
|
+
]);
|
|
414
|
+
type TaskStatusKindSchemaMatchesRegistry = [TaskStatusKind] extends [
|
|
415
|
+
z.infer<typeof TaskStatusKindSchema>,
|
|
416
|
+
]
|
|
417
|
+
? [z.infer<typeof TaskStatusKindSchema>] extends [TaskStatusKind]
|
|
418
|
+
? true
|
|
419
|
+
: false
|
|
420
|
+
: false;
|
|
421
|
+
true satisfies TaskStatusKindSchemaMatchesRegistry;
|
|
422
|
+
|
|
423
|
+
export function isTaskStatusKindFor<S extends TerminalTaskStatus>(
|
|
424
|
+
status: S,
|
|
425
|
+
kind: string | null | undefined,
|
|
426
|
+
): kind is TaskStatusKindFor<S> {
|
|
427
|
+
return (TASK_STATUS_KINDS[status] as readonly string[]).includes(kind ?? "");
|
|
428
|
+
}
|
|
429
|
+
|
|
356
430
|
/**
|
|
357
431
|
* Every status that is not terminal, derived so a new status lands here unless
|
|
358
432
|
* it is added to `TERMINAL_TASK_STATUSES`. Open tasks are a handful of rows,
|
|
@@ -853,6 +927,9 @@ export const AgentTaskSchema = z
|
|
|
853
927
|
notifiedAt: z.iso.datetime().optional(),
|
|
854
928
|
|
|
855
929
|
// Completion data
|
|
930
|
+
statusKind: TaskStatusKindSchema.optional().describe(
|
|
931
|
+
"Why the task reached its terminal status, e.g. `failed` + `agent` (the agent chose to fail) vs `failed` + `error` (rate limit, crash, exit code). Absent while open and on rows finished before the field existed.",
|
|
932
|
+
),
|
|
856
933
|
failureReason: z.string().optional(),
|
|
857
934
|
output: z.string().optional(),
|
|
858
935
|
progress: z.string().optional(),
|
|
@@ -1255,6 +1332,12 @@ export const UserSchema = z
|
|
|
1255
1332
|
// user's rows into the target. Such a user cannot authenticate, and
|
|
1256
1333
|
// identity lookups resolve to the target. Absent once the job deletes it.
|
|
1257
1334
|
mergedIntoUserId: z.string().nullable().optional(),
|
|
1335
|
+
// Custom avatar, same shapes as an agent's. Null/missing = initials.
|
|
1336
|
+
// Migration 344 adds the column.
|
|
1337
|
+
avatar: z
|
|
1338
|
+
.lazy(() => UserAvatarSchema)
|
|
1339
|
+
.nullable()
|
|
1340
|
+
.optional(),
|
|
1258
1341
|
createdAt: z.iso.datetime(),
|
|
1259
1342
|
lastUpdatedAt: z.iso.datetime(),
|
|
1260
1343
|
})
|
|
@@ -1548,6 +1631,10 @@ export type MediaIcon = z.infer<typeof MediaIconSchema>;
|
|
|
1548
1631
|
export const AgentAvatarSchema = MediaIconSchema;
|
|
1549
1632
|
export type AgentAvatar = MediaIcon;
|
|
1550
1633
|
|
|
1634
|
+
// User avatars accept the same shapes as agent avatars.
|
|
1635
|
+
export const UserAvatarSchema = MediaIconSchema;
|
|
1636
|
+
export type UserAvatar = MediaIcon;
|
|
1637
|
+
|
|
1551
1638
|
/**
|
|
1552
1639
|
* Icon shown for an app on the dashboard Apps page: a lucide glyph, an https
|
|
1553
1640
|
* image link, or an image in agent-fs.
|
|
@@ -2020,6 +2107,11 @@ export const ResumeReasonSchema = z.enum([
|
|
|
2020
2107
|
"provider_fallback", // Provider error; the resume runs the next fallback profile
|
|
2021
2108
|
]);
|
|
2022
2109
|
export type ResumeReason = z.infer<typeof ResumeReasonSchema>;
|
|
2110
|
+
// A supersede stores its resume reason as the task's statusKind: a new reason
|
|
2111
|
+
// must also be a `superseded` entry in TASK_STATUS_KINDS (compile error here).
|
|
2112
|
+
const _resumeReasonsAreSupersededKinds: readonly TaskStatusKindFor<"superseded">[] =
|
|
2113
|
+
ResumeReasonSchema.options;
|
|
2114
|
+
void _resumeReasonsAreSupersededKinds;
|
|
2023
2115
|
|
|
2024
2116
|
export const AgentLogSchema = z
|
|
2025
2117
|
.object({
|
|
@@ -3331,6 +3423,71 @@ export const PageThemeTokensInputSchema = z.strictObject({
|
|
|
3331
3423
|
});
|
|
3332
3424
|
export type PageThemeTokensInput = z.infer<typeof PageThemeTokensInputSchema>;
|
|
3333
3425
|
|
|
3426
|
+
// The org design system (KV `design-system` / `org`, src/themes/design-system.ts).
|
|
3427
|
+
// It restyles every designVersion 2 page that sets no `theme`.
|
|
3428
|
+
export const DesignSystemStatusSchema = z.enum(["active", "declined"]);
|
|
3429
|
+
export const DesignSystemModeSchema = z.enum(["viewer", "light", "dark"]);
|
|
3430
|
+
export const DesignSystemSourceSchema = z.object({
|
|
3431
|
+
kind: z.enum(["manual", "website", "brand-kit", "preset"]),
|
|
3432
|
+
ref: z.string().max(2048).optional(),
|
|
3433
|
+
extractedAt: z.string().max(64).optional(),
|
|
3434
|
+
});
|
|
3435
|
+
export const DesignSystemLogoSchema = z.object({
|
|
3436
|
+
url: z.string().min(1).max(2048),
|
|
3437
|
+
alt: z.string().min(1).max(200),
|
|
3438
|
+
});
|
|
3439
|
+
|
|
3440
|
+
export const DesignSystemSchema = z
|
|
3441
|
+
.object({
|
|
3442
|
+
v: z.literal(1),
|
|
3443
|
+
status: DesignSystemStatusSchema,
|
|
3444
|
+
basePreset: z.string(),
|
|
3445
|
+
tokens: PageThemeTokensSchema,
|
|
3446
|
+
fontsHref: z.string().optional(),
|
|
3447
|
+
logo: DesignSystemLogoSchema.optional(),
|
|
3448
|
+
mode: DesignSystemModeSchema,
|
|
3449
|
+
chartPalette: z.array(z.string()).optional(),
|
|
3450
|
+
source: DesignSystemSourceSchema,
|
|
3451
|
+
updatedBy: z.string().nullable(),
|
|
3452
|
+
updatedByAgentId: z.string().optional(),
|
|
3453
|
+
updatedAt: z.string(),
|
|
3454
|
+
})
|
|
3455
|
+
.openapi("DesignSystem");
|
|
3456
|
+
export type DesignSystem = z.infer<typeof DesignSystemSchema>;
|
|
3457
|
+
|
|
3458
|
+
export const DesignSystemInputSchema = z.strictObject({
|
|
3459
|
+
status: DesignSystemStatusSchema.optional().describe(
|
|
3460
|
+
'"active" (default) saves the design system. "declined" records that the requester does not want one, so agents stop asking. A declined record keeps only `source`.',
|
|
3461
|
+
),
|
|
3462
|
+
basePreset: z
|
|
3463
|
+
.string()
|
|
3464
|
+
.optional()
|
|
3465
|
+
.describe("Preset id the tokens apply on top of, for example hive or paper. Default hive."),
|
|
3466
|
+
themeTokens: PageThemeTokensInputSchema.optional().describe(
|
|
3467
|
+
'Token overrides on top of the base preset, in the same formats as create_page themeTokens: { light, dark } maps, or { format: "css", css } with a shadcn, tweakcn or Tailwind v4 variable block.',
|
|
3468
|
+
),
|
|
3469
|
+
fontsHref: z
|
|
3470
|
+
.string()
|
|
3471
|
+
.max(2048)
|
|
3472
|
+
.optional()
|
|
3473
|
+
.describe(
|
|
3474
|
+
"Google Fonts stylesheet URL (https://fonts.googleapis.com/...) that loads the fonts the tokens name.",
|
|
3475
|
+
),
|
|
3476
|
+
logo: DesignSystemLogoSchema.optional().describe("https logo URL and its alt text."),
|
|
3477
|
+
mode: DesignSystemModeSchema.optional().describe(
|
|
3478
|
+
'"viewer" (default) follows the viewer\'s light or dark mode. "light" or "dark" locks every page to that mode.',
|
|
3479
|
+
),
|
|
3480
|
+
chartPalette: z
|
|
3481
|
+
.array(z.string())
|
|
3482
|
+
.max(12)
|
|
3483
|
+
.optional()
|
|
3484
|
+
.describe("Ordered chart series colors, as CSS color values."),
|
|
3485
|
+
source: DesignSystemSourceSchema.optional().describe(
|
|
3486
|
+
"Where the design system came from. Default { kind: manual }.",
|
|
3487
|
+
),
|
|
3488
|
+
});
|
|
3489
|
+
export type DesignSystemInput = z.infer<typeof DesignSystemInputSchema>;
|
|
3490
|
+
|
|
3334
3491
|
// PageSnapshot captures the mutable content fields frozen per-version in
|
|
3335
3492
|
// page_versions.snapshot. Omits id / agentId / slug / timestamps (these are
|
|
3336
3493
|
// invariant across versions for a given page id; the slug is a parent-only
|
|
@@ -3450,6 +3607,7 @@ export type AgentTaskSummary = Pick<
|
|
|
3450
3607
|
| "createdAt"
|
|
3451
3608
|
| "lastUpdatedAt"
|
|
3452
3609
|
| "finishedAt"
|
|
3610
|
+
| "statusKind"
|
|
3453
3611
|
| "peakContextPercent"
|
|
3454
3612
|
| "totalCostUsd"
|
|
3455
3613
|
>;
|
package/src/utils/constants.ts
CHANGED
|
@@ -221,6 +221,18 @@ export function buildAgentFsLiveUrl(opts: AgentFsFileRef): string | null {
|
|
|
221
221
|
return route ? `${live}/file/~/${route}${agentFsFileLinkQuery(live)}` : null;
|
|
222
222
|
}
|
|
223
223
|
|
|
224
|
+
/**
|
|
225
|
+
* A people-facing link to an agent-fs file, on the base from
|
|
226
|
+
* {@link resolveAgentFsLinkBase} (`attachment`): Comb in the dashboard when
|
|
227
|
+
* `APP_URL` is set and Comb is on, else the live app. Null like
|
|
228
|
+
* {@link buildAgentFsLiveUrl}.
|
|
229
|
+
*/
|
|
230
|
+
export function buildAgentFsFileLink(opts: AgentFsFileRef): string | null {
|
|
231
|
+
const route = agentFsFileRoute(opts);
|
|
232
|
+
const base = resolveAgentFsLinkBase("attachment");
|
|
233
|
+
return route ? `${base}/file/~/${route}${agentFsFileLinkQuery(base)}` : null;
|
|
234
|
+
}
|
|
235
|
+
|
|
224
236
|
export interface CombState {
|
|
225
237
|
enabled: boolean;
|
|
226
238
|
/** An explicit `COMB_ENABLED` decided it; otherwise the unset default did. */
|
package/src/utils/credentials.ts
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
providerKeyVars,
|
|
8
8
|
} from "@desplega/model-catalog";
|
|
9
9
|
import { deriveDefaultRoute, routeCredentialStatus } from "@desplega/model-routing";
|
|
10
|
+
import { type CredentialSelectionStrategy, pickLowestUsage } from "./key-usage";
|
|
10
11
|
import { type ModelFamily, modelFamilyOf, windowForModelFamily } from "./model-rate-limit-windows";
|
|
11
12
|
|
|
12
13
|
/** Env vars that may contain comma-separated credential pools */
|
|
@@ -307,12 +308,21 @@ export function splitCredentialPool(value: string): string[] {
|
|
|
307
308
|
* `allowedIndices` (a profile's credential allowlist, as pool positions)
|
|
308
309
|
* bounds every pick, including the "all rate-limited, pick anyway" fallbacks.
|
|
309
310
|
* Indices stay positions in the full pool.
|
|
311
|
+
*
|
|
312
|
+
* `usageByIndex` (per pool position, from `GET /api/keys/available`: the
|
|
313
|
+
* `keyPace` or `keyUsage` score of the selection strategy) orders the pick
|
|
314
|
+
* among the available indices: the lowest score wins, ties break at random.
|
|
315
|
+
* It never excludes a key, whatever its score. `sessionsByIndex` (running
|
|
316
|
+
* sessions per pool position, same source) breaks ties within the score
|
|
317
|
+
* band: the fewest wins.
|
|
310
318
|
*/
|
|
311
319
|
export function selectCredential(
|
|
312
320
|
value: string,
|
|
313
321
|
availableIndices?: number[],
|
|
314
322
|
keyType = "ANTHROPIC_API_KEY",
|
|
315
323
|
allowedIndices?: number[],
|
|
324
|
+
usageByIndex?: number[],
|
|
325
|
+
sessionsByIndex?: number[],
|
|
316
326
|
): CredentialSelection {
|
|
317
327
|
// A CODEX_OAUTH value is one JSON blob ({access, refresh, expires, accountId}),
|
|
318
328
|
// never a comma-separated pool: its commas are field separators. Splitting it
|
|
@@ -351,7 +361,7 @@ export function selectCredential(
|
|
|
351
361
|
(i) => i >= 0 && i < credentials.length && (!drawFrom || drawFrom.includes(i)),
|
|
352
362
|
);
|
|
353
363
|
if (validIndices.length > 0) {
|
|
354
|
-
index = validIndices
|
|
364
|
+
index = pickLowestUsage(validIndices, usageByIndex, sessionsByIndex)!;
|
|
355
365
|
} else {
|
|
356
366
|
// All available indices out of range — fall back to random from all
|
|
357
367
|
index = pickAny();
|
|
@@ -458,6 +468,14 @@ export interface AvailabilityInfo {
|
|
|
458
468
|
seatBlockedIndices?: number[];
|
|
459
469
|
/** Rate-limited indices whose limit is a provider spend cap. */
|
|
460
470
|
spendCappedIndices?: number[];
|
|
471
|
+
/** Usage per pool position (see `keyUsageFromWindows`). Orders a `usage` pick; never excludes. */
|
|
472
|
+
keyUsage?: number[];
|
|
473
|
+
/** Pace delta per pool position (see `keyPaceFromWindows`). Orders a `pace` pick; never excludes. */
|
|
474
|
+
keyPace?: number[];
|
|
475
|
+
/** The server's `CREDENTIAL_SELECTION_STRATEGY`. Absent from an older server. */
|
|
476
|
+
selectionStrategy?: CredentialSelectionStrategy;
|
|
477
|
+
/** Running sessions per pool position. Breaks ties within the usage band; never excludes. */
|
|
478
|
+
activeSessions?: number[];
|
|
461
479
|
}
|
|
462
480
|
|
|
463
481
|
/**
|
|
@@ -496,6 +514,10 @@ async function fetchAvailableIndices(
|
|
|
496
514
|
earliestModelResetAt?: string | null;
|
|
497
515
|
seatBlockedIndices?: number[];
|
|
498
516
|
spendCappedIndices?: number[];
|
|
517
|
+
keyUsage?: number[];
|
|
518
|
+
keyPace?: number[];
|
|
519
|
+
selectionStrategy?: CredentialSelectionStrategy;
|
|
520
|
+
activeSessions?: number[];
|
|
499
521
|
};
|
|
500
522
|
availableIndicesMap[envVar] = {
|
|
501
523
|
availableIndices: data.availableIndices,
|
|
@@ -504,6 +526,10 @@ async function fetchAvailableIndices(
|
|
|
504
526
|
earliestModelResetAt: data.earliestModelResetAt,
|
|
505
527
|
seatBlockedIndices: data.seatBlockedIndices,
|
|
506
528
|
spendCappedIndices: data.spendCappedIndices,
|
|
529
|
+
keyUsage: data.keyUsage,
|
|
530
|
+
keyPace: data.keyPace,
|
|
531
|
+
selectionStrategy: data.selectionStrategy,
|
|
532
|
+
activeSessions: data.activeSessions,
|
|
507
533
|
};
|
|
508
534
|
if (data.availableIndices.length < totalKeys) {
|
|
509
535
|
console.log(
|
|
@@ -519,6 +545,9 @@ async function fetchAvailableIndices(
|
|
|
519
545
|
return availableIndicesMap;
|
|
520
546
|
}
|
|
521
547
|
|
|
548
|
+
const pct = (value: number | undefined) => Math.round((value ?? 0) * 100);
|
|
549
|
+
const signedPct = (value: number | undefined) => `${pct(value) > 0 ? "+" : ""}${pct(value)}`;
|
|
550
|
+
|
|
522
551
|
/**
|
|
523
552
|
* For credential env vars that contain comma-separated values,
|
|
524
553
|
* select one based on availability (rate-limit aware when API info is available).
|
|
@@ -681,18 +710,26 @@ export async function resolveCredentialPools(
|
|
|
681
710
|
}
|
|
682
711
|
}
|
|
683
712
|
|
|
713
|
+
// Pace only when the server opts in and sends `keyPace`; otherwise rank by usage, as before.
|
|
714
|
+
const strategy: CredentialSelectionStrategy =
|
|
715
|
+
info?.keyPace && info.selectionStrategy === "pace" ? "pace" : "usage";
|
|
716
|
+
const usage = strategy === "pace" ? info?.keyPace : info?.keyUsage;
|
|
717
|
+
const sessions = info?.activeSessions;
|
|
684
718
|
const result = seatFallbackIndices
|
|
685
719
|
? {
|
|
686
|
-
...selectCredential(val, seatFallbackIndices, envVar, allowedIdx),
|
|
720
|
+
...selectCredential(val, seatFallbackIndices, envVar, allowedIdx, usage, sessions),
|
|
687
721
|
isRateLimitFallback: true,
|
|
688
722
|
}
|
|
689
723
|
: uncapped?.length
|
|
690
|
-
? {
|
|
691
|
-
|
|
724
|
+
? {
|
|
725
|
+
...selectCredential(val, uncapped, envVar, allowedIdx, usage, sessions),
|
|
726
|
+
isRateLimitFallback: true,
|
|
727
|
+
}
|
|
728
|
+
: selectCredential(val, available, envVar, allowedIdx, usage, sessions);
|
|
692
729
|
env[envVar] = result.selected;
|
|
693
730
|
const availInfo = available ? ` (${available.length} available of ${result.total})` : "";
|
|
694
731
|
console.log(
|
|
695
|
-
`[credentials] Selected ${envVar} credential ${result.index + 1}/${result.total}${availInfo} [...${result.keySuffix}]${info?.rejectedIndices?.length ? ` (${info.rejectedIndices.length} rejected)` : ""}`,
|
|
732
|
+
`[credentials] Selected ${envVar} credential ${result.index + 1}/${result.total}${availInfo} [...${result.keySuffix}]${info?.keyUsage ? ` usage ${pct(info.keyUsage[result.index])}%` : ""}${info?.keyPace ? ` pace ${signedPct(info.keyPace[result.index])}%` : ""}${info ? ` strategy ${strategy}` : ""}${info?.rejectedIndices?.length ? ` (${info.rejectedIndices.length} rejected)` : ""}`,
|
|
696
733
|
);
|
|
697
734
|
selections.push({
|
|
698
735
|
...result,
|
|
@@ -38,6 +38,12 @@ export interface RateLimitWindowInfo {
|
|
|
38
38
|
|
|
39
39
|
export type RateLimitWindowTelemetry = Record<string, RateLimitWindowInfo>;
|
|
40
40
|
|
|
41
|
+
/**
|
|
42
|
+
* Name of the `custom` provider event that carries a session's merged window
|
|
43
|
+
* snapshot after each `rate_limit_event`. The runner streams it to the API.
|
|
44
|
+
*/
|
|
45
|
+
export const RATE_LIMIT_WINDOWS_EVENT = "rate_limit_windows";
|
|
46
|
+
|
|
41
47
|
/**
|
|
42
48
|
* A key that hit its provider spend limit (OpenRouter key limit or credits).
|
|
43
49
|
* `resetsAt` is null when the provider names no reset: the key stays benched
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Lowest-score-first key ranking, with a 10-point band. Pure: shared by `GET /api/keys/available`
|
|
3
|
+
* (which computes the scores from stored windows) and the worker picker
|
|
4
|
+
* (`selectCredential`). It only orders admissible keys; it never excludes one.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import { type ModelFamily, windowForModelFamily } from "./model-rate-limit-windows";
|
|
8
|
+
|
|
9
|
+
/** Key-wide windows that count as a key's usage. Model-scoped weekly windows do not. */
|
|
10
|
+
export const KEY_USAGE_WINDOWS = ["five_hour", "seven_day"] as const;
|
|
11
|
+
|
|
12
|
+
type UsageWindow = { utilization?: number; resetsAt?: number; durationMins?: number };
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* How the worker ranks admissible pool keys (`CREDENTIAL_SELECTION_STRATEGY`).
|
|
16
|
+
* `pace`: most under even use first (`keyPaceFromWindows`). `usage`: lowest
|
|
17
|
+
* utilization first (`keyUsageFromWindows`).
|
|
18
|
+
*/
|
|
19
|
+
export const CREDENTIAL_SELECTION_STRATEGIES = ["pace", "usage"] as const;
|
|
20
|
+
export type CredentialSelectionStrategy = (typeof CREDENTIAL_SELECTION_STRATEGIES)[number];
|
|
21
|
+
|
|
22
|
+
/** Parses the setting. Anything but `pace` is `usage`, the default until `pace` has soaked. */
|
|
23
|
+
export function credentialSelectionStrategy(
|
|
24
|
+
value: string | undefined,
|
|
25
|
+
): CredentialSelectionStrategy {
|
|
26
|
+
return value?.trim().toLowerCase() === "pace" ? "pace" : "usage";
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* A key's current usage, as a utilization fraction (0..1, can exceed 1): the
|
|
31
|
+
* max over its non-expired `five_hour` and `seven_day` windows. A window past
|
|
32
|
+
* `resetsAt` (epoch seconds) counts as 0. No observation counts as 0, so a
|
|
33
|
+
* fresh key ranks first.
|
|
34
|
+
*/
|
|
35
|
+
export function keyUsageFromWindows(
|
|
36
|
+
windows: Record<string, UsageWindow> | null | undefined,
|
|
37
|
+
nowMs: number,
|
|
38
|
+
): number {
|
|
39
|
+
let usage = 0;
|
|
40
|
+
for (const name of KEY_USAGE_WINDOWS) {
|
|
41
|
+
const window = windows?.[name];
|
|
42
|
+
if (!window || typeof window.utilization !== "number" || !Number.isFinite(window.utilization))
|
|
43
|
+
continue;
|
|
44
|
+
if (typeof window.resetsAt === "number" && window.resetsAt * 1000 <= nowMs) continue;
|
|
45
|
+
usage = Math.max(usage, window.utilization);
|
|
46
|
+
}
|
|
47
|
+
return usage;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* A key's pace delta, as a fraction: used minus the share of the window that
|
|
52
|
+
* has passed (the even-use point), taken as the max over the key's live
|
|
53
|
+
* `five_hour` and `seven_day` windows plus the weekly window of `modelFamily`
|
|
54
|
+
* (Fable, Opus, Sonnet) when given. Negative means quota that will go unused
|
|
55
|
+
* by the reset; the lowest delta ranks first, so a key over pace on any of
|
|
56
|
+
* those windows ranks behind one under pace on all of them. A window with no
|
|
57
|
+
* utilization, no reset or a passed reset is skipped. Undefined when none
|
|
58
|
+
* is left: the caller counts it as 0 (on pace), never as a reading.
|
|
59
|
+
*/
|
|
60
|
+
export function keyPaceFromWindows(
|
|
61
|
+
windows: Record<string, UsageWindow> | null | undefined,
|
|
62
|
+
nowMs: number,
|
|
63
|
+
modelFamily?: ModelFamily,
|
|
64
|
+
): number | undefined {
|
|
65
|
+
const modelWindow = modelFamily ? windowForModelFamily(modelFamily) : undefined;
|
|
66
|
+
let pace: number | undefined;
|
|
67
|
+
for (const name of [...KEY_USAGE_WINDOWS, ...(modelWindow ? [modelWindow] : [])]) {
|
|
68
|
+
const window = windows?.[name];
|
|
69
|
+
if (!window || typeof window.utilization !== "number" || !Number.isFinite(window.utilization))
|
|
70
|
+
continue;
|
|
71
|
+
if (typeof window.resetsAt !== "number" || window.resetsAt * 1000 <= nowMs) continue;
|
|
72
|
+
const durationMs = (window.durationMins ?? (name === "five_hour" ? 300 : 10080)) * 60_000;
|
|
73
|
+
const elapsed = Math.min(1, Math.max(0, 1 - (window.resetsAt * 1000 - nowMs) / durationMs));
|
|
74
|
+
pace = Math.max(pace ?? Number.NEGATIVE_INFINITY, window.utilization - elapsed);
|
|
75
|
+
}
|
|
76
|
+
return pace;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* Width of the low-score band, as a utilization fraction. Every admissible key
|
|
81
|
+
* within this distance of the lowest score (usage or pace delta) is an equal candidate.
|
|
82
|
+
*/
|
|
83
|
+
export const KEY_USAGE_BAND = 0.1;
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Picks the key for a draw among `indices`:
|
|
87
|
+
* 1. the keys whose score (usage or pace delta) is within `band` of the lowest;
|
|
88
|
+
* 2. among them, the keys with the fewest running sessions (`sessionsByIndex`);
|
|
89
|
+
* 3. ties at random.
|
|
90
|
+
*
|
|
91
|
+
* A plain minimum would send every concurrent draw to one key until the next
|
|
92
|
+
* usage report lands. The session count moves at session start, so a burst
|
|
93
|
+
* spreads within seconds; the band still covers draws that land before the
|
|
94
|
+
* session-start report. An index with no usage or session entry counts as 0.
|
|
95
|
+
*/
|
|
96
|
+
export function pickLowestUsage(
|
|
97
|
+
indices: readonly number[],
|
|
98
|
+
usageByIndex: readonly (number | null | undefined)[] | undefined,
|
|
99
|
+
sessionsByIndex?: readonly (number | null | undefined)[],
|
|
100
|
+
random: () => number = Math.random,
|
|
101
|
+
band: number = KEY_USAGE_BAND,
|
|
102
|
+
): number | undefined {
|
|
103
|
+
if (indices.length === 0) return undefined;
|
|
104
|
+
const entryAt = (values: typeof usageByIndex, i: number) => {
|
|
105
|
+
const value = values?.[i];
|
|
106
|
+
return typeof value === "number" && Number.isFinite(value) ? value : 0;
|
|
107
|
+
};
|
|
108
|
+
const lowest = Math.min(...indices.map((i) => entryAt(usageByIndex, i)));
|
|
109
|
+
// The epsilon keeps a key exactly `band` above the lowest inside the band.
|
|
110
|
+
const inBand = indices.filter((i) => entryAt(usageByIndex, i) <= lowest + band + 1e-9);
|
|
111
|
+
const fewest = Math.min(...inBand.map((i) => entryAt(sessionsByIndex, i)));
|
|
112
|
+
const best = inBand.filter((i) => entryAt(sessionsByIndex, i) === fewest);
|
|
113
|
+
return best[Math.floor(random() * best.length)];
|
|
114
|
+
}
|