@desplega.ai/agent-swarm 2.13.4 → 2.14.0
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-99n6z9ky.js +17 -0
- package/dist/{acp-targets-zrk9k0n7.js → acp-targets-23exz4z4.js} +10 -10
- package/dist/{actions-acqqj9jn.js → actions-zcr25x27.js} +61 -40
- package/dist/{agent-fs-provision-zmaykqnd.js → agent-fs-provision-7fa9e12e.js} +4 -4
- package/dist/{amp-adapter-a7ts8tmw.js → amp-adapter-s7ytmv6b.js} +3 -3
- package/dist/{anthropic-messages-88b7s3n9.js → anthropic-messages-vdd1zmha.js} +10 -10
- package/dist/{app-tmwa442h.js → app-5d3sz1hy.js} +7 -7
- package/dist/{approval-notifications-6psaaaye.js → approval-notifications-7qgkzkzx.js} +8 -8
- package/dist/{assistant-564v6emv.js → assistant-p2yvhc3j.js} +37 -32
- package/dist/{boot-args-schema-n099e0f2.js → boot-args-schema-ry6cb0p7.js} +1 -1
- package/dist/{boot-reembed-epvg4fp9.js → boot-reembed-2hkm3vz2.js} +1 -1
- package/dist/{boot-reembed-chx66qfk.js → boot-reembed-c9643ms3.js} +1 -1
- package/dist/{boot-scrub-sweep-dhkfp0a7.js → boot-scrub-sweep-3ycxr51t.js} +2 -2
- package/dist/{boot-seeds-m74fc07r.js → boot-seeds-2hzvvzg0.js} +4 -4
- package/dist/{boxd-451q55ys.js → boxd-9py3x0jb.js} +2 -2
- package/dist/{claude-adapter-hw63yj3j.js → claude-adapter-dnkww93e.js} +9 -9
- package/dist/{claude-managed-adapter-z5s7fx6p.js → claude-managed-adapter-yk0cr5x6.js} +4 -4
- package/dist/{claude-managed-setup-wee1762m.js → claude-managed-setup-4byxpp47.js} +5 -5
- package/dist/{claude-sdk-session-cktyqkpk.js → claude-sdk-session-4wf3dbvs.js} +13163 -12195
- package/dist/{cli-5rxsb3wq.js → cli-096aftq6.js} +12 -7
- package/dist/{cli-5rgm8p39.js → cli-0e914dp9.js} +3 -3
- package/dist/{cli-bzcwwebm.js → cli-0h6m6z5g.js} +1 -1
- package/dist/{cli-cah298e5.js → cli-0k7ppk9k.js} +231 -124
- package/dist/{cli-ja450998.js → cli-1nfabrt4.js} +8 -8
- package/dist/{cli-jzerrzgc.js → cli-2414h5r9.js} +8 -8
- package/dist/{cli-b768ek79.js → cli-24wervhz.js} +38 -0
- package/dist/{cli-93n305hm.js → cli-2ayk9gn8.js} +2 -2
- package/dist/{cli-kr0jpw9c.js → cli-2ckwgs7q.js} +1 -1
- package/dist/{cli-d5pc8ep0.js → cli-2savn6mm.js} +11 -100
- package/dist/{cli-jbrc98qb.js → cli-2zjxake1.js} +4 -4
- package/dist/{cli-4q2c8rxw.js → cli-37p61fcg.js} +15 -9
- package/dist/{cli-2vp0z049.js → cli-39t9d248.js} +1 -1
- package/dist/{cli-sa02jsqt.js → cli-3mhdmcd4.js} +1 -1
- package/dist/{cli-x2cem5vy.js → cli-3wsabyt0.js} +2 -2
- package/dist/{cli-dqgnbnxs.js → cli-466jjrwe.js} +16 -2
- package/dist/{cli-zhwjdhjr.js → cli-6ajyhxh7.js} +2 -2
- package/dist/{cli-3bxrrh53.js → cli-6yy4fepf.js} +4 -4
- package/dist/{cli-hhtbandk.js → cli-73rmgm45.js} +2 -2
- package/dist/{cli-8b4rpnwj.js → cli-7ca8hczj.js} +1 -1
- package/dist/{cli-0h8skzss.js → cli-7g5qj2ca.js} +4 -3
- package/dist/{cli-m1sns1da.js → cli-7w1fs01q.js} +2 -2
- package/dist/{cli-xwsm6xkr.js → cli-84wxwt3z.js} +1 -1
- package/dist/{cli-qzz6tz8s.js → cli-84xn7bgz.js} +1 -1
- package/dist/{cli-49aq3cyn.js → cli-879txsac.js} +5 -5
- package/dist/{cli-bv4vvnmg.js → cli-8vbxjzk0.js} +3 -3
- package/dist/{cli-7by7vp6m.js → cli-91amj3md.js} +3 -3
- package/dist/{cli-60dwk8tx.js → cli-930zbczq.js} +3 -3
- package/dist/{cli-7g3fg4gf.js → cli-9fwznq4p.js} +10 -10
- package/dist/{cli-4pbwg7sn.js → cli-9j1t3kf6.js} +2 -2
- package/dist/{cli-tzw1jr2t.js → cli-9j47sgzy.js} +2 -2
- package/dist/{cli-0fgvnb0x.js → cli-ad00h1st.js} +7 -7
- package/dist/{cli-kj84fqxz.js → cli-adzmmcvf.js} +19 -7
- package/dist/{cli-3tzmh38q.js → cli-ayxxkk3p.js} +68 -25
- package/dist/{cli-4vynxtrb.js → cli-bqfx72e6.js} +10 -3
- package/dist/{cli-8cas2xvp.js → cli-cbg0j1yt.js} +2716 -2643
- package/dist/{cli-fw67mnyc.js → cli-cg1q8ymp.js} +1 -1
- package/dist/{cli-he5nxaa8.js → cli-dw9rtjm3.js} +1 -1
- package/dist/{cli-jg5txpm6.js → cli-dy754erz.js} +83 -1
- package/dist/{cli-tsc3pdfd.js → cli-edxfzgah.js} +4 -4
- package/dist/{cli-hyqksecw.js → cli-ejnhs815.js} +15 -15
- package/dist/{cli-k0nebh10.js → cli-enavhq6r.js} +1 -1
- package/dist/{cli-ea7nz50q.js → cli-f2rwt43y.js} +14 -14
- package/dist/{cli-zjdhrzm0.js → cli-f9g96z28.js} +8 -8
- package/dist/{cli-rmgvwcmy.js → cli-fww016hh.js} +534 -70
- package/dist/{cli-rv3y60bt.js → cli-g6a696c0.js} +4 -4
- package/dist/{cli-z1vam71h.js → cli-gc6b94tj.js} +2 -2
- package/dist/{cli-p436yrzp.js → cli-gcyws2bp.js} +2 -2
- package/dist/{cli-srktrbby.js → cli-hzhv7yac.js} +1 -1
- package/dist/{cli-0p76my9q.js → cli-jcnc5ret.js} +44 -32
- package/dist/{cli-tr19nyn9.js → cli-jgq9xptq.js} +7 -7
- package/dist/{cli-pz1dp12c.js → cli-jwnac23b.js} +1 -1
- package/dist/{cli-904wk98s.js → cli-kc7vd07m.js} +917 -350
- package/dist/{cli-t0jmkcah.js → cli-kg63yp1r.js} +14 -14
- package/dist/{cli-ts5yv7dn.js → cli-krk8y8c7.js} +835 -157
- package/dist/{cli-jyhbvdga.js → cli-m0ea8ggd.js} +8 -10
- package/dist/{cli-944w9wb4.js → cli-md4tn21h.js} +20 -15
- package/dist/{cli-zexwhj3f.js → cli-mv8ft7b0.js} +10 -9
- package/dist/{cli-phdzn699.js → cli-mw1tmn3x.js} +217 -27
- package/dist/{cli-5ashycw3.js → cli-njvpngc6.js} +3 -3
- package/dist/{cli-9ah37a8a.js → cli-phe2vcw5.js} +10 -7
- package/dist/{cli-eds5xnsz.js → cli-phmy14hb.js} +2 -2
- package/dist/{cli-n1kjs58m.js → cli-pq0kv31y.js} +5 -5
- package/dist/{cli-pz1nq5xm.js → cli-q457ga28.js} +6 -6
- package/dist/{cli-s33bzmk0.js → cli-q5n3deaf.js} +1 -1
- package/dist/{cli-4fpa0zns.js → cli-qkbevqer.js} +3 -3
- package/dist/{cli-29h5239w.js → cli-qrwjk4xy.js} +5 -5
- package/dist/{cli-kezzteka.js → cli-r04ve9xw.js} +1 -1
- package/dist/{cli-3xqad83h.js → cli-r495stwd.js} +2 -2
- package/dist/{cli-1kvcsd2f.js → cli-r9d2tya0.js} +71 -3
- package/dist/{cli-ybte1fqc.js → cli-rp1n2xpd.js} +1 -1
- package/dist/{cli-fkpnx3vf.js → cli-rs1rzwp4.js} +3 -2
- package/dist/{cli-h9d3sdnc.js → cli-rzbsh6bw.js} +1 -1
- package/dist/{cli-94gx6ze9.js → cli-s4pccby1.js} +1 -1
- package/dist/{cli-cq4am6vg.js → cli-shyhb4t5.js} +10 -10
- package/dist/{cli-gtj12v95.js → cli-srq69pn1.js} +1 -1
- package/dist/{cli-azj9t1f9.js → cli-tc165vrb.js} +48 -5
- package/dist/{cli-gse7bp3z.js → cli-v4z5v3jd.js} +300 -81
- package/dist/{cli-p3knvk62.js → cli-vxmmttmt.js} +132 -53
- package/dist/{cli-404am6f3.js → cli-w4bvtxet.js} +7 -7
- package/dist/{cli-gkv0r2hq.js → cli-wd7b5hgc.js} +71 -9
- package/dist/{cli-akm6y2a8.js → cli-wvbaq052.js} +1 -1
- package/dist/{cli-ywy8yz6t.js → cli-wvgg7r4j.js} +2 -2
- package/dist/{cli-ka48vpev.js → cli-wym6rxgt.js} +165 -6
- package/dist/{cli-nc4pbwmp.js → cli-yd7e590v.js} +12 -12
- package/dist/{cli-3zrwrnz7.js → cli-yjb3cddd.js} +1 -1
- package/dist/{cli-7gbff32z.js → cli-z8t4485r.js} +2 -2
- package/dist/{cli-hdhpdrka.js → cli-ze1ndjs4.js} +4 -6
- package/dist/{cli-50wa8k4h.js → cli-zy9bb22b.js} +1 -2
- package/dist/cli.js +28 -28
- package/dist/{codex-adapter-2fs2c0n6.js → codex-adapter-eq61radw.js} +8 -8
- package/dist/{codex-hook-jxjv6dy5.js → codex-hook-8nmepvz6.js} +3 -3
- package/dist/{codex-login-ktfg1cxk.js → codex-login-vbd9707w.js} +1 -1
- package/dist/{codex-session-runner-r55tmx4c.js → codex-session-runner-rfx355h4.js} +9 -9
- package/dist/{commands-0mxdy9x8.js → commands-d1z0sx62.js} +3 -3
- package/dist/{controller-g3vkfhr4.js → controller-9hz6d8x3.js} +4 -4
- package/dist/{controllers-connect-4wdmncqt.js → controllers-connect-tz07d2xr.js} +24 -25
- package/dist/core-dynsv289.js +41 -0
- package/dist/{cursor-adapter-t9qb96q2.js → cursor-adapter-ef22ze3j.js} +2 -2
- package/dist/{db-487vvyv9.js → db-gd81d68c.js} +3 -3
- package/dist/{db-76p7w3gr.js → db-vrckks6q.js} +4 -2
- package/dist/{devin-adapter-3bp6rape.js → devin-adapter-kdt6a2bh.js} +1 -1
- package/dist/{dispatcher-64rp6w67.js → dispatcher-76as8w2t.js} +21 -22
- package/dist/{docker-a59g3ebm.js → docker-51ta7jsh.js} +2 -2
- package/dist/dsh-adapter-ypfvcdyz.js +11 -0
- package/dist/{e2b-dc8f6ctq.js → e2b-05kn3kpq.js} +16 -5
- package/dist/{e2b-3ykbe805.js → e2b-dm9r8hpy.js} +3 -3
- package/dist/{easter-egg-3d-jrrwyf55.js → easter-egg-3d-sg21j15g.js} +1 -1
- package/dist/{embedding-space-001hhhpk.js → embedding-space-zsdw37bb.js} +13 -23
- package/dist/{embeddings-esj19cnw.js → embeddings-p4e3e1m6.js} +1 -1
- package/dist/{event-bus-7gbsr0g4.js → event-bus-tvf2grf4.js} +1 -1
- package/dist/{execute-301hkxqg.js → execute-nztd0af0.js} +1 -1
- package/dist/{external-channel-w10e2j05.js → external-channel-717yzn4d.js} +2 -2
- package/dist/fx-adapter-9k0hptnz.js +20 -0
- package/dist/grok-adapter-skdj2pce.js +20 -0
- package/dist/handlers-5btjqkz6.js +39 -0
- package/dist/{heartbeat-tbrj7vhq.js → heartbeat-vfb1gy84.js} +24 -25
- package/dist/{hook-tx917rqw.js → hook-ctz0xmp3.js} +11 -11
- package/dist/{hook-3am1sq68.js → hook-eh52p7yd.js} +6 -6
- package/dist/{http-3rmemtqy.js → http-zregegrx.js} +902 -198
- package/dist/{index-s7xtvc0f.js → index-5kx15d19.js} +1 -1
- package/dist/index-7w8p6em0.js +41 -0
- package/dist/index-evay0xyk.js +17 -0
- package/dist/{index-2jw11t8s.js → index-fdym6ryb.js} +25 -26
- package/dist/{index-3j803vnb.js → index-mtnbhe12.js} +20533 -19786
- package/dist/index-vz4semsx.js +38 -0
- package/dist/{index-gfnq66t1.js → index-x9qf8dg7.js} +294 -29
- package/dist/index-y3s0xp2v.js +43 -0
- package/dist/{k8s-36gfn847.js → k8s-ejkk0aw7.js} +2 -2
- package/dist/{keepalive-9px3t7qj.js → keepalive-zdqay870.js} +4 -5
- package/dist/lead-6cscw8a5.js +82 -0
- package/dist/{maintenance-vwqjwst6.js → maintenance-t5ndg11m.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-jkdd5w7m.js} +290 -70
- package/dist/{node-hjn5n1yp.js → node-t0ct2zpw.js} +3 -5
- package/dist/{oauth-refresh-sweep-yqry3wn4.js → oauth-refresh-sweep-y9zyd7t6.js} +3 -4
- package/dist/{object-webhooks-8s1wtths.js → object-webhooks-mkca91s0.js} +7 -7
- package/dist/{onboard-hb8czx0p.js → onboard-ss995244.js} +11 -9
- package/dist/{opencode-adapter-djd6m6dk.js → opencode-adapter-mwpz0278.js} +8 -8
- package/dist/{otel-impl-2ymwyczz.js → otel-impl-6n6vva3x.js} +2 -2
- package/dist/{pending-nxavtvx7.js → pending-2sxh1t6j.js} +22 -23
- package/dist/{pi-mono-adapter-d2cpmcy4.js → pi-mono-adapter-sfb7zy43.js} +13 -13
- package/dist/{pricing-refresh-1yz8jkqv.js → pricing-refresh-h79bg4cf.js} +2 -2
- package/dist/{rbac-roles-7s6m31xw.js → rbac-roles-ckq0czp4.js} +2 -2
- package/dist/{rbac-roles-dbpx0x9v.js → rbac-roles-jg2e260w.js} +3 -3
- package/dist/{render-v2-7y20rjrn.js → render-v2-ymbshmn0.js} +7 -7
- package/dist/{resume-wz546x47.js → resume-jdhnt4jk.js} +10 -10
- package/dist/{runtime-cb5bd9tz.js → runtime-y28jhhnf.js} +1 -1
- package/dist/{session-access-4vcft8kq.js → session-access-k4ta5hvp.js} +5 -5
- package/dist/{session-source-backfill-57b50tpw.js → session-source-backfill-528j4s8j.js} +3 -3
- package/dist/{setup-e1tevjyj.js → setup-d6pj82fr.js} +15 -6
- package/dist/thread-buffer-9w6x5zec.js +40 -0
- package/dist/{tree-visibility-07wf1nct.js → tree-visibility-kjxv3nxk.js} +2 -2
- package/dist/{user-merge-jobs-n20qpv6s.js → user-merge-jobs-rabbncf6.js} +3 -3
- package/dist/{virtual-modules-6fxmn1yv.js → virtual-modules-22k51txd.js} +3 -3
- package/dist/{work-objects-eg7y48pe.js → work-objects-xtjbar3r.js} +26 -30
- package/dist/{worker-follow-up-jnvnnf2b.js → worker-follow-up-fg48vk6d.js} +21 -22
- package/dist/worker-g4aj93dt.js +82 -0
- package/dist/{x-d27jj7z7.js → x-vfsqypht.js} +2 -2
- package/openapi.json +633 -25
- package/package.json +10 -10
- package/src/apps/definition.ts +76 -24
- package/src/apps/row-store.ts +67 -0
- package/src/apps/script-types.ts +131 -21
- package/src/apps/store.ts +4 -1
- package/src/apps/sync.ts +20 -5
- package/src/azure-devops/boards-sync.ts +1 -1
- package/src/be/db/script-runs.ts +33 -0
- package/src/be/db/slack-card-groups.ts +147 -0
- package/src/be/db/slack-trees.ts +38 -1
- package/src/be/db/task-idempotency.ts +63 -0
- package/src/be/db/tasks/read.ts +27 -1
- package/src/be/db/tasks/write.ts +51 -14
- package/src/be/db/users/avatar.ts +12 -0
- package/src/be/db/workflow-idempotency.ts +6 -1
- package/src/be/db/workflows/read.ts +79 -0
- package/src/be/db.ts +129 -152
- package/src/be/improvements.ts +24 -2
- package/src/be/mcp-proxy.ts +45 -11
- package/src/be/memory/embedding-space.ts +10 -20
- package/src/be/memory/index.ts +35 -0
- package/src/be/memory/providers/openai-embedding.ts +10 -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/348_task_deferred_until.sql +4 -0
- package/src/be/migrations/354_durable_objects.sql +9 -0
- package/src/be/migrations/356_slack_outcome_card_groups.sql +14 -0
- package/src/be/migrations/357_task_idempotency_keys.sql +27 -0
- package/src/be/migrations/362_favorites_app.sql +36 -0
- package/src/be/primitives/object-embed.ts +2 -2
- package/src/be/primitives/objects.ts +2 -2
- package/src/be/repo-checked-update.ts +58 -5
- package/src/be/requester-timezone.ts +10 -0
- package/src/be/runtime-pools/supervisor.ts +1 -0
- package/src/be/script-connections.ts +5 -1
- package/src/be/script-credential-broker.ts +29 -2
- package/src/be/scripts/durable.ts +204 -0
- package/src/be/scripts/extract-schema.ts +29 -4
- package/src/be/scripts/run-credential.ts +1 -8
- package/src/be/scripts/typecheck.ts +33 -8
- package/src/be/seed-scripts/catalog/memory-eval.ts +11 -2
- package/src/be/seed-scripts/catalog/tool-usage.ts +27 -8
- package/src/be/swarm-config-guard.ts +91 -7
- package/src/be/users.ts +33 -12
- package/src/bitbucket/handlers.ts +1 -1
- package/src/comb/review-batch.ts +16 -5
- package/src/commands/context-preamble.ts +237 -0
- package/src/commands/credential-outcome-report.ts +96 -0
- package/src/commands/e2b.ts +14 -0
- package/src/commands/entrypoint-mcp-config.ts +231 -0
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +2 -1
- package/src/commands/onboard/env-generator.ts +16 -7
- package/src/commands/runner.ts +72 -10
- package/src/commands/setup.tsx +17 -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 +6 -1
- package/src/hooks/hook.ts +8 -2
- package/src/hooks/native-tool-hooks.ts +4 -2
- package/src/http/api-keys.ts +26 -0
- package/src/http/apps.ts +82 -42
- package/src/http/asset-key-write.ts +45 -0
- package/src/http/assets.ts +4 -3
- package/src/http/comb.ts +21 -5
- package/src/http/config.ts +8 -4
- package/src/http/github-token.ts +27 -6
- package/src/http/heartbeat.ts +5 -0
- package/src/http/index.ts +12 -6
- package/src/http/kv.ts +7 -5
- package/src/http/mcp-oauth.ts +16 -0
- package/src/http/mcp-servers.ts +43 -3
- package/src/http/memory.ts +28 -1
- package/src/http/metrics.ts +11 -4
- package/src/http/onboarding.ts +12 -1
- package/src/http/pages.ts +4 -10
- package/src/http/repos.ts +27 -11
- package/src/http/request-principal.ts +27 -1
- package/src/http/schedules.ts +42 -14
- package/src/http/script-connection-proxy.ts +3 -1
- package/src/http/script-runs.ts +21 -10
- package/src/http/scripts.ts +177 -26
- package/src/http/session-cost-recompute.ts +9 -4
- package/src/http/sessions.ts +7 -2
- package/src/http/skills.ts +70 -0
- package/src/http/status.ts +2 -0
- package/src/http/tasks.ts +115 -19
- package/src/http/trackers/jira.ts +18 -3
- package/src/http/trackers/linear.ts +3 -0
- 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/commands.ts +3 -1
- package/src/jira/sync.ts +1 -1
- package/src/kv-limits.ts +2 -0
- package/src/kv-reserved-namespaces.ts +25 -2
- package/src/linear/sync.ts +5 -3
- package/src/prompts/session-templates.ts +50 -0
- package/src/prompts/session-turns.ts +30 -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-managed-adapter.ts +14 -0
- package/src/providers/claude-sdk-session.ts +19 -1
- package/src/providers/cursor-adapter.ts +1 -1
- package/src/providers/dsh-adapter.ts +1 -1
- package/src/providers/opencode-adapter.ts +3 -5
- package/src/providers/runtime-dependencies.ts +11 -8
- package/src/rbac/legacy-policy.ts +7 -0
- package/src/rbac/permissions.ts +27 -0
- package/src/scheduler/deferred-task-waits.ts +74 -13
- package/src/scheduler/scheduler.ts +36 -18
- package/src/script-workflows/executor.ts +37 -8
- package/src/script-workflows/supervisor.ts +14 -0
- package/src/scripts-runtime/ctx.ts +5 -1
- package/src/scripts-runtime/durable-object-base.ts +19 -0
- package/src/scripts-runtime/eval-harness.ts +46 -1
- package/src/scripts-runtime/executors/native.ts +13 -1
- package/src/scripts-runtime/executors/quickjs-bundle.ts +20 -1
- package/src/scripts-runtime/executors/quickjs-prelude.ts +40 -1
- package/src/scripts-runtime/executors/quickjs-runner.ts +26 -3
- package/src/scripts-runtime/executors/quickjs-worker.ts +2 -1
- package/src/scripts-runtime/executors/types.ts +26 -0
- package/src/scripts-runtime/extract-signature.ts +96 -1
- package/src/scripts-runtime/loader.ts +11 -5
- package/src/scripts-runtime/mcp-client.ts +1 -1
- package/src/scripts-runtime/sdk-allowlist.ts +1 -0
- package/src/scripts-runtime/swarm-config.ts +7 -0
- package/src/scripts-runtime/swarm-sdk.ts +12 -2
- package/src/scripts-runtime/types/stdlib.d.ts +27 -1
- package/src/scripts-runtime/types/swarm-extension.d.ts +20 -2
- package/src/scripts-runtime/types/swarm-sdk.d.ts +27 -1
- package/src/slack/actions.ts +25 -1
- package/src/slack/assistant.ts +8 -0
- package/src/slack/blocks.ts +35 -0
- package/src/slack/channel-activity.ts +7 -0
- package/src/slack/enrich.ts +46 -54
- package/src/slack/files.ts +173 -23
- package/src/slack/handlers.test.ts +17 -19
- package/src/slack/handlers.ts +15 -14
- package/src/slack/render-v2.ts +403 -17
- package/src/slack/responses.ts +61 -5
- package/src/slack/session-mirror.ts +10 -5
- package/src/slack/task-output.ts +25 -14
- package/src/slack/templates.ts +9 -0
- package/src/slack/thread-participants.ts +64 -24
- package/src/slack/watcher.ts +4 -4
- package/src/slack/work-objects.ts +1 -1
- package/src/stdio.ts +5 -0
- package/src/tests/agents-list-model-display.test.ts +4 -0
- 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-script-types.test.ts +63 -16
- package/src/tests/apps-sort-order.test.ts +87 -0
- package/src/tests/apps-sync-engine.test.ts +5 -3
- package/src/tests/apps-table-filters-migration.test.ts +44 -25
- package/src/tests/bedrock-model-groups.test.ts +4 -0
- package/src/tests/bitbucket-handlers.test.ts +2 -0
- package/src/tests/channel-activity.test.ts +9 -0
- package/src/tests/chat-sdk-commands.test.ts +1 -0
- package/src/tests/chatgpt-subscription-model-groups.test.ts +4 -0
- package/src/tests/claude-adapter.test.ts +35 -0
- package/src/tests/claude-hook-output.test.ts +2 -0
- package/src/tests/claude-managed-adapter.test.ts +15 -3
- package/src/tests/claude-sdk-stderr.test.ts +28 -0
- package/src/tests/codex-adapter.test.ts +3 -92
- package/src/tests/codex-gpt6-release.test.ts +4 -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/comb-review-batch.test.ts +17 -4
- package/src/tests/comb-status.test.ts +1 -0
- package/src/tests/db-client-busy-retry.test.ts +49 -16
- package/src/tests/db-client.test.ts +11 -5
- package/src/tests/db-task-read-contract.test.ts +1 -0
- package/src/tests/db-task-write-contract.test.ts +2 -2
- package/src/tests/defer-task.test.ts +24 -1
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/e2b-dispatch.test.ts +13 -1
- package/src/tests/e2e-shards.test.ts +9 -9
- package/src/tests/enabled-tools.test.ts +0 -2
- package/src/tests/entrypoint-mcp-config.test.ts +642 -0
- package/src/tests/fixtures/base-prompt-baseline.json +6 -6
- package/src/tests/fixtures/onboard/content.env.txt +2 -2
- package/src/tests/fixtures/onboard/dev.env.txt +2 -2
- package/src/tests/fixtures/onboard/full-all.env.txt +2 -2
- package/src/tests/fixtures/onboard/full.env.txt +2 -2
- package/src/tests/fixtures/onboard/research.env.txt +2 -2
- package/src/tests/fixtures/onboard/solo.env.txt +2 -2
- package/src/tests/fixtures/runner-missing-dependency.ts +2 -1
- package/src/tests/fx-adapter.test.ts +4 -5
- 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-supersede-resume.test.ts +2 -0
- package/src/tests/heartbeat.test.ts +1 -0
- package/src/tests/hook-mcp-config-precedence.test.ts +59 -0
- package/src/tests/hook-ping-me-order.test.ts +1 -0
- package/src/tests/hook-runtime-close.test.ts +1 -0
- package/src/tests/improvements-payload.test.ts +2 -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 +108 -2
- package/src/tests/model-groups-live-catalog.test.ts +4 -0
- package/src/tests/oauth-credential-bindings.test.ts +8 -3
- package/src/tests/oauth-refresh-failure.test.ts +15 -3
- package/src/tests/onboard-env.test.ts +1 -1
- package/src/tests/openai-compatible-providers.test.ts +5 -0
- package/src/tests/openapi-route-headers.test.ts +2 -1
- package/src/tests/opus-5-5-registry.test.ts +4 -0
- 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/provider-runtime-dependencies.test.ts +26 -15
- package/src/tests/routing-affinity-inventory.test.ts +11 -0
- package/src/tests/runner-api-drain.test.ts +2 -17
- package/src/tests/runner-context-preamble.test.ts +202 -0
- package/src/tests/runner-repo-clone-args.test.ts +116 -0
- package/src/tests/runner-terminal-window-report.test.ts +132 -0
- 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/scheduled-tasks.test.ts +14 -51
- package/src/tests/scheduler-occurrence.test.ts +60 -9
- package/src/tests/script-connections-mcp.test.ts +6 -3
- package/src/tests/script-connections.test.ts +4 -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/scripts-namespaces.test.ts +3 -1
- package/src/tests/secret-rules.test.ts +4 -2
- package/src/tests/secret-scrubber.test.ts +8 -2
- package/src/tests/session-cost-recompute-unit.test.ts +39 -0
- package/src/tests/session-costs-recompute-all-providers.test.ts +6 -3
- package/src/tests/session-logs.test.ts +1 -260
- package/src/tests/session-route-posture.test.ts +7 -1
- package/src/tests/slack-file-tools-attachments.test.ts +14 -9
- package/src/tests/slack-identity-resolution.test.ts +10 -3
- package/src/tests/slack-inline-output.test.ts +10 -8
- package/src/tests/slack-render-v2.test.ts +14 -152
- package/src/tests/slack-steering.test.ts +8 -2
- package/src/tests/slack-thread-participants.test.ts +11 -1
- package/src/tests/sonnet-5-5-registry.test.ts +4 -0
- package/src/tests/swarm-config-encryption.test.ts +5 -8
- 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/ui-spec-script-actions-config.test.ts +7 -3
- 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/workflow-triggers-v2.test.ts +35 -11
- package/src/tests/worktree-reaper.test.ts +2 -2
- package/src/tools/app-patch.ts +6 -2
- package/src/tools/app-upsert.ts +8 -4
- package/src/tools/cancel-task.ts +2 -2
- package/src/tools/defer-task.ts +24 -79
- package/src/tools/get-task-details.ts +8 -4
- package/src/tools/get-tasks.ts +13 -2
- package/src/tools/kv/kv-get.ts +2 -0
- package/src/tools/kv/kv-list.ts +11 -5
- package/src/tools/kv/kv-set.ts +1 -3
- package/src/tools/manage-user.ts +9 -0
- package/src/tools/repos/update-repo.ts +37 -19
- package/src/tools/schedules/run-schedule-now.ts +21 -1
- package/src/tools/script-apis.ts +9 -4
- package/src/tools/script-common.ts +2 -2
- package/src/tools/script-run.ts +8 -0
- package/src/tools/script-upsert.ts +1 -1
- package/src/tools/slack-download-file.ts +15 -12
- package/src/tools/slack-post.ts +7 -1
- package/src/tools/slack-read.ts +3 -1
- package/src/tools/slack-reply.ts +16 -0
- package/src/tools/slack-start-thread.ts +8 -1
- package/src/tools/slack-upload-file.ts +99 -96
- package/src/tools/store-progress.ts +5 -3
- package/src/tools/swarm-config/set-config.ts +3 -1
- package/src/tools/swarm-x.ts +0 -2
- package/src/tools/utils.ts +3 -0
- package/src/types.ts +101 -2
- package/src/utils/constants.ts +32 -0
- package/src/utils/credentials.ts +42 -5
- package/src/utils/deferral-time.ts +61 -0
- package/src/utils/error-tracker.ts +6 -0
- package/src/utils/key-usage.ts +114 -0
- package/src/utils/request-auth-context.ts +15 -16
- package/src/utils/sandboxed-process.ts +1 -0
- package/src/utils/secret-scrubber.ts +1 -1
- package/src/workflows/engine.ts +6 -11
- package/src/workflows/executors/swarm-script.ts +0 -2
- package/src/workflows/foreach-driver.ts +6 -12
- package/src/workflows/input.ts +24 -1
- package/src/workflows/node-timeout.ts +18 -0
- package/src/workflows/resume.ts +5 -2
- package/src/workflows/retry-poller.ts +2 -1
- package/src/workflows/triggers.ts +21 -11
- package/src/x/composio.ts +10 -1
- package/templates/skills/apps/SKILL.md +6 -2
- package/templates/skills/apps/content.md +6 -2
- package/templates/skills/boards-and-sheets/content.md +4 -2
- package/templates/skills/code-quality/content.md +4 -4
- package/templates/skills/pages/content.md +7 -0
- package/templates/skills/scheduled-task-resilience/SKILL.md +2 -0
- package/templates/skills/scheduled-task-resilience/content.md +2 -0
- package/templates/skills/swarm-docs/content.md +8 -0
- package/templates/skills/swarm-scripts/SKILL.md +45 -0
- package/templates/skills/swarm-scripts/content.md +45 -0
- package/dist/acp-adapter-mr4temec.js +0 -17
- package/dist/cli-1vmhnncj.js +0 -173
- package/dist/cli-kj0hyr43.js +0 -51
- package/dist/cli-ysv0k1we.js +0 -459
- package/dist/core-gsvj5f3z.js +0 -42
- package/dist/dsh-adapter-8abzqk5c.js +0 -9
- package/dist/fx-adapter-4sjrbdne.js +0 -20
- package/dist/grok-adapter-3a0ezfee.js +0 -20
- package/dist/handlers-ef3k11hb.js +0 -41
- package/dist/index-aetfyx6p.js +0 -13
- package/dist/index-e6bq0exk.js +0 -42
- package/dist/index-hf2k1vge.js +0 -39
- package/dist/index-taxmejj3.js +0 -44
- package/dist/lead-5vt6f174.js +0 -83
- package/dist/thread-buffer-686pa1p1.js +0 -42
- package/dist/worker-4vp616ms.js +0 -83
- 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
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
2
2
|
import * as z from "zod";
|
|
3
|
-
import { getAgentById, getInboxMessageById, getTaskById } from "@/be/db";
|
|
3
|
+
import { getAgentById, getInboxMessageById, getSwarmRepoById, getTaskById } from "@/be/db";
|
|
4
|
+
import { vcsRepoId } from "@/be/model-profile-check";
|
|
4
5
|
import { can } from "@/rbac";
|
|
5
6
|
import { getSlackApp } from "@/slack/app";
|
|
6
7
|
import { externalChannelToolError, getChannelBlockReason } from "@/slack/external-channel";
|
|
7
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
MAX_FILE_SIZE,
|
|
10
|
+
type OpenedFile,
|
|
11
|
+
openFileInside,
|
|
12
|
+
type UploadFileResult,
|
|
13
|
+
uploadFile,
|
|
14
|
+
uploadOpenFile,
|
|
15
|
+
} from "@/slack/files";
|
|
8
16
|
import { createToolRegistrar, swarmToolOutputSchema, toolErr, toolOk } from "@/tools/utils";
|
|
9
17
|
|
|
10
18
|
/**
|
|
@@ -26,79 +34,79 @@ function resolveTaskUploadThreadTs(
|
|
|
26
34
|
}
|
|
27
35
|
|
|
28
36
|
/**
|
|
29
|
-
*
|
|
37
|
+
* Directories that a `filePath` upload may read from: /workspace, plus the working
|
|
38
|
+
* directory of each given task that the agent runs or created (the task `dir` and
|
|
39
|
+
* the clone path of its registered repo). A host-run API has no /workspace, so
|
|
40
|
+
* there the task directory is the only root.
|
|
41
|
+
*/
|
|
42
|
+
async function uploadRoots(agentId: string, taskIds: (string | undefined)[]): Promise<string[]> {
|
|
43
|
+
const roots = [WORKSPACE_DIR];
|
|
44
|
+
for (const id of new Set(taskIds.filter((t): t is string => !!t))) {
|
|
45
|
+
const task = await getTaskById(id);
|
|
46
|
+
if (!task || (task.agentId !== agentId && task.creatorAgentId !== agentId)) continue;
|
|
47
|
+
if (task.dir) roots.push(task.dir);
|
|
48
|
+
const repoId = await vcsRepoId(task.vcsRepo);
|
|
49
|
+
const repo = repoId ? await getSwarmRepoById(repoId) : null;
|
|
50
|
+
if (repo) roots.push(repo.clonePath);
|
|
51
|
+
}
|
|
52
|
+
return roots;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* Opens the file that `filePath` names, read on the API server's filesystem.
|
|
30
57
|
*
|
|
31
|
-
* NOTE:
|
|
58
|
+
* NOTE: the file is read on the API server's filesystem (where this tool
|
|
32
59
|
* runs), NOT the caller's. Worker/lead containers have their own `/tmp` that
|
|
33
60
|
* the API server cannot see — the only volume mounted on both is
|
|
34
61
|
* `/workspace/shared/`. Files outside `/workspace/shared/` must be passed
|
|
35
62
|
* inline via the `content` (base64) param instead of `filePath`.
|
|
36
63
|
*
|
|
37
|
-
*
|
|
64
|
+
* Candidates, in order:
|
|
38
65
|
* 1. Relative paths (e.g., "shared/file.png") -> resolved from /workspace
|
|
39
|
-
* 2. Absolute paths
|
|
40
|
-
* 3. Absolute paths
|
|
41
|
-
*
|
|
66
|
+
* 2. Absolute paths (e.g., "/workspace/shared/file.png") -> used as-is
|
|
67
|
+
* 3. Absolute paths outside /workspace (e.g., "/tmp/file.png") -> also tried as
|
|
68
|
+
* /workspace/tmp/file.png
|
|
42
69
|
*
|
|
43
|
-
*
|
|
44
|
-
* @returns Object with resolved path and exists flag, or error message
|
|
70
|
+
* The first candidate whose real path is a regular file inside `roots` wins.
|
|
45
71
|
*/
|
|
46
|
-
async function
|
|
72
|
+
async function openUploadFile(
|
|
47
73
|
filePath: string,
|
|
74
|
+
roots: string[],
|
|
48
75
|
): Promise<
|
|
49
|
-
|
|
76
|
+
| { success: true; file: OpenedFile; resolvedPath: string }
|
|
77
|
+
| { success: false; notFound: boolean; error: string; triedPaths: string[] }
|
|
50
78
|
> {
|
|
51
|
-
const triedPaths
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
// Case 1: Relative path - resolve from /workspace
|
|
64
|
-
if (!filePath.startsWith("/")) {
|
|
65
|
-
const absolutePath = `${WORKSPACE_DIR}/${filePath}`;
|
|
66
|
-
triedPaths.push(absolutePath);
|
|
67
|
-
if (await fileExists(absolutePath)) {
|
|
68
|
-
return { success: true, resolvedPath: absolutePath };
|
|
69
|
-
}
|
|
70
|
-
return {
|
|
71
|
-
success: false,
|
|
72
|
-
error: `File not found. Relative paths are resolved from ${WORKSPACE_DIR}.`,
|
|
73
|
-
triedPaths,
|
|
74
|
-
};
|
|
79
|
+
const triedPaths = filePath.startsWith("/")
|
|
80
|
+
? [
|
|
81
|
+
filePath,
|
|
82
|
+
...(filePath.startsWith(`${WORKSPACE_DIR}/`) ? [] : [`${WORKSPACE_DIR}${filePath}`]),
|
|
83
|
+
]
|
|
84
|
+
: [`${WORKSPACE_DIR}/${filePath}`];
|
|
85
|
+
let refusal: string | undefined;
|
|
86
|
+
for (const candidate of triedPaths) {
|
|
87
|
+
const opened = await openFileInside(candidate, roots);
|
|
88
|
+
if (opened.success) return { success: true, file: opened.file, resolvedPath: candidate };
|
|
89
|
+
if (!opened.notFound) refusal ??= opened.error;
|
|
75
90
|
}
|
|
76
|
-
|
|
77
|
-
// Case 2: Absolute path - try it directly first
|
|
78
|
-
triedPaths.push(filePath);
|
|
79
|
-
if (await fileExists(filePath)) {
|
|
80
|
-
return { success: true, resolvedPath: filePath };
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
// Case 3: Absolute path didn't exist - try resolving under /workspace
|
|
84
|
-
// This helps with paths like /tmp/file.png -> /workspace/tmp/file.png
|
|
85
|
-
if (!filePath.startsWith(WORKSPACE_DIR)) {
|
|
86
|
-
// Remove leading slash and resolve from workspace
|
|
87
|
-
const relativePath = filePath.slice(1); // "/tmp/file.png" -> "tmp/file.png"
|
|
88
|
-
const workspacePath = `${WORKSPACE_DIR}/${relativePath}`;
|
|
89
|
-
triedPaths.push(workspacePath);
|
|
90
|
-
if (await fileExists(workspacePath)) {
|
|
91
|
-
return { success: true, resolvedPath: workspacePath };
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
|
|
91
|
+
if (refusal) return { success: false, notFound: false, error: refusal, triedPaths };
|
|
95
92
|
return {
|
|
96
93
|
success: false,
|
|
97
|
-
|
|
94
|
+
notFound: true,
|
|
95
|
+
error: filePath.startsWith("/")
|
|
96
|
+
? "File not found at any of the attempted locations."
|
|
97
|
+
: `File not found. Relative paths are resolved from ${WORKSPACE_DIR}.`,
|
|
98
98
|
triedPaths,
|
|
99
99
|
};
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
+
function uploadResult(result: UploadFileResult) {
|
|
103
|
+
if (!result.success) {
|
|
104
|
+
return toolErr(`Failed to upload file: ${result.error}`);
|
|
105
|
+
}
|
|
106
|
+
const successMsg = `File uploaded successfully${result.fileId ? ` (ID: ${result.fileId})` : ""}.`;
|
|
107
|
+
return toolOk(successMsg, { data: { fileId: result.fileId } });
|
|
108
|
+
}
|
|
109
|
+
|
|
102
110
|
export const registerSlackUploadFileTool = (server: McpServer) => {
|
|
103
111
|
createToolRegistrar(server)(
|
|
104
112
|
"slack-upload-file",
|
|
@@ -133,6 +141,7 @@ export const registerSlackUploadFileTool = (server: McpServer) => {
|
|
|
133
141
|
"Path to the file to upload. Either filePath OR content must be provided. " +
|
|
134
142
|
"IMPORTANT: the file is read on the API server's filesystem (where this tool runs), NOT on the caller's. " +
|
|
135
143
|
"Worker/lead containers do NOT share /tmp or /workspace/personal/ with the API server — the only shared volume is /workspace/shared/. " +
|
|
144
|
+
"The file must be a regular file inside /workspace or the working directory of your current task. " +
|
|
136
145
|
"Use /workspace/shared/<agent-id>/file.png (or a relative path like 'shared/<agent-id>/file.png'). " +
|
|
137
146
|
"For files that only live on the caller (e.g. /tmp), pass them inline via `content` (base64) instead.",
|
|
138
147
|
),
|
|
@@ -243,14 +252,12 @@ export const registerSlackUploadFileTool = (server: McpServer) => {
|
|
|
243
252
|
return toolErr("filename is required when using base64 content upload.");
|
|
244
253
|
}
|
|
245
254
|
|
|
246
|
-
let fileToUpload: string | Buffer;
|
|
247
|
-
let actualFilename: string;
|
|
248
|
-
|
|
249
255
|
if (filePath) {
|
|
250
|
-
|
|
251
|
-
const pathResult = await
|
|
256
|
+
const roots = await uploadRoots(agent.id, [taskId, requestInfo.sourceTaskId]);
|
|
257
|
+
const pathResult = await openUploadFile(filePath, roots);
|
|
252
258
|
|
|
253
259
|
if (!pathResult.success) {
|
|
260
|
+
if (!pathResult.notFound) return toolErr(pathResult.error);
|
|
254
261
|
const triedPathsList = pathResult.triedPaths.map((p) => ` - ${p}`).join("\n");
|
|
255
262
|
const errorMsg =
|
|
256
263
|
`${pathResult.error}\n` +
|
|
@@ -264,48 +271,44 @@ export const registerSlackUploadFileTool = (server: McpServer) => {
|
|
|
264
271
|
return toolErr(errorMsg);
|
|
265
272
|
}
|
|
266
273
|
|
|
267
|
-
|
|
268
|
-
const bunFile = Bun.file(resolvedPath);
|
|
269
|
-
const fileSize = bunFile.size;
|
|
270
|
-
|
|
271
|
-
if (fileSize > MAX_FILE_SIZE) {
|
|
272
|
-
const sizeMB = Math.round(fileSize / 1024 / 1024);
|
|
273
|
-
return toolErr(`File too large: ${sizeMB} MB. Maximum is 1 GB.`);
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
fileToUpload = resolvedPath;
|
|
277
|
-
actualFilename = filename || resolvedPath.split("/").pop() || "file";
|
|
278
|
-
} else {
|
|
279
|
-
// Base64 content mode: decode and check size
|
|
274
|
+
// The handle stays open until the upload has sent every byte.
|
|
280
275
|
try {
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
276
|
+
return uploadResult(
|
|
277
|
+
await uploadOpenFile(app.client, pathResult.file, {
|
|
278
|
+
filename: filename || pathResult.resolvedPath.split("/").pop() || "file",
|
|
279
|
+
channelId: slackChannelId,
|
|
280
|
+
threadTs: slackThreadTs,
|
|
281
|
+
initialComment,
|
|
282
|
+
}),
|
|
283
|
+
);
|
|
284
|
+
} finally {
|
|
285
|
+
await pathResult.file.handle.close();
|
|
289
286
|
}
|
|
290
|
-
|
|
291
|
-
actualFilename = filename!;
|
|
292
287
|
}
|
|
293
288
|
|
|
289
|
+
// Base64 content mode: decode and check size
|
|
290
|
+
let fileToUpload: Buffer;
|
|
294
291
|
try {
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
threadTs: slackThreadTs,
|
|
300
|
-
initialComment,
|
|
301
|
-
});
|
|
292
|
+
fileToUpload = Buffer.from(content!, "base64");
|
|
293
|
+
} catch {
|
|
294
|
+
return toolErr("Invalid base64 content.");
|
|
295
|
+
}
|
|
302
296
|
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
}
|
|
297
|
+
if (fileToUpload.length > MAX_FILE_SIZE) {
|
|
298
|
+
const sizeMB = Math.round(fileToUpload.length / 1024 / 1024);
|
|
299
|
+
return toolErr(`File too large: ${sizeMB} MB. Maximum is 1 GB.`);
|
|
300
|
+
}
|
|
306
301
|
|
|
307
|
-
|
|
308
|
-
return
|
|
302
|
+
try {
|
|
303
|
+
return uploadResult(
|
|
304
|
+
await uploadFile(app.client, {
|
|
305
|
+
file: fileToUpload,
|
|
306
|
+
filename: filename!,
|
|
307
|
+
channelId: slackChannelId,
|
|
308
|
+
threadTs: slackThreadTs,
|
|
309
|
+
initialComment,
|
|
310
|
+
}),
|
|
311
|
+
);
|
|
309
312
|
} catch (error) {
|
|
310
313
|
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
311
314
|
return toolErr(`Failed to upload file: ${errorMsg}`);
|
|
@@ -671,7 +671,7 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
671
671
|
|
|
672
672
|
// Handle status change
|
|
673
673
|
if (status === "completed") {
|
|
674
|
-
const result = await completeTask(taskId, output);
|
|
674
|
+
const result = await completeTask(taskId, output, { statusKind: "agent" });
|
|
675
675
|
if (result && uiSpecToStore) await upsertTaskUiSpec(taskId, uiSpecToStore);
|
|
676
676
|
if (result) {
|
|
677
677
|
updatedTask = result;
|
|
@@ -704,7 +704,9 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
704
704
|
}
|
|
705
705
|
}
|
|
706
706
|
} else if (status === "failed") {
|
|
707
|
-
const result = await failTask(taskId, failureReason ?? "Unknown failure"
|
|
707
|
+
const result = await failTask(taskId, failureReason ?? "Unknown failure", {
|
|
708
|
+
statusKind: "agent",
|
|
709
|
+
});
|
|
708
710
|
if (result) {
|
|
709
711
|
updatedTask = result;
|
|
710
712
|
|
|
@@ -735,7 +737,7 @@ export const registerStoreProgressTool = (server: McpServer) => {
|
|
|
735
737
|
}
|
|
736
738
|
}
|
|
737
739
|
} else if (status === "skipped") {
|
|
738
|
-
const result = await skipTask(taskId, skipReason
|
|
740
|
+
const result = await skipTask(taskId, skipReason!, { statusKind: "agent" });
|
|
739
741
|
if (result) {
|
|
740
742
|
updatedTask = result;
|
|
741
743
|
if (existingTask.agentId) {
|
|
@@ -62,7 +62,9 @@ export const registerSetConfigTool = (server: McpServer) => {
|
|
|
62
62
|
envPath: z
|
|
63
63
|
.string()
|
|
64
64
|
.optional()
|
|
65
|
-
.describe(
|
|
65
|
+
.describe(
|
|
66
|
+
"Optional: a path stored with the row as metadata. The server does not write files.",
|
|
67
|
+
),
|
|
66
68
|
description: z
|
|
67
69
|
.string()
|
|
68
70
|
.optional()
|
package/src/tools/swarm-x.ts
CHANGED
|
@@ -34,7 +34,6 @@ export const registerSwarmXTool = (server: McpServer) => {
|
|
|
34
34
|
.record(z.string(), z.string())
|
|
35
35
|
.optional()
|
|
36
36
|
.describe("Optional extra headers. Auth headers are injected by the server."),
|
|
37
|
-
baseUrl: z.string().url().optional().describe("Optional Composio API base URL override."),
|
|
38
37
|
useOrgKey: z
|
|
39
38
|
.boolean()
|
|
40
39
|
.default(false)
|
|
@@ -62,7 +61,6 @@ export const registerSwarmXTool = (server: McpServer) => {
|
|
|
62
61
|
try {
|
|
63
62
|
result = await executeComposioRequest(
|
|
64
63
|
composioArgsFromParts({
|
|
65
|
-
baseUrl: input.baseUrl,
|
|
66
64
|
body: input.body,
|
|
67
65
|
endpoint: input.path,
|
|
68
66
|
headers: input.headers,
|
package/src/tools/utils.ts
CHANGED
|
@@ -284,6 +284,9 @@ const scriptAuthoringNudge = (r: SwarmToolResult): string | undefined =>
|
|
|
284
284
|
|
|
285
285
|
const scriptRunNudge = (r: SwarmToolResult): string | undefined => {
|
|
286
286
|
const body = (r.data as { data?: { error?: unknown } } | undefined)?.data;
|
|
287
|
+
if (!r.ok && body?.error === "object busy") {
|
|
288
|
+
return "object busy: retry the call later, do not loop.";
|
|
289
|
+
}
|
|
287
290
|
// nudgeMiddleware permits exactly one steer: timeout durability is more
|
|
288
291
|
// specific than the generic authoring-contract advice, which stays fallback.
|
|
289
292
|
return !r.ok && body?.error === "timeout" ? SCRIPT_RUN_TIMEOUT_NUDGE : scriptAuthoringNudge(r);
|
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(),
|
|
@@ -956,6 +1033,8 @@ export const AgentTaskSchema = z
|
|
|
956
1033
|
// wake-up task" apart from "done" — see `isDeferredTask` in
|
|
957
1034
|
// src/slack/task-output.ts.
|
|
958
1035
|
deferredAt: z.iso.datetime().optional(),
|
|
1036
|
+
// The wake-up ceiling `defer-task` booked; the wake event can come sooner.
|
|
1037
|
+
deferredUntil: z.iso.datetime().optional(),
|
|
959
1038
|
|
|
960
1039
|
// Context usage aggregates
|
|
961
1040
|
compactionCount: z.number().int().min(0).optional(),
|
|
@@ -1255,6 +1334,12 @@ export const UserSchema = z
|
|
|
1255
1334
|
// user's rows into the target. Such a user cannot authenticate, and
|
|
1256
1335
|
// identity lookups resolve to the target. Absent once the job deletes it.
|
|
1257
1336
|
mergedIntoUserId: z.string().nullable().optional(),
|
|
1337
|
+
// Custom avatar, same shapes as an agent's. Null/missing = initials.
|
|
1338
|
+
// Migration 344 adds the column.
|
|
1339
|
+
avatar: z
|
|
1340
|
+
.lazy(() => UserAvatarSchema)
|
|
1341
|
+
.nullable()
|
|
1342
|
+
.optional(),
|
|
1258
1343
|
createdAt: z.iso.datetime(),
|
|
1259
1344
|
lastUpdatedAt: z.iso.datetime(),
|
|
1260
1345
|
})
|
|
@@ -1435,6 +1520,7 @@ export const FavoriteItemTypeSchema = z.enum([
|
|
|
1435
1520
|
"key",
|
|
1436
1521
|
"session",
|
|
1437
1522
|
"hidden-key",
|
|
1523
|
+
"app",
|
|
1438
1524
|
]);
|
|
1439
1525
|
export type FavoriteItemType = z.infer<typeof FavoriteItemTypeSchema>;
|
|
1440
1526
|
|
|
@@ -1548,6 +1634,10 @@ export type MediaIcon = z.infer<typeof MediaIconSchema>;
|
|
|
1548
1634
|
export const AgentAvatarSchema = MediaIconSchema;
|
|
1549
1635
|
export type AgentAvatar = MediaIcon;
|
|
1550
1636
|
|
|
1637
|
+
// User avatars accept the same shapes as agent avatars.
|
|
1638
|
+
export const UserAvatarSchema = MediaIconSchema;
|
|
1639
|
+
export type UserAvatar = MediaIcon;
|
|
1640
|
+
|
|
1551
1641
|
/**
|
|
1552
1642
|
* Icon shown for an app on the dashboard Apps page: a lucide glyph, an https
|
|
1553
1643
|
* image link, or an image in agent-fs.
|
|
@@ -2020,6 +2110,11 @@ export const ResumeReasonSchema = z.enum([
|
|
|
2020
2110
|
"provider_fallback", // Provider error; the resume runs the next fallback profile
|
|
2021
2111
|
]);
|
|
2022
2112
|
export type ResumeReason = z.infer<typeof ResumeReasonSchema>;
|
|
2113
|
+
// A supersede stores its resume reason as the task's statusKind: a new reason
|
|
2114
|
+
// must also be a `superseded` entry in TASK_STATUS_KINDS (compile error here).
|
|
2115
|
+
const _resumeReasonsAreSupersededKinds: readonly TaskStatusKindFor<"superseded">[] =
|
|
2116
|
+
ResumeReasonSchema.options;
|
|
2117
|
+
void _resumeReasonsAreSupersededKinds;
|
|
2023
2118
|
|
|
2024
2119
|
export const AgentLogSchema = z
|
|
2025
2120
|
.object({
|
|
@@ -2442,7 +2537,7 @@ export const SwarmRepoSchema = z
|
|
|
2442
2537
|
defaultBranch: z.string().default("main"),
|
|
2443
2538
|
autoClone: z.boolean().default(true),
|
|
2444
2539
|
hooks: RepoHooksSchema.describe(
|
|
2445
|
-
"Worker hook installation. Enabled by default: a repo created without `hooks` stores { enabled: true }. Disable with { enabled: false }. A repo with no stored hooks config reads as disabled.",
|
|
2540
|
+
"Worker hook installation. Enabled by default: a repo created without `hooks` stores { enabled: true }, except a repo a non-lead agent session token creates, which stores { enabled: false }. Disable with { enabled: false }. A repo with no stored hooks config reads as disabled.",
|
|
2446
2541
|
),
|
|
2447
2542
|
guidelines: RepoGuidelinesSchema.nullable().optional(),
|
|
2448
2543
|
createdAt: z.string(),
|
|
@@ -3515,6 +3610,7 @@ export type AgentTaskSummary = Pick<
|
|
|
3515
3610
|
| "createdAt"
|
|
3516
3611
|
| "lastUpdatedAt"
|
|
3517
3612
|
| "finishedAt"
|
|
3613
|
+
| "statusKind"
|
|
3518
3614
|
| "peakContextPercent"
|
|
3519
3615
|
| "totalCostUsd"
|
|
3520
3616
|
>;
|
|
@@ -3773,6 +3869,9 @@ export type ScriptRunKind = z.infer<typeof ScriptRunKindSchema>;
|
|
|
3773
3869
|
|
|
3774
3870
|
export const ScriptRunSchema = z
|
|
3775
3871
|
.object({
|
|
3872
|
+
objectScriptId: z.string().optional(),
|
|
3873
|
+
objectId: z.string().optional(),
|
|
3874
|
+
objectMethod: z.string().optional(),
|
|
3776
3875
|
id: z.string().uuid(),
|
|
3777
3876
|
agentId: z.string(),
|
|
3778
3877
|
scriptName: z.string().optional(),
|
|
@@ -4279,7 +4378,7 @@ export type ExtensionInstallBody = z.infer<typeof ExtensionInstallBodySchema>;
|
|
|
4279
4378
|
export type ScriptListItem = Omit<
|
|
4280
4379
|
ScriptRecord,
|
|
4281
4380
|
"source" | "signatureJson" | "argsJsonSchema" | "contentHash"
|
|
4282
|
-
|
|
4381
|
+
> & { kind: "function" | "durable" };
|
|
4283
4382
|
|
|
4284
4383
|
/** Full record served by `GET /api/scripts/{id}` — includes `source` plus parsed `signature`/`argsJsonSchema`. */
|
|
4285
4384
|
export type ScriptDetail = Omit<ScriptRecord, "argsJsonSchema"> & {
|
package/src/utils/constants.ts
CHANGED
|
@@ -78,6 +78,26 @@ export function getMcpBaseUrl(): string {
|
|
|
78
78
|
return (raw || `http://localhost:${process.env.PORT || "3013"}`).replace(/\/+$/, "");
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
+
let apiLoopbackBaseUrl: string | undefined;
|
|
82
|
+
|
|
83
|
+
/** API process only: record this server's loopback URL once it listens. */
|
|
84
|
+
export function setApiLoopbackBaseUrl(url: string): void {
|
|
85
|
+
apiLoopbackBaseUrl = url.replace(/\/+$/, "");
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Base URL that scripts, the script tools and script workflow subprocesses use
|
|
90
|
+
* to call this API. Order: the `SCRIPT_API_BASE_URL` deployment env, then this
|
|
91
|
+
* server's loopback URL once it listens, then {@link getMcpBaseUrl}. Loopback
|
|
92
|
+
* keeps these calls off the public proxy that `MCP_BASE_URL` often names.
|
|
93
|
+
* Never use it for URLs that leave this host.
|
|
94
|
+
*/
|
|
95
|
+
export function getScriptApiBaseUrl(): string {
|
|
96
|
+
const override = process.env.SCRIPT_API_BASE_URL?.trim();
|
|
97
|
+
if (override) return override.replace(/\/+$/, "");
|
|
98
|
+
return apiLoopbackBaseUrl ?? getMcpBaseUrl();
|
|
99
|
+
}
|
|
100
|
+
|
|
81
101
|
/**
|
|
82
102
|
* Public, browser-/externally-reachable origin of the API server — where
|
|
83
103
|
* `/api/mcp-oauth/callback`, OAuth redirect URIs, and registered webhook URLs
|
|
@@ -221,6 +241,18 @@ export function buildAgentFsLiveUrl(opts: AgentFsFileRef): string | null {
|
|
|
221
241
|
return route ? `${live}/file/~/${route}${agentFsFileLinkQuery(live)}` : null;
|
|
222
242
|
}
|
|
223
243
|
|
|
244
|
+
/**
|
|
245
|
+
* A people-facing link to an agent-fs file, on the base from
|
|
246
|
+
* {@link resolveAgentFsLinkBase} (`attachment`): Comb in the dashboard when
|
|
247
|
+
* `APP_URL` is set and Comb is on, else the live app. Null like
|
|
248
|
+
* {@link buildAgentFsLiveUrl}.
|
|
249
|
+
*/
|
|
250
|
+
export function buildAgentFsFileLink(opts: AgentFsFileRef): string | null {
|
|
251
|
+
const route = agentFsFileRoute(opts);
|
|
252
|
+
const base = resolveAgentFsLinkBase("attachment");
|
|
253
|
+
return route ? `${base}/file/~/${route}${agentFsFileLinkQuery(base)}` : null;
|
|
254
|
+
}
|
|
255
|
+
|
|
224
256
|
export interface CombState {
|
|
225
257
|
enabled: boolean;
|
|
226
258
|
/** 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,
|