@desplega.ai/agent-swarm 2.13.0 → 2.13.1
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-xtj40wd8.js +17 -0
- package/dist/{acp-targets-86f0sh6g.js → acp-targets-n7vm5atw.js} +10 -10
- package/dist/{actions-zv8vcxvr.js → actions-hq6wp9xv.js} +27 -27
- package/dist/{agent-fs-provision-jqshb33y.js → agent-fs-provision-y0qc1rdd.js} +4 -4
- package/dist/{amp-adapter-gt503ywc.js → amp-adapter-1qqs6h91.js} +3 -3
- package/dist/{app-6t4k5rh1.js → app-7m4z44rv.js} +10 -10
- package/dist/{approval-notifications-fcfw063h.js → approval-notifications-8sr41gjx.js} +11 -11
- package/dist/{assistant-9dzybh12.js → assistant-hkczwfv6.js} +28 -28
- package/dist/{boot-args-schema-xzfp2feg.js → boot-args-schema-8025snev.js} +1 -1
- package/dist/{boot-reembed-r88wngfg.js → boot-reembed-15m87nr1.js} +1 -1
- package/dist/{boot-reembed-3jz0p2jk.js → boot-reembed-4bbpxjh1.js} +1 -1
- package/dist/{boot-scrub-sweep-scrqhw48.js → boot-scrub-sweep-eajr97e9.js} +2 -2
- package/dist/{boot-seeds-vb2dcrrb.js → boot-seeds-9cwy39jx.js} +4 -4
- package/dist/{boxd-68n75y1s.js → boxd-hr8rsxzq.js} +1 -1
- package/dist/{claude-adapter-h3mp9hgs.js → claude-adapter-g61wa4rt.js} +9 -9
- package/dist/{claude-managed-adapter-kpbyj2vb.js → claude-managed-adapter-znkk0prm.js} +3 -3
- package/dist/{claude-managed-setup-0efr3wkg.js → claude-managed-setup-f1wndkr2.js} +2 -2
- package/dist/{claude-sdk-session-03dw669q.js → claude-sdk-session-687xzf21.js} +20763 -19381
- package/dist/{cli-gfcv679k.js → cli-04103ryh.js} +1 -1
- package/dist/{cli-hbq0kwxz.js → cli-0a336ze7.js} +4 -4
- package/dist/{cli-1v82d2w6.js → cli-0fx95c06.js} +4 -4
- package/dist/{cli-wxwv3t11.js → cli-0m77n7ej.js} +3 -3
- package/dist/{cli-j53hpbsm.js → cli-0xwb7zpt.js} +2 -2
- package/dist/{cli-0dg7ytxm.js → cli-13t0smbk.js} +917 -23
- package/dist/{cli-0pazkmd4.js → cli-1b5axkt1.js} +4 -4
- package/dist/{cli-6h88mn9q.js → cli-1carhg8g.js} +4 -4
- package/dist/{cli-hgsxnjyg.js → cli-1dr5at77.js} +10 -10
- package/dist/{cli-0jkenasr.js → cli-2v4xxnx2.js} +1 -1
- package/dist/{cli-dnh64e8e.js → cli-32xndx6b.js} +6 -6
- package/dist/{cli-hpb9x72z.js → cli-3m8vqehw.js} +9 -9
- package/dist/{cli-ercwc8xn.js → cli-3mf04tkh.js} +1 -1
- package/dist/{cli-7dbhnsj9.js → cli-3zyme1wt.js} +4 -4
- package/dist/{cli-s6zk31gr.js → cli-43dsqhcp.js} +4 -4
- package/dist/{cli-t35hx078.js → cli-4h90xaet.js} +2 -2
- package/dist/{cli-117g15t4.js → cli-4mj5g29m.js} +8 -8
- package/dist/{cli-47hz21se.js → cli-4tbvndmm.js} +4 -5
- package/dist/{cli-tn91wc6e.js → cli-50whymxq.js} +1 -1
- package/dist/{cli-js10kdk7.js → cli-5basv0e7.js} +19 -5
- package/dist/{cli-xfjn2kyq.js → cli-5v6b2am8.js} +5 -5
- package/dist/{cli-49f5jyhh.js → cli-6r1dwegd.js} +3 -3
- package/dist/{cli-kspxjftk.js → cli-7ewre3dm.js} +15 -6
- package/dist/{cli-n3qe7tyr.js → cli-84xtgbn6.js} +35 -2
- package/dist/{cli-w14j2z4k.js → cli-8cmjkbvj.js} +2 -2
- package/dist/{cli-2m6yaq6b.js → cli-8fj8yfmk.js} +1 -1
- package/dist/{cli-9m9kyw77.js → cli-8rbkw18r.js} +2 -2
- package/dist/{cli-x05p2d05.js → cli-9tevdxyf.js} +1 -1
- package/dist/{cli-f1952kjy.js → cli-9xx36trj.js} +4 -4
- package/dist/{cli-hc6e4tac.js → cli-a8ts6x1n.js} +6 -6
- package/dist/{cli-mh7pdxe0.js → cli-aebswqmz.js} +12 -12
- package/dist/{cli-ex1y88j3.js → cli-at67kvnp.js} +1 -1
- package/dist/{cli-b2jh3dyb.js → cli-bjmq14k9.js} +4 -4
- package/dist/{cli-mz34pxbk.js → cli-byxsctca.js} +11 -11
- package/dist/{cli-dka73bak.js → cli-c0tyzt73.js} +152 -12
- package/dist/{cli-wv20kbr3.js → cli-c8kqmzzf.js} +5 -5
- package/dist/{cli-qhhb30e8.js → cli-cd9acnvd.js} +9 -9
- package/dist/{cli-wndegmns.js → cli-cmgdptmx.js} +3 -3
- package/dist/{cli-1dbv9mj9.js → cli-cn6fpa1p.js} +1 -1
- package/dist/{cli-wrhbym01.js → cli-cp0m07wb.js} +6 -6
- package/dist/{cli-3p288654.js → cli-cpkxh68d.js} +2 -2
- package/dist/{cli-g6j6ac3h.js → cli-cqxwjb93.js} +2 -2
- package/dist/{cli-8hp56wat.js → cli-d2epqm0y.js} +1 -1
- package/dist/{cli-qm3ntjqs.js → cli-dd57p1gd.js} +13 -13
- package/dist/{cli-tstj6e8e.js → cli-fn8aj7gb.js} +250 -55
- package/dist/{cli-bpje8n65.js → cli-fp65jdp2.js} +31 -6
- package/dist/{cli-2skf1mdf.js → cli-gedf48yw.js} +4 -4
- package/dist/{cli-c8v2yvej.js → cli-gq6qhmrr.js} +2 -2
- package/dist/{cli-sq913bh1.js → cli-grcc2h2g.js} +8 -8
- package/dist/{cli-qec9bynj.js → cli-h03j6je3.js} +3 -3
- package/dist/{cli-mbwmqb5w.js → cli-h0ewec3d.js} +1 -1
- package/dist/{cli-jj3c5nyb.js → cli-h9bejmkf.js} +76 -39
- package/dist/{cli-ct8sz3np.js → cli-hs3mqswp.js} +6 -6
- package/dist/{cli-tdk7jtka.js → cli-hv3820ez.js} +1 -1
- package/dist/{cli-pqfecppn.js → cli-je587f74.js} +1 -1
- package/dist/{cli-y4a4458j.js → cli-jhtvt7gn.js} +3 -3
- package/dist/{cli-dkejt425.js → cli-mmw2sjaf.js} +7 -7
- package/dist/{cli-50w82h6m.js → cli-mwxez0pz.js} +1 -0
- package/dist/{cli-avxh26pd.js → cli-nk8swfpx.js} +4 -4
- package/dist/{cli-fhvk2nvp.js → cli-p7g7wd9n.js} +9 -9
- package/dist/{cli-bhgrhedp.js → cli-q8aq48v1.js} +1 -1
- package/dist/{cli-6a40p4kv.js → cli-qn79645p.js} +1 -1
- package/dist/{cli-nc6a8b5b.js → cli-qx1dwrr5.js} +2 -2
- package/dist/{cli-sdh61g52.js → cli-s6fhqbz1.js} +2 -2
- package/dist/{cli-eb279wn3.js → cli-sfajkbd7.js} +2 -2
- package/dist/{cli-z64t9pe6.js → cli-snypfjgj.js} +1 -1
- package/dist/{cli-ytc7fpza.js → cli-t25rq8mg.js} +4 -4
- package/dist/{cli-zqmmy073.js → cli-t90k0phh.js} +18 -18
- package/dist/{cli-fz9pcjsw.js → cli-tzzas8rb.js} +4 -4
- package/dist/{cli-rtmqzat7.js → cli-vdfngx2g.js} +2 -2
- package/dist/{cli-9w8712tq.js → cli-vr4eyq6p.js} +43 -14
- package/dist/{cli-z4f346g5.js → cli-vx9acp12.js} +1 -1
- package/dist/{cli-y518qkjg.js → cli-w24f3j49.js} +10 -10
- package/dist/{cli-yn4kt85g.js → cli-w41bvvms.js} +1 -1
- package/dist/{cli-9fsagra4.js → cli-w6c6dj91.js} +1 -1
- package/dist/{cli-kde4ky90.js → cli-x5yb8zc8.js} +2 -2
- package/dist/{cli-48nvk6sb.js → cli-xhkek467.js} +2 -2
- package/dist/{cli-avqkr20b.js → cli-y6qqbpwc.js} +2 -2
- package/dist/{cli-7wy8gbwb.js → cli-ya1cj689.js} +1 -1
- package/dist/{cli-prf7kz78.js → cli-yeh3g1q6.js} +603 -78
- package/dist/{cli-ajjvqhf3.js → cli-z6m6xzxt.js} +2 -2
- package/dist/{cli-2jk4s7z1.js → cli-zaate0rd.js} +3 -3
- package/dist/{cli-n85m2wkq.js → cli-zkbz8m2q.js} +3 -2
- package/dist/{cli-0b655smz.js → cli-zvpkrgsc.js} +5 -5
- package/dist/cli.js +27 -27
- package/dist/{codex-adapter-f3yp0kaj.js → codex-adapter-ysfg6ty3.js} +8 -8
- package/dist/{codex-hook-262cekfp.js → codex-hook-c0nvm30r.js} +2 -2
- package/dist/{codex-login-1ven7yje.js → codex-login-ven5cz5j.js} +1 -1
- package/dist/{codex-session-runner-ns4mv70p.js → codex-session-runner-823scr6g.js} +9 -9
- package/dist/{commands-5bzf2tfw.js → commands-5rbm07fz.js} +3 -3
- package/dist/{controller-5xt7kvfm.js → controller-wn3vd217.js} +3 -3
- package/dist/{controllers-connect-0gg13mzp.js → controllers-connect-34jzhfft.js} +28 -28
- package/dist/core-kdehq26g.js +42 -0
- package/dist/{cursor-adapter-p0c5zv6r.js → cursor-adapter-w1681kp1.js} +2 -2
- package/dist/{db-2s68ycq7.js → db-6bkgbfwk.js} +3 -3
- package/dist/{db-q7q639k5.js → db-hcj16x7z.js} +2 -2
- package/dist/{devin-adapter-t8d86q9x.js → devin-adapter-fs90ab4v.js} +1 -1
- package/dist/{dispatcher-j2y1q7ae.js → dispatcher-jgjqrfzv.js} +25 -25
- package/dist/{docker-1b41eysj.js → docker-1h33jvh9.js} +2 -2
- package/dist/{dsh-adapter-pgnkf4st.js → dsh-adapter-g9yqv09y.js} +2 -2
- package/dist/{e2b-xm60c8ad.js → e2b-jnk0yeva.js} +2 -2
- package/dist/{e2b-ew8c5j5v.js → e2b-y7e5kmzf.js} +2 -2
- package/dist/{easter-egg-3d-0kea97jf.js → easter-egg-3d-w17nsny6.js} +1 -1
- package/dist/{embedding-space-3n6mhhmy.js → embedding-space-v06fwy7b.js} +6 -6
- package/dist/{embeddings-jfmj6yme.js → embeddings-g50dxea4.js} +1 -1
- package/dist/{event-bus-v4ywhc2p.js → event-bus-08t2b4y2.js} +1 -1
- package/dist/{execute-tjrej979.js → execute-1n36haw1.js} +1 -1
- package/dist/{external-channel-jy8w2gg3.js → external-channel-43tv8pg6.js} +2 -2
- package/dist/fx-adapter-bvh05t4a.js +20 -0
- package/dist/grok-adapter-my5j8mdf.js +20 -0
- package/dist/handlers-wyymeeqh.js +41 -0
- package/dist/heartbeat-sf3nk937.js +50 -0
- package/dist/{hook-bpnncsec.js → hook-dqph1e05.js} +8 -8
- package/dist/{hook-fv1jwrv7.js → hook-m1m9dm6w.js} +6 -6
- package/dist/{http-bpa26czn.js → http-w0th1cz9.js} +160 -102
- package/dist/index-22khdtby.js +44 -0
- package/dist/{index-mpj0z9e0.js → index-c0e8en64.js} +1 -1
- package/dist/{index-620y7jzq.js → index-e8pz8qdg.js} +3 -3
- package/dist/{index-8p0j4h4j.js → index-ez823q84.js} +94 -89
- package/dist/{index-w216g9y9.js → index-ffba0z8q.js} +35 -21
- package/dist/{index-s8re7mvq.js → index-gkpfgpg7.js} +1 -1
- package/dist/{index-4k7m5dgj.js → index-k8ajc0g0.js} +143 -103
- package/dist/index-np0582ac.js +40 -0
- package/dist/{index-52tgbhrw.js → index-pb03vans.js} +28 -28
- package/dist/index-vgkrj1jt.js +39 -0
- package/dist/{index-pe3d8jfy.js → index-whysn1wf.js} +1 -1
- package/dist/{index-0h6qd4p1.js → index-y4vd4mhn.js} +3 -4
- package/dist/{k8s-fy8hbhkg.js → k8s-8326q0rq.js} +2 -2
- package/dist/{keepalive-d6z12s04.js → keepalive-2v06q2e8.js} +5 -4
- package/dist/lead-55z813ng.js +79 -0
- package/dist/{maintenance-7kac6g2g.js → maintenance-vx7vjhhy.js} +1 -1
- package/dist/{oauth-refresh-sweep-t1xjetbh.js → oauth-refresh-sweep-g06k4bza.js} +4 -3
- package/dist/{object-webhooks-6rdagg0r.js → object-webhooks-3dzdq4fm.js} +7 -7
- package/dist/{onboard-32y1cfxy.js → onboard-232pazny.js} +4 -4
- package/dist/{opencode-adapter-enp3v31n.js → opencode-adapter-t0paqbh8.js} +8 -8
- package/dist/{otel-impl-k0tm5ptj.js → otel-impl-kmpkyp4y.js} +2 -2
- package/dist/{pending-24zebgvs.js → pending-x0z3vx1x.js} +26 -26
- package/dist/{pi-mono-adapter-yj72xxxe.js → pi-mono-adapter-7pmypn6d.js} +17 -15
- package/dist/{pricing-refresh-cf25x38j.js → pricing-refresh-ytjmtyd7.js} +2 -2
- package/dist/{rbac-roles-0wydd22m.js → rbac-roles-fgm5mxr2.js} +3 -3
- package/dist/{rbac-roles-at6crb3r.js → rbac-roles-xyaxekh3.js} +2 -2
- package/dist/{render-v2-nvcw0jd7.js → render-v2-ws972g4r.js} +10 -10
- package/dist/{resume-y4w0k5v3.js → resume-m6mjzhkp.js} +13 -13
- package/dist/{runtime-vpe43hx0.js → runtime-zzpc0c8a.js} +1 -1
- package/dist/{session-access-gkyvnfye.js → session-access-vp35xs91.js} +5 -5
- package/dist/{session-source-backfill-3w2st4m2.js → session-source-backfill-p73e8zbe.js} +2 -2
- package/dist/{setup-axxvqtys.js → setup-r4kd7rxg.js} +1 -1
- package/dist/thread-buffer-cm2nzq6t.js +42 -0
- package/dist/{tree-visibility-y4fqvab5.js → tree-visibility-07h2tbs2.js} +2 -2
- package/dist/{user-merge-jobs-kcmwvrc6.js → user-merge-jobs-96vg9rpe.js} +3 -3
- package/dist/{virtual-modules-7d92dct1.js → virtual-modules-vgn3f2x4.js} +3 -3
- package/dist/{work-objects-f708e069.js → work-objects-74hbcx3e.js} +28 -28
- package/dist/worker-5pn2vzx6.js +79 -0
- package/dist/{worker-follow-up-0by8wztc.js → worker-follow-up-ezavwn5d.js} +25 -25
- package/dist/{x-3dtaf2r9.js → x-asbrnafg.js} +2 -2
- package/openapi.json +1793 -1622
- package/package.json +10 -10
- package/src/apps/catalog.generated.json +726 -0
- package/src/apps/definition.ts +24 -7
- package/src/apps/page-validator.ts +225 -3
- package/src/be/db.ts +38 -10
- package/src/be/mcp-proxy.ts +5 -4
- package/src/be/migrations/340_api_key_spend_cap.sql +5 -0
- package/src/be/schedules/validate.ts +26 -0
- package/src/be/swarm-config-guard.ts +4 -0
- package/src/commands/credential-outcome-report.ts +5 -2
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/provider-credentials.ts +19 -0
- package/src/commands/provider-error-class.ts +4 -1
- package/src/commands/rate-limit-outcome.ts +48 -3
- package/src/commands/runner.ts +113 -55
- package/src/commands/worktree-reaper.ts +600 -0
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/http/agents.ts +4 -0
- package/src/http/api-keys.ts +27 -3
- package/src/http/pages-public.ts +40 -4
- package/src/http/pool-keys.ts +21 -2
- package/src/http/schedules.ts +28 -3
- package/src/http/script-connections.ts +12 -4
- package/src/http/script-runs.ts +12 -3
- package/src/http/tasks.ts +6 -10
- package/src/mcp-client/http-client.ts +3 -1
- package/src/oauth/identity-capture.ts +6 -1
- package/src/oauth/mcp-wrapper.ts +10 -3
- package/src/oauth/wrapper.ts +15 -3
- 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/dsh-adapter.ts +1 -1
- package/src/providers/pi-mono-adapter.ts +4 -2
- package/src/providers/runtime-dependencies.ts +1 -1
- package/src/rbac/legacy-policy.ts +2 -0
- package/src/rbac/permissions.ts +5 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +7 -7
- package/src/slack/enrich.ts +14 -11
- package/src/tests/agents-list-model-display.test.ts +23 -0
- package/src/tests/apps-spike2.test.ts +35 -0
- package/src/tests/base-prompt.test.ts +1 -0
- package/src/tests/deploy-guard.test.ts +24 -0
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/ensure-token.test.ts +2 -2
- package/src/tests/entrypoint-repo-autoclone-args.test.ts +202 -0
- package/src/tests/fake-dns.ts +47 -0
- package/src/tests/fixtures/base-prompt-baseline.json +12 -12
- package/src/tests/latest-model-report.test.ts +138 -0
- package/src/tests/mcp-oauth-dcr-reuse.test.ts +5 -2
- package/src/tests/mcp-oauth-ensure-token.test.ts +3 -2
- package/src/tests/mcp-oauth-manual-client.test.ts +6 -1
- package/src/tests/mcp-oauth-wrapper.test.ts +20 -4
- package/src/tests/mcp-outbound-fetch-guard.test.ts +169 -0
- package/src/tests/mcp-server-ssrf.test.ts +2 -0
- package/src/tests/memory-search-stall.test.ts +5 -0
- package/src/tests/oauth-connection-fetch-guard.test.ts +162 -0
- package/src/tests/oauth-token-endpoint-fetch-guard.test.ts +121 -0
- package/src/tests/oauth-wrapper.test.ts +1 -2
- package/src/tests/pages-head-v2.test.ts +2 -1
- package/src/tests/script-connections-http.test.ts +8 -3
- package/src/tests/script-connections.test.ts +2 -0
- package/src/tests/slack-thread-participants.test.ts +14 -3
- package/src/tests/spend-cap-credentials.test.ts +34 -0
- package/src/tests/spend-cap-outcome.test.ts +67 -0
- package/src/tests/subscription-first.test.ts +119 -0
- package/src/tests/worktree-reaper.test.ts +424 -0
- package/src/tools/get-task-details.ts +247 -5
- package/src/tools/schedules/patch-schedule.ts +26 -1
- package/src/tools/schedules/update-schedule.ts +28 -2
- package/src/utils/credentials.ts +36 -1
- package/src/utils/egress-guard.ts +40 -10
- package/src/utils/error-tracker.ts +17 -0
- package/templates/skills/apps/SKILL.md +191 -2
- package/templates/skills/apps/content.md +191 -2
- package/templates/skills/boards-and-sheets/content.md +11 -0
- package/templates/skills/pages/content.md +11 -0
- package/templates/skills/swarm-docs/content.md +2 -0
- package/templates/skills/swarm-scripts/SKILL.md +1 -0
- package/templates/skills/swarm-scripts/content.md +1 -0
- package/templates/workflows/ralph-loop/content.md +6 -6
- package/dist/acp-adapter-cn53011z.js +0 -17
- package/dist/cli-pr0eze3x.js +0 -149
- package/dist/core-0fqtbrxa.js +0 -42
- package/dist/fx-adapter-k6w3jvz9.js +0 -20
- package/dist/grok-adapter-4q5tssw0.js +0 -20
- package/dist/handlers-qxgfvvsf.js +0 -41
- package/dist/heartbeat-6tr2w2da.js +0 -50
- package/dist/index-0mcxjdsa.js +0 -44
- package/dist/index-dz4q23ag.js +0 -40
- package/dist/index-s175jckx.js +0 -39
- package/dist/lead-p3hx7h35.js +0 -79
- package/dist/thread-buffer-rwa7d4dx.js +0 -42
- package/dist/worker-8rg9gz74.js +0 -79
|
@@ -14,11 +14,24 @@ import {
|
|
|
14
14
|
toolErr,
|
|
15
15
|
toolOk,
|
|
16
16
|
} from "@/tools/utils";
|
|
17
|
-
import { AgentTaskStatusSchema } from "@/types";
|
|
17
|
+
import { type AgentTask, AgentTaskStatusSchema } from "@/types";
|
|
18
18
|
import { getUserCommsPrefs } from "@/utils/requester-comms";
|
|
19
19
|
|
|
20
|
+
/**
|
|
21
|
+
* Reductions the size fit may apply, each one opted out of by its `include` value:
|
|
22
|
+
* `logs` returns every log row verbatim, `text` returns every text field uncut.
|
|
23
|
+
*/
|
|
24
|
+
export const GET_TASK_DETAILS_INCLUDE = ["logs", "text"] as const;
|
|
25
|
+
type GetTaskDetailsInclude = (typeof GET_TASK_DETAILS_INCLUDE)[number];
|
|
26
|
+
|
|
20
27
|
export const getTaskDetailsInputSchema = z.object({
|
|
21
28
|
taskId: z.uuid().describe("The ID of the task to get details for."),
|
|
29
|
+
include: z
|
|
30
|
+
.array(z.enum(GET_TASK_DETAILS_INCLUDE))
|
|
31
|
+
.optional()
|
|
32
|
+
.describe(
|
|
33
|
+
'Opt out of the size fit. A response that fits the budget is never reduced. One that does not is reduced only as far as needed, and `fitted` lists what changed. "logs": every log row verbatim. "text": every text field (task, output, progress, failureReason, requester notes, log values) uncut. A result over the wire limit still spills to KV.',
|
|
34
|
+
),
|
|
22
35
|
});
|
|
23
36
|
|
|
24
37
|
// Loosened, output-only mirror of FollowUpConfigSchema / RoutingAffinitySchema
|
|
@@ -183,13 +196,231 @@ export const getTaskDetailsOutputSchema = swarmToolOutputSchema({
|
|
|
183
196
|
.describe(
|
|
184
197
|
"Pointer-based artifacts attached to this task via store-progress, ordered by created_at.",
|
|
185
198
|
),
|
|
199
|
+
fitted: z
|
|
200
|
+
.looseObject({
|
|
201
|
+
budgetBytes: z.number().optional(),
|
|
202
|
+
logs: z
|
|
203
|
+
.looseObject({
|
|
204
|
+
compacted: z.string().optional(),
|
|
205
|
+
omitted: z.number().optional(),
|
|
206
|
+
omittedByEventType: z.record(z.string(), z.number()).optional(),
|
|
207
|
+
})
|
|
208
|
+
.optional(),
|
|
209
|
+
text: z
|
|
210
|
+
.array(
|
|
211
|
+
z.looseObject({
|
|
212
|
+
field: z.string().optional(),
|
|
213
|
+
originalChars: z.number().optional(),
|
|
214
|
+
keptChars: z.number().optional(),
|
|
215
|
+
}),
|
|
216
|
+
)
|
|
217
|
+
.optional(),
|
|
218
|
+
include: z.array(z.string()).optional(),
|
|
219
|
+
})
|
|
220
|
+
.optional()
|
|
221
|
+
.describe(
|
|
222
|
+
"Present only when the full response passed the size budget: what was reduced to fit, and the include values that return it.",
|
|
223
|
+
),
|
|
186
224
|
});
|
|
187
225
|
|
|
188
226
|
type GetTaskDetailsArgs = z.infer<typeof getTaskDetailsInputSchema>;
|
|
189
227
|
|
|
228
|
+
/**
|
|
229
|
+
* Payload budget for the agent-facing response, in UTF-8 bytes of the JSON data. The text
|
|
230
|
+
* channel renders that JSON once after the message, and the structured channel carries it once
|
|
231
|
+
* (ctx-control drops the duplicate `details` there before it spills), so a payload under this
|
|
232
|
+
* budget stays under MCP_RESULT_WIRE_LIMIT_BYTES with room for the message and envelope keys.
|
|
233
|
+
*/
|
|
234
|
+
const FIT_BUDGET_BYTES = 9_000;
|
|
235
|
+
/** Log events the fit never drops: they carry the task's lifecycle. */
|
|
236
|
+
const LIFECYCLE_EVENTS: ReadonlySet<string> = new Set(["task_created", "task_status_change"]);
|
|
237
|
+
/** A shortened text field keeps at least this many leading characters. */
|
|
238
|
+
const MIN_TEXT_CHARS = 280;
|
|
239
|
+
/** Task text fields the fit may shorten, after the log reductions. */
|
|
240
|
+
const TASK_TEXT_FIELDS = ["task", "output", "progress", "failureReason"] as const;
|
|
241
|
+
|
|
242
|
+
type LogView = Record<string, unknown> & { eventType: string };
|
|
243
|
+
type FitNotice = {
|
|
244
|
+
budgetBytes: number;
|
|
245
|
+
logs?: { compacted: string; omitted?: number; omittedByEventType?: Record<string, number> };
|
|
246
|
+
text?: Array<{ field: string; originalChars: number; keptChars: number }>;
|
|
247
|
+
include?: GetTaskDetailsInclude[];
|
|
248
|
+
};
|
|
249
|
+
type DetailsData = {
|
|
250
|
+
yourAgentId: string | undefined;
|
|
251
|
+
task: AgentTask;
|
|
252
|
+
requestedBy: Record<string, unknown> | undefined;
|
|
253
|
+
logs: LogView[];
|
|
254
|
+
attachments: unknown[];
|
|
255
|
+
fitted?: FitNotice;
|
|
256
|
+
};
|
|
257
|
+
|
|
258
|
+
const jsonBytes = (value: unknown) => Buffer.byteLength(JSON.stringify(value), "utf8");
|
|
259
|
+
|
|
260
|
+
/** The first `chars` characters of `value`, never ending on a lone high surrogate. */
|
|
261
|
+
function head(value: string, chars: number): string {
|
|
262
|
+
const code = value.charCodeAt(chars - 1);
|
|
263
|
+
return value.slice(0, code >= 0xd800 && code <= 0xdbff ? chars - 1 : chars);
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
/**
|
|
267
|
+
* Fit the response under FIT_BUDGET_BYTES with the least loss. A response that already fits is
|
|
268
|
+
* returned unchanged. Otherwise the steps run in order and stop as soon as it fits:
|
|
269
|
+
* 1. log rows drop fields that repeat the task (lossless);
|
|
270
|
+
* 2. the oldest non-lifecycle log rows go, keeping lifecycle events and the newest progress;
|
|
271
|
+
* 3. the longest text field is shortened, repeatedly, never below MIN_TEXT_CHARS.
|
|
272
|
+
* `include` skips steps 1-2 ("logs") or step 3 ("text"). Ids, status, parentTaskId and
|
|
273
|
+
* attachments are never touched, and `fitted` records every reduction.
|
|
274
|
+
*/
|
|
275
|
+
function fitToBudget(full: DetailsData, include: ReadonlySet<GetTaskDetailsInclude>): DetailsData {
|
|
276
|
+
if (jsonBytes(full) <= FIT_BUDGET_BYTES) return full;
|
|
277
|
+
|
|
278
|
+
const fitted: FitNotice = { budgetBytes: FIT_BUDGET_BYTES };
|
|
279
|
+
const reduced: GetTaskDetailsInclude[] = [];
|
|
280
|
+
let task: AgentTask = full.task;
|
|
281
|
+
let requestedBy = full.requestedBy;
|
|
282
|
+
let logs = full.logs;
|
|
283
|
+
const view = (): DetailsData => ({
|
|
284
|
+
...full,
|
|
285
|
+
task,
|
|
286
|
+
requestedBy,
|
|
287
|
+
logs,
|
|
288
|
+
fitted: { ...fitted, include: reduced },
|
|
289
|
+
});
|
|
290
|
+
const fits = () => jsonBytes(view()) <= FIT_BUDGET_BYTES;
|
|
291
|
+
|
|
292
|
+
if (!include.has("logs")) {
|
|
293
|
+
reduced.push("logs");
|
|
294
|
+
const taskAgentId = full.task.agentId;
|
|
295
|
+
const compact: LogView[] = full.logs.map(({ taskId: _sameTask, agentId, ...rest }) =>
|
|
296
|
+
agentId && agentId !== taskAgentId ? { ...rest, agentId } : rest,
|
|
297
|
+
);
|
|
298
|
+
logs = compact;
|
|
299
|
+
fitted.logs = {
|
|
300
|
+
compacted:
|
|
301
|
+
"Log rows omit taskId (always this task) and agentId where it equals task.agentId.",
|
|
302
|
+
};
|
|
303
|
+
|
|
304
|
+
if (!fits()) {
|
|
305
|
+
let newestProgress = -1;
|
|
306
|
+
compact.forEach((log, i) => {
|
|
307
|
+
if (log.eventType === "task_progress") newestProgress = i;
|
|
308
|
+
});
|
|
309
|
+
// Oldest first, so the newest context survives.
|
|
310
|
+
const droppable = compact
|
|
311
|
+
.map((_log, i) => i)
|
|
312
|
+
.filter((i) => i !== newestProgress && !LIFECYCLE_EVENTS.has(compact[i]?.eventType ?? ""));
|
|
313
|
+
const { compacted } = fitted.logs;
|
|
314
|
+
// Sets the notice with the rows, so every size check measures the omitted counts too.
|
|
315
|
+
const without = (count: number) => {
|
|
316
|
+
const drop = new Set(droppable.slice(0, count));
|
|
317
|
+
const byEventType: Record<string, number> = {};
|
|
318
|
+
for (const i of drop) {
|
|
319
|
+
const type = compact[i]?.eventType ?? "unknown";
|
|
320
|
+
byEventType[type] = (byEventType[type] ?? 0) + 1;
|
|
321
|
+
}
|
|
322
|
+
fitted.logs =
|
|
323
|
+
count > 0
|
|
324
|
+
? { compacted, omitted: count, omittedByEventType: byEventType }
|
|
325
|
+
: { compacted };
|
|
326
|
+
return compact.filter((_, i) => !drop.has(i));
|
|
327
|
+
};
|
|
328
|
+
let low = 1;
|
|
329
|
+
let high = droppable.length;
|
|
330
|
+
while (low < high) {
|
|
331
|
+
const mid = Math.floor((low + high) / 2);
|
|
332
|
+
logs = without(mid);
|
|
333
|
+
if (fits()) high = mid;
|
|
334
|
+
else low = mid + 1;
|
|
335
|
+
}
|
|
336
|
+
const dropped = Math.min(low, droppable.length);
|
|
337
|
+
logs = without(dropped);
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
if (!fits() && !include.has("text")) {
|
|
342
|
+
reduced.push("text");
|
|
343
|
+
fitted.text = [];
|
|
344
|
+
task = { ...task };
|
|
345
|
+
if (requestedBy) {
|
|
346
|
+
const comms = requestedBy.comms;
|
|
347
|
+
requestedBy = {
|
|
348
|
+
...requestedBy,
|
|
349
|
+
...(comms && typeof comms === "object" ? { comms: { ...comms } } : {}),
|
|
350
|
+
};
|
|
351
|
+
}
|
|
352
|
+
const shortenLogs = !include.has("logs");
|
|
353
|
+
if (shortenLogs) logs = logs.map((log) => ({ ...log }));
|
|
354
|
+
|
|
355
|
+
type Slot = { field: string; value: string; set: (next: string) => void };
|
|
356
|
+
const slots = (): Slot[] => {
|
|
357
|
+
const out: Slot[] = [];
|
|
358
|
+
const mutableTask = task as Record<string, unknown>;
|
|
359
|
+
for (const key of TASK_TEXT_FIELDS) {
|
|
360
|
+
const value = mutableTask[key];
|
|
361
|
+
if (typeof value === "string") {
|
|
362
|
+
out.push({ field: `task.${key}`, value, set: (next) => (mutableTask[key] = next) });
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
// Requester notes and comms preferences (tone, verbosity, ...) are free text too.
|
|
366
|
+
const owner = requestedBy;
|
|
367
|
+
const comms = owner?.comms as Record<string, unknown> | undefined;
|
|
368
|
+
for (const [prefix, record] of [
|
|
369
|
+
["requestedBy", owner],
|
|
370
|
+
["requestedBy.comms", comms],
|
|
371
|
+
] as const) {
|
|
372
|
+
if (!record) continue;
|
|
373
|
+
for (const [key, value] of Object.entries(record)) {
|
|
374
|
+
if (typeof value === "string" && key !== "name" && key !== "email" && key !== "role") {
|
|
375
|
+
out.push({ field: `${prefix}.${key}`, value, set: (next) => (record[key] = next) });
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
if (shortenLogs) {
|
|
380
|
+
logs.forEach((log, i) => {
|
|
381
|
+
for (const key of ["newValue", "oldValue", "metadata"]) {
|
|
382
|
+
const value = log[key];
|
|
383
|
+
if (typeof value === "string") {
|
|
384
|
+
out.push({ field: `logs[${i}].${key}`, value, set: (next) => (log[key] = next) });
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
});
|
|
388
|
+
}
|
|
389
|
+
return out;
|
|
390
|
+
};
|
|
391
|
+
|
|
392
|
+
const original = new Map<string, number>();
|
|
393
|
+
for (let round = 0; round < 40 && !fits(); round++) {
|
|
394
|
+
const over = jsonBytes(view()) - FIT_BUDGET_BYTES;
|
|
395
|
+
const longest = slots().reduce<Slot | undefined>(
|
|
396
|
+
(best, slot) => (!best || slot.value.length > best.value.length ? slot : best),
|
|
397
|
+
undefined,
|
|
398
|
+
);
|
|
399
|
+
if (!longest || longest.value.length <= MIN_TEXT_CHARS + 120) break;
|
|
400
|
+
const first = original.get(longest.field) ?? longest.value.length;
|
|
401
|
+
original.set(longest.field, first);
|
|
402
|
+
// The previous marker is cut away with the tail; 120 chars of slack cover the new one.
|
|
403
|
+
const keep = Math.max(MIN_TEXT_CHARS, longest.value.length - over - 120);
|
|
404
|
+
longest.set(
|
|
405
|
+
`${head(longest.value, keep)}… [cut, ${first} chars in full; include "text" for all]`,
|
|
406
|
+
);
|
|
407
|
+
const existing = fitted.text.find((entry) => entry.field === longest.field);
|
|
408
|
+
if (existing) existing.keptChars = keep;
|
|
409
|
+
else fitted.text.push({ field: longest.field, originalChars: first, keptChars: keep });
|
|
410
|
+
}
|
|
411
|
+
// Nothing was long enough to cut: report no text reduction.
|
|
412
|
+
if (fitted.text.length === 0) {
|
|
413
|
+
delete fitted.text;
|
|
414
|
+
reduced.pop();
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
return view();
|
|
419
|
+
}
|
|
420
|
+
|
|
190
421
|
export async function getTaskDetailsHandler(
|
|
191
422
|
ctx: ToolCtx,
|
|
192
|
-
{ taskId }: GetTaskDetailsArgs,
|
|
423
|
+
{ taskId, include }: GetTaskDetailsArgs,
|
|
193
424
|
): Promise<SwarmToolResult> {
|
|
194
425
|
const task = await getTaskById(taskId);
|
|
195
426
|
const agentId = ctx.kind === "owner" ? ctx.agentId : undefined;
|
|
@@ -218,7 +449,7 @@ export async function getTaskDetailsHandler(
|
|
|
218
449
|
}
|
|
219
450
|
: undefined;
|
|
220
451
|
|
|
221
|
-
const
|
|
452
|
+
const full: DetailsData = {
|
|
222
453
|
yourAgentId: agentId,
|
|
223
454
|
task,
|
|
224
455
|
requestedBy,
|
|
@@ -226,7 +457,18 @@ export async function getTaskDetailsHandler(
|
|
|
226
457
|
attachments,
|
|
227
458
|
};
|
|
228
459
|
|
|
229
|
-
|
|
460
|
+
// Script and extension calls never reach a model context, so they keep the full shape.
|
|
461
|
+
const origin = ctx.kind === "owner" ? ctx.requestInfo?.callOrigin : undefined;
|
|
462
|
+
const data =
|
|
463
|
+
origin === "script-sdk" || origin === "extension"
|
|
464
|
+
? full
|
|
465
|
+
: fitToBudget(full, new Set(include ?? []));
|
|
466
|
+
const reducedParts = data.fitted?.include ?? [];
|
|
467
|
+
const fitNote = reducedParts.length
|
|
468
|
+
? ` Fitted to the size budget; include ${JSON.stringify(reducedParts)} for the rest.`
|
|
469
|
+
: "";
|
|
470
|
+
|
|
471
|
+
return toolOk(`Task "${taskId}" (${task.status}) details retrieved.${fitNote}`, {
|
|
230
472
|
details: JSON.stringify(data),
|
|
231
473
|
data,
|
|
232
474
|
});
|
|
@@ -238,7 +480,7 @@ export const registerGetTaskDetailsTool = (server: McpServer) => {
|
|
|
238
480
|
{
|
|
239
481
|
title: "Get task details",
|
|
240
482
|
description:
|
|
241
|
-
|
|
483
|
+
'Returns detailed information about a specific task, including output, failure reason, attachments and log history. A response over the size budget is fitted with the least loss: log rows drop fields that repeat the task, then the oldest non-lifecycle rows, then the longest text is cut. `fitted` lists each reduction; include ["logs", "text"] returns the rest.',
|
|
242
484
|
annotations: { readOnlyHint: true },
|
|
243
485
|
inputSchema: getTaskDetailsInputSchema,
|
|
244
486
|
outputSchema: getTaskDetailsOutputSchema,
|
|
@@ -14,7 +14,11 @@ import {
|
|
|
14
14
|
} from "@/be/db";
|
|
15
15
|
import { modelProfileRefError, scheduleProfileUpdate } from "@/be/db/model-profiles";
|
|
16
16
|
import { explicitModelErrorForAgent } from "@/be/model-validation";
|
|
17
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
changesScheduleTarget,
|
|
19
|
+
mergeScheduleTiming,
|
|
20
|
+
validateRecurringTiming,
|
|
21
|
+
} from "@/be/schedules/validate";
|
|
18
22
|
import { getScript } from "@/be/scripts/db";
|
|
19
23
|
import { can } from "@/rbac";
|
|
20
24
|
import { calculateNextRun } from "@/scheduler";
|
|
@@ -214,6 +218,27 @@ export const registerPatchScheduleTool = (server: McpServer) => {
|
|
|
214
218
|
);
|
|
215
219
|
}
|
|
216
220
|
|
|
221
|
+
// A schedule fires as its creator. Only the creator or a lead picks what it runs.
|
|
222
|
+
if (
|
|
223
|
+
changesScheduleTarget(schedule, {
|
|
224
|
+
targetType,
|
|
225
|
+
taskTemplate,
|
|
226
|
+
workflowId,
|
|
227
|
+
scriptName,
|
|
228
|
+
scriptArgs,
|
|
229
|
+
}) &&
|
|
230
|
+
!can({
|
|
231
|
+
principal: { kind: "agent", agentId: caller.id, isLead: caller.isLead },
|
|
232
|
+
verb: "schedule.target.update.any",
|
|
233
|
+
resource: { kind: "owned", ownerAgentId: schedule.createdByAgentId },
|
|
234
|
+
source: "mcp",
|
|
235
|
+
}).allow
|
|
236
|
+
) {
|
|
237
|
+
return toolErr(
|
|
238
|
+
`Schedule "${schedule.name}" runs as the agent that created it. Only that agent or a lead can change its targetType, taskTemplate, workflowId, scriptName or scriptArgs.`,
|
|
239
|
+
);
|
|
240
|
+
}
|
|
241
|
+
|
|
217
242
|
// Reject updates on completed one-time schedules
|
|
218
243
|
if (schedule.scheduleType === "one_time" && !schedule.enabled && schedule.lastRunAt) {
|
|
219
244
|
return toolErr(
|
|
@@ -14,7 +14,11 @@ import {
|
|
|
14
14
|
} from "@/be/db";
|
|
15
15
|
import { modelProfileRefError, scheduleProfileUpdate } from "@/be/db/model-profiles";
|
|
16
16
|
import { explicitModelErrorForAgent } from "@/be/model-validation";
|
|
17
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
changesScheduleTarget,
|
|
19
|
+
mergeScheduleTiming,
|
|
20
|
+
validateRecurringTiming,
|
|
21
|
+
} from "@/be/schedules/validate";
|
|
18
22
|
import { getScript } from "@/be/scripts/db";
|
|
19
23
|
import { can } from "@/rbac";
|
|
20
24
|
import { calculateNextRun } from "@/scheduler";
|
|
@@ -140,7 +144,8 @@ export const registerUpdateScheduleTool = (server: McpServer) => {
|
|
|
140
144
|
{
|
|
141
145
|
title: "Update Scheduled Task",
|
|
142
146
|
annotations: { idempotentHint: true },
|
|
143
|
-
description:
|
|
147
|
+
description:
|
|
148
|
+
"Update an existing scheduled task. Any registered agent can update schedules; only the creator or a lead can change what one runs (targetType, taskTemplate, workflowId, scriptName, scriptArgs).",
|
|
144
149
|
inputSchema: updateScheduleInputSchema,
|
|
145
150
|
outputSchema: swarmToolOutputSchema({
|
|
146
151
|
yourAgentId: z.string().optional(),
|
|
@@ -213,6 +218,27 @@ export const registerUpdateScheduleTool = (server: McpServer) => {
|
|
|
213
218
|
);
|
|
214
219
|
}
|
|
215
220
|
|
|
221
|
+
// A schedule fires as its creator. Only the creator or a lead picks what it runs.
|
|
222
|
+
if (
|
|
223
|
+
changesScheduleTarget(schedule, {
|
|
224
|
+
targetType,
|
|
225
|
+
taskTemplate,
|
|
226
|
+
workflowId,
|
|
227
|
+
scriptName,
|
|
228
|
+
scriptArgs,
|
|
229
|
+
}) &&
|
|
230
|
+
!can({
|
|
231
|
+
principal: { kind: "agent", agentId: caller.id, isLead: caller.isLead },
|
|
232
|
+
verb: "schedule.target.update.any",
|
|
233
|
+
resource: { kind: "owned", ownerAgentId: schedule.createdByAgentId },
|
|
234
|
+
source: "mcp",
|
|
235
|
+
}).allow
|
|
236
|
+
) {
|
|
237
|
+
return toolErr(
|
|
238
|
+
`Schedule "${schedule.name}" runs as the agent that created it. Only that agent or a lead can change its targetType, taskTemplate, workflowId, scriptName or scriptArgs.`,
|
|
239
|
+
);
|
|
240
|
+
}
|
|
241
|
+
|
|
216
242
|
// Reject updates on completed one-time schedules
|
|
217
243
|
if (schedule.scheduleType === "one_time" && !schedule.enabled && schedule.lastRunAt) {
|
|
218
244
|
return toolErr(
|
package/src/utils/credentials.ts
CHANGED
|
@@ -233,6 +233,24 @@ export class ModelWindowExhaustedError extends Error {
|
|
|
233
233
|
}
|
|
234
234
|
}
|
|
235
235
|
|
|
236
|
+
/**
|
|
237
|
+
* Thrown by `resolveCredentialPools` at task admission when every key of a
|
|
238
|
+
* pool the task may use hit its provider spend cap (OpenRouter key limit, out
|
|
239
|
+
* of credits). No retry helps before the cap resets, so the caller fails the
|
|
240
|
+
* task instead of spawning the CLI, the same as `ModelWindowExhaustedError`.
|
|
241
|
+
*/
|
|
242
|
+
export class KeySpendCapError extends Error {
|
|
243
|
+
readonly keyType: string;
|
|
244
|
+
|
|
245
|
+
constructor(keyType: string) {
|
|
246
|
+
super(
|
|
247
|
+
`Every ${keyType} key this task may use hit its provider spend cap. Raise or remove the key's spend limit with the provider, or add another key, then retry.`,
|
|
248
|
+
);
|
|
249
|
+
this.name = "KeySpendCapError";
|
|
250
|
+
this.keyType = keyType;
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
|
|
236
254
|
/**
|
|
237
255
|
* Thrown by `resolveCredentialPools` when a model profile's credential
|
|
238
256
|
* allowlist names no key of a pool the worker holds. The caller must not
|
|
@@ -438,6 +456,8 @@ export interface AvailabilityInfo {
|
|
|
438
456
|
earliestModelResetAt?: string | null;
|
|
439
457
|
/** Indices excluded because the key's subscription plan cannot run the model. */
|
|
440
458
|
seatBlockedIndices?: number[];
|
|
459
|
+
/** Rate-limited indices whose limit is a provider spend cap. */
|
|
460
|
+
spendCappedIndices?: number[];
|
|
441
461
|
}
|
|
442
462
|
|
|
443
463
|
/**
|
|
@@ -475,6 +495,7 @@ async function fetchAvailableIndices(
|
|
|
475
495
|
modelBlockedIndices?: number[];
|
|
476
496
|
earliestModelResetAt?: string | null;
|
|
477
497
|
seatBlockedIndices?: number[];
|
|
498
|
+
spendCappedIndices?: number[];
|
|
478
499
|
};
|
|
479
500
|
availableIndicesMap[envVar] = {
|
|
480
501
|
availableIndices: data.availableIndices,
|
|
@@ -482,6 +503,7 @@ async function fetchAvailableIndices(
|
|
|
482
503
|
modelBlockedIndices: data.modelBlockedIndices,
|
|
483
504
|
earliestModelResetAt: data.earliestModelResetAt,
|
|
484
505
|
seatBlockedIndices: data.seatBlockedIndices,
|
|
506
|
+
spendCappedIndices: data.spendCappedIndices,
|
|
485
507
|
};
|
|
486
508
|
if (data.availableIndices.length < totalKeys) {
|
|
487
509
|
console.log(
|
|
@@ -614,6 +636,17 @@ export async function resolveCredentialPools(
|
|
|
614
636
|
modelBlockedCount += beforeCount - available.length;
|
|
615
637
|
}
|
|
616
638
|
|
|
639
|
+
// A spend-capped key fails every pick until its cap resets: the best-effort
|
|
640
|
+
// pick skips it, and a pool with only capped keys fails the task now.
|
|
641
|
+
const spendCapped = (info?.spendCappedIndices ?? []).filter(inAllowlist);
|
|
642
|
+
const uncapped =
|
|
643
|
+
available?.length === 0 && spendCapped.length > 0
|
|
644
|
+
? pool.filter((i) => inAllowlist(i) && !spendCapped.includes(i))
|
|
645
|
+
: undefined;
|
|
646
|
+
if (opts?.enforceModelCapacity && uncapped?.length === 0) {
|
|
647
|
+
throw new KeySpendCapError(envVar);
|
|
648
|
+
}
|
|
649
|
+
|
|
617
650
|
const seatBlockedIndices = info?.seatBlockedIndices ?? [];
|
|
618
651
|
const seatBlockedCount = seatBlockedIndices.filter(inAllowlist).length;
|
|
619
652
|
let seatFallbackIndices: number[] | undefined;
|
|
@@ -653,7 +686,9 @@ export async function resolveCredentialPools(
|
|
|
653
686
|
...selectCredential(val, seatFallbackIndices, envVar, allowedIdx),
|
|
654
687
|
isRateLimitFallback: true,
|
|
655
688
|
}
|
|
656
|
-
:
|
|
689
|
+
: uncapped?.length
|
|
690
|
+
? { ...selectCredential(val, uncapped, envVar, allowedIdx), isRateLimitFallback: true }
|
|
691
|
+
: selectCredential(val, available, envVar, allowedIdx);
|
|
657
692
|
env[envVar] = result.selected;
|
|
658
693
|
const availInfo = available ? ` (${available.length} available of ${result.total})` : "";
|
|
659
694
|
console.log(
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { lookup } from "node:dns/promises";
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
|
-
* Outbound-request guard shared by the OAuth/MCP fetchers
|
|
5
|
-
*
|
|
4
|
+
* Outbound-request guard shared by the OAuth/MCP fetchers and the quickjs
|
|
5
|
+
* script executor.
|
|
6
6
|
*
|
|
7
|
-
* `assertUrlSafe` checks the URL string only. `
|
|
8
|
-
*
|
|
9
|
-
* it re-checks
|
|
7
|
+
* `assertUrlSafe` checks the URL string only. `createGuardedFetch` (and
|
|
8
|
+
* `createSsrfGuardedFetch` on top of it) also resolves the hostname, so a
|
|
9
|
+
* public name that points at a private address is refused, and it re-checks
|
|
10
|
+
* every redirect hop.
|
|
10
11
|
*/
|
|
11
12
|
|
|
12
13
|
// ─── Address classification ──────────────────────────────────────────────────
|
|
@@ -174,7 +175,7 @@ export interface SsrfGuardOptions {
|
|
|
174
175
|
* allowed), and loopback/private/link-local hosts (unless allowed). Checks the
|
|
175
176
|
* string only: the WHATWG parser normalizes decimal, octal and hex IPv4 forms
|
|
176
177
|
* first, but a public name that resolves to a private address passes. Use
|
|
177
|
-
* `
|
|
178
|
+
* `createSsrfGuardedFetch` where that matters.
|
|
178
179
|
*/
|
|
179
180
|
export function assertUrlSafe(rawUrl: string, opts: SsrfGuardOptions = {}): URL {
|
|
180
181
|
let parsed: URL;
|
|
@@ -231,6 +232,10 @@ export type GuardedFetchOptions = {
|
|
|
231
232
|
resolve?: (hostname: string) => Promise<string[]>;
|
|
232
233
|
/** A destination the host itself is calling (for example the swarm API). Skips the policy. */
|
|
233
234
|
isTrusted?: (url: URL) => boolean;
|
|
235
|
+
/** Extra check run on every hop before the policy; throw to refuse the hop. */
|
|
236
|
+
checkUrl?: (url: URL) => void;
|
|
237
|
+
/** Prefix of refusal messages. Without it, messages name the script egress settings. */
|
|
238
|
+
label?: string;
|
|
234
239
|
};
|
|
235
240
|
|
|
236
241
|
export class EgressDeniedError extends Error {
|
|
@@ -317,12 +322,14 @@ export async function assertEgressAllowed(
|
|
|
317
322
|
url: URL,
|
|
318
323
|
options: GuardedFetchOptions,
|
|
319
324
|
): Promise<string | null> {
|
|
325
|
+
options.checkUrl?.(url);
|
|
320
326
|
if (url.protocol !== "http:" && url.protocol !== "https:") {
|
|
321
327
|
// data:/blob: never leave the process.
|
|
322
328
|
if (url.protocol === "data:" || url.protocol === "blob:") return null;
|
|
323
329
|
throw new EgressDeniedError(`Script egress refused: unsupported protocol ${url.protocol}`);
|
|
324
330
|
}
|
|
325
331
|
if (options.isTrusted?.(url)) return null;
|
|
332
|
+
const label = options.label ?? "Script egress refused";
|
|
326
333
|
|
|
327
334
|
const { policy } = options;
|
|
328
335
|
if (policy.allowlist && policy.allowlist.length > 0) {
|
|
@@ -336,7 +343,7 @@ export async function assertEgressAllowed(
|
|
|
336
343
|
const host = stripBrackets(url.hostname);
|
|
337
344
|
const denied = () =>
|
|
338
345
|
new EgressDeniedError(
|
|
339
|
-
|
|
346
|
+
`${label}: ${url.host} is a private or loopback address.${options.label ? "" : " Add it to SCRIPT_EGRESS_ALLOWLIST or set SCRIPT_EGRESS_ALLOW_PRIVATE=true"}`,
|
|
340
347
|
);
|
|
341
348
|
if (isLoopbackName(host)) throw denied();
|
|
342
349
|
if (isIPv4Literal(host) || isIPv6Literal(host)) {
|
|
@@ -348,11 +355,11 @@ export async function assertEgressAllowed(
|
|
|
348
355
|
addresses = await (options.resolve ?? defaultResolve)(host);
|
|
349
356
|
} catch (error) {
|
|
350
357
|
throw new EgressDeniedError(
|
|
351
|
-
|
|
358
|
+
`${label}: could not resolve ${host} (${error instanceof Error ? error.message : String(error)})`,
|
|
352
359
|
);
|
|
353
360
|
}
|
|
354
361
|
if (addresses.length === 0) {
|
|
355
|
-
throw new EgressDeniedError(
|
|
362
|
+
throw new EgressDeniedError(`${label}: ${host} resolved to no address`);
|
|
356
363
|
}
|
|
357
364
|
// Deny when ANY answer is private: a mixed answer set is a rebinding setup.
|
|
358
365
|
if (addresses.some(isPrivateAddress)) throw denied();
|
|
@@ -522,7 +529,9 @@ export function createGuardedFetch(
|
|
|
522
529
|
if (mode === "error")
|
|
523
530
|
throw new TypeError(`fetch redirect refused (redirect: "error"): ${url.href}`);
|
|
524
531
|
if (hop >= MAX_REDIRECTS) {
|
|
525
|
-
throw new EgressDeniedError(
|
|
532
|
+
throw new EgressDeniedError(
|
|
533
|
+
`${options.label ?? "Script egress refused"}: more than ${MAX_REDIRECTS} redirects`,
|
|
534
|
+
);
|
|
526
535
|
}
|
|
527
536
|
await response.body?.cancel().catch(() => {});
|
|
528
537
|
const next = new URL(location, url);
|
|
@@ -539,6 +548,27 @@ export function createGuardedFetch(
|
|
|
539
548
|
return Object.assign(guarded, { preconnect: baseFetch.preconnect }) as typeof fetch;
|
|
540
549
|
}
|
|
541
550
|
|
|
551
|
+
/**
|
|
552
|
+
* A fetch for API-side calls to user-supplied URLs (MCP OAuth discovery and
|
|
553
|
+
* token endpoints, external MCP servers). Every hop passes `assertUrlSafe`
|
|
554
|
+
* with `opts`; unless `opts.allowPrivateHosts`, a hostname must resolve only
|
|
555
|
+
* to public addresses and the request connects to the checked address.
|
|
556
|
+
* Redirects are followed manually and re-checked.
|
|
557
|
+
*/
|
|
558
|
+
export function createSsrfGuardedFetch(
|
|
559
|
+
opts: SsrfGuardOptions,
|
|
560
|
+
// Late-bound so a replaced globalThis.fetch (tests) is honoured.
|
|
561
|
+
baseFetch: typeof fetch = ((input, init) => fetch(input, init)) as typeof fetch,
|
|
562
|
+
): typeof fetch {
|
|
563
|
+
return createGuardedFetch(baseFetch, {
|
|
564
|
+
policy: { allowPrivate: opts.allowPrivateHosts === true, allowlist: null },
|
|
565
|
+
checkUrl: (url) => {
|
|
566
|
+
assertUrlSafe(url.href, opts);
|
|
567
|
+
},
|
|
568
|
+
label: "Outbound request refused",
|
|
569
|
+
});
|
|
570
|
+
}
|
|
571
|
+
|
|
542
572
|
/** Parses the comma-separated `SCRIPT_EGRESS_ALLOWLIST` value. Empty = null. */
|
|
543
573
|
export function parseEgressAllowlist(value: string | undefined): string[] | null {
|
|
544
574
|
const entries = (value ?? "")
|
|
@@ -38,6 +38,17 @@ export interface RateLimitWindowInfo {
|
|
|
38
38
|
|
|
39
39
|
export type RateLimitWindowTelemetry = Record<string, RateLimitWindowInfo>;
|
|
40
40
|
|
|
41
|
+
/**
|
|
42
|
+
* A key that hit its provider spend limit (OpenRouter key limit or credits).
|
|
43
|
+
* `resetsAt` is null when the provider names no reset: the key stays benched
|
|
44
|
+
* until someone edits it.
|
|
45
|
+
*/
|
|
46
|
+
export interface SpendCap {
|
|
47
|
+
limitUsd: number | null;
|
|
48
|
+
spendUsd: number | null;
|
|
49
|
+
resetsAt: string | null;
|
|
50
|
+
}
|
|
51
|
+
|
|
41
52
|
/**
|
|
42
53
|
* Parses a rate_limit_event into one window entry per key of `unifiedWindows`
|
|
43
54
|
* (when present) merged with the top-level entry when they share a key. The
|
|
@@ -168,6 +179,12 @@ export function redactRateLimitEventLine(line: string): string {
|
|
|
168
179
|
*/
|
|
169
180
|
export const MAX_RATE_LIMIT_RESET_MS = 7 * 24 * 60 * 60 * 1000;
|
|
170
181
|
|
|
182
|
+
/**
|
|
183
|
+
* Longest a spend-capped key stays benched: a monthly key limit resets up to
|
|
184
|
+
* 31 days out, and a cap with no reset holds this long unless the key is edited.
|
|
185
|
+
*/
|
|
186
|
+
export const MAX_SPEND_CAP_HOLD_MS = 31 * 24 * 60 * 60 * 1000;
|
|
187
|
+
|
|
171
188
|
/**
|
|
172
189
|
* Single source of truth for "does this text look like a rate-limit signal?".
|
|
173
190
|
* Shared by the runner's cooldown gate and {@link parseStderrForErrors} so the
|