@desplega.ai/agent-swarm 2.13.5 → 2.14.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-7jv7w8jh.js +17 -0
- package/dist/{acp-targets-w8dbs4nr.js → acp-targets-0ebmg3et.js} +10 -10
- package/dist/{actions-8zrcbjrx.js → actions-0ds9dx6c.js} +63 -42
- package/dist/{agent-fs-provision-cbt2ttds.js → agent-fs-provision-zpbxa9jc.js} +4 -4
- package/dist/{amp-adapter-8x6zp8w4.js → amp-adapter-awh5nn7a.js} +3 -3
- package/dist/{anthropic-messages-vdd1zmha.js → anthropic-messages-gtgp9r85.js} +17 -17
- package/dist/{app-zfa9dwjw.js → app-nzejkvpp.js} +10 -10
- package/dist/{approval-notifications-rv92zmza.js → approval-notifications-hbqtb2w3.js} +11 -11
- package/dist/{assistant-q7s7rm1q.js → assistant-1paft129.js} +42 -37
- package/dist/{boot-args-schema-g27kpzr1.js → boot-args-schema-zs435mfx.js} +1 -1
- package/dist/{boot-reembed-1mjs52nt.js → boot-reembed-7xq2qgg4.js} +1 -1
- package/dist/{boot-reembed-m62dpdkg.js → boot-reembed-91qrd4mz.js} +1 -1
- package/dist/{boot-scrub-sweep-ss1vcamw.js → boot-scrub-sweep-3h5xscw6.js} +2 -2
- package/dist/{boot-seeds-hwnvgbb3.js → boot-seeds-xkxqa8zc.js} +4 -4
- package/dist/{boxd-y0szhp0g.js → boxd-464x3w4m.js} +4 -4
- package/dist/{claude-adapter-0rjmbhjk.js → claude-adapter-6d8eyf2f.js} +12 -13
- package/dist/{claude-managed-adapter-6k032agg.js → claude-managed-adapter-jzxcaf9m.js} +4 -4
- package/dist/{claude-managed-setup-6czvve8q.js → claude-managed-setup-5fcx0qh3.js} +10 -10
- package/dist/{claude-sdk-session-pr0znb81.js → claude-sdk-session-11vhz1hc.js} +12720 -13882
- package/dist/{cli-kr0jpw9c.js → cli-02ba8qx5.js} +1 -1
- package/dist/{cli-ywy8yz6t.js → cli-08gfvs58.js} +2 -2
- package/dist/{cli-0qt3epg4.js → cli-0dkpdvnn.js} +10 -10
- package/dist/{cli-s8dhq7rj.js → cli-0mq8kxfx.js} +5 -5
- package/dist/{cli-ybte1fqc.js → cli-0nvqg1hb.js} +1 -1
- package/dist/{cli-f9xw9pr4.js → cli-0qyfna7a.js} +5 -5
- package/dist/cli-0vxbrxr3.js +1006 -0
- package/dist/{cli-ehg90jd1.js → cli-132h67ps.js} +64 -59
- package/dist/{cli-f7b9nyvk.js → cli-1e13gvfn.js} +17 -17
- package/dist/cli-1hj68b3h.js +30 -0
- package/dist/{cli-srktrbby.js → cli-1zbj28py.js} +1 -1
- package/dist/{cli-q41qar56.js → cli-20mkgwev.js} +173 -46
- package/dist/{cli-v09eza21.js → cli-288k5ep1.js} +15 -15
- package/dist/{cli-abby987g.js → cli-2n7qdqfv.js} +3 -3
- package/dist/{cli-kezzteka.js → cli-2r62jy9s.js} +1 -1
- package/dist/{cli-qmx8bnt4.js → cli-3179w2rz.js} +2 -2
- package/dist/cli-3a3hm1z8.js +15 -0
- package/dist/cli-3bagv8rt.js +37 -0
- package/dist/{cli-zxa1vmx7.js → cli-3bcsc3m7.js} +2 -2
- package/dist/{cli-j69pzrrz.js → cli-3g0vbq46.js} +5 -5
- package/dist/{cli-69szn7w7.js → cli-3ktfe5jx.js} +71 -47
- package/dist/{cli-69zzpjgh.js → cli-44r66df2.js} +1 -1
- package/dist/{cli-grbngev5.js → cli-466jjrwe.js} +11 -2
- package/dist/{cli-1jq2em7b.js → cli-4y2bekkn.js} +10 -9
- package/dist/cli-547fsc36.js +15 -0
- package/dist/{cli-6p8p2e6r.js → cli-5pyes68e.js} +1278 -23
- package/dist/{cli-ewk3sg68.js → cli-5t00r6c9.js} +3 -3
- package/dist/{cli-wzecestt.js → cli-5xjdft4s.js} +4063 -1835
- package/dist/{cli-4dyzzkfb.js → cli-643skca1.js} +954 -180
- package/dist/{cli-vr4eyq6p.js → cli-6a77m17n.js} +540 -412
- package/dist/{cli-v41kn3cd.js → cli-6prwz0zn.js} +4427 -5566
- package/dist/{cli-ks06cd0n.js → cli-6xrbpj5j.js} +8 -8
- package/dist/{cli-meydjstb.js → cli-6yhjqd6k.js} +4965 -69
- package/dist/{cli-bvamr9g0.js → cli-727sq1f9.js} +4 -4
- package/dist/{cli-snxhtehz.js → cli-7abeph0b.js} +7 -8
- package/dist/{cli-ty3gha1p.js → cli-7b9bwrfg.js} +2 -2
- package/dist/{cli-vbge4rsp.js → cli-7dwsn9y5.js} +4 -4
- package/dist/{cli-1kvcsd2f.js → cli-7qkbab03.js} +76 -8
- package/dist/{cli-8b4rpnwj.js → cli-7svwhw1a.js} +1 -1
- package/dist/{cli-jdq3jmny.js → cli-83kf2y60.js} +8 -10
- package/dist/{cli-tgc1kgg3.js → cli-84wxwt3z.js} +1 -1
- package/dist/{cli-sejvnjvw.js → cli-8crn0510.js} +1 -1
- package/dist/{cli-19d6v8er.js → cli-8kemtj1r.js} +172 -18
- package/dist/{cli-qrvk9nka.js → cli-967jrz7j.js} +40 -26
- package/dist/{cli-cp163xga.js → cli-976m0zcw.js} +72 -50
- package/dist/{cli-887vhew6.js → cli-98sea4d9.js} +2716 -2643
- package/dist/{cli-xh5fpmg8.js → cli-9txap41q.js} +101 -18
- package/dist/{cli-nrt048ys.js → cli-aktk3qt6.js} +40 -3
- package/dist/{cli-t0n9svkb.js → cli-b70cpf8f.js} +12 -7
- package/dist/{cli-2ap1the6.js → cli-by7s3n4p.js} +1 -1
- package/dist/{cli-tt7dkwjj.js → cli-byzq8xht.js} +7 -7
- package/dist/{cli-55h8m1x3.js → cli-d1zkys4j.js} +150 -99
- package/dist/cli-dr6x9qdk.js +15 -0
- package/dist/cli-dt931hb8.js +9740 -0
- package/dist/{cli-emdfd8fh.js → cli-dy754erz.js} +9 -1
- package/dist/{cli-2wzkvfgm.js → cli-e1wprqnd.js} +3 -3
- package/dist/{cli-pedm2kht.js → cli-e2wzzw17.js} +2 -2
- package/dist/{cli-1jx0srjt.js → cli-e9p9h14n.js} +1921 -80
- package/dist/{cli-evy3egte.js → cli-eaqxkeq0.js} +14 -103
- package/dist/{cli-he5nxaa8.js → cli-etykr11s.js} +3062 -728
- package/dist/{cli-3vw6dd4g.js → cli-f07sgaax.js} +2 -2
- package/dist/{cli-z1vam71h.js → cli-fe8he9cy.js} +2 -2
- package/dist/{cli-94gx6ze9.js → cli-h0edykd1.js} +1 -1
- package/dist/cli-h5cveb69.js +15 -0
- package/dist/{cli-5tq15aa7.js → cli-hamdfjtx.js} +2 -2
- package/dist/{cli-kwj3131p.js → cli-hh5m39pt.js} +1 -1
- package/dist/{cli-tvyt8w6n.js → cli-j8fmn3wv.js} +11 -11
- package/dist/cli-jngvszex.js +1514 -0
- package/dist/{cli-9n6g14vs.js → cli-k791mabe.js} +6 -6
- package/dist/{cli-6msnpj1z.js → cli-k9m8fckz.js} +10 -10
- package/dist/{cli-2vp0z049.js → cli-kz8rar0g.js} +1 -1
- package/dist/{cli-94mxerrp.js → cli-n15fhd43.js} +1 -1
- package/dist/{cli-htb5bpz2.js → cli-nmdy8bzf.js} +10 -3
- package/dist/{cli-t9pzz2eq.js → cli-ntmjzyte.js} +4 -1
- package/dist/{cli-avax5mp9.js → cli-ny8f5g7t.js} +19 -7
- package/dist/cli-p0g0erm9.js +15 -0
- package/dist/{cli-n79j1vxc.js → cli-pgdqhdkw.js} +4 -4
- package/dist/cli-ph1jce1b.js +16 -0
- package/dist/{cli-ced4azn1.js → cli-phantfg3.js} +771 -401
- package/dist/{cli-ebpq3c5z.js → cli-rb1z91g8.js} +10221 -1397
- package/dist/{cli-a49frv85.js → cli-redtbppc.js} +1 -1
- package/dist/{cli-cmbb2t8a.js → cli-s7bfz1ye.js} +15 -15
- package/dist/{cli-8pd1t17c.js → cli-sf5kp73f.js} +18 -18
- package/dist/{cli-zbbtp02a.js → cli-sq32dgfe.js} +1837 -7206
- package/dist/{cli-k0nebh10.js → cli-tbrjvrrg.js} +1 -1
- package/dist/{cli-4gaf3tx5.js → cli-tdd9dvw6.js} +1 -1
- package/dist/{cli-7ypg8hka.js → cli-tjrrabez.js} +3 -3
- package/dist/{cli-q1h041y8.js → cli-tkrp183j.js} +11 -11
- package/dist/{cli-srre41gb.js → cli-trvtxwzt.js} +2 -2
- package/dist/{cli-ffn0a515.js → cli-v1rhq77v.js} +68 -25
- package/dist/{cli-t879ww0y.js → cli-v3jxx8dv.js} +2 -2
- package/dist/{cli-b42yfn17.js → cli-v84kb7af.js} +14 -14
- package/dist/{cli-sa02jsqt.js → cli-vp2ksaq9.js} +1 -1
- package/dist/{cli-b0m3bg0f.js → cli-vrb8pvrf.js} +6 -6
- package/dist/cli-vxxdf2ma.js +15 -0
- package/dist/{cli-x2adbg4j.js → cli-w81s97bn.js} +1 -1
- package/dist/{cli-4vynxtrb.js → cli-wkzrknpt.js} +10 -3
- package/dist/{cli-fw67mnyc.js → cli-wqpvfq2m.js} +1 -1
- package/dist/{cli-prz1p3ft.js → cli-wsh5vfa7.js} +9 -9
- package/dist/{cli-hd5bm1e1.js → cli-wtwe8vng.js} +45 -45
- package/dist/{cli-34fygf87.js → cli-ww8wxfzx.js} +2 -2
- package/dist/{cli-e8trbfx1.js → cli-x80zagf5.js} +1 -1
- package/dist/{cli-zntvmqmm.js → cli-xd6ntv7x.js} +2 -2
- package/dist/{cli-vcpyttcw.js → cli-xmc2nrtv.js} +1 -1
- package/dist/{cli-z40t85ms.js → cli-ytgtqsy9.js} +1 -1
- package/dist/{cli-r3dxpmyt.js → cli-yvnnyjxm.js} +1 -1
- package/dist/{cli-zzq96q57.js → cli-z0c98h7h.js} +2450 -554
- package/dist/{cli-ryem5cfq.js → cli-z0effej1.js} +217 -27
- package/dist/{cli-0h8skzss.js → cli-zcb64xzv.js} +4 -3
- package/dist/{cli-5web09sb.js → cli-zdkcp8p0.js} +8 -10
- package/dist/{cli-z3x7h79n.js → cli-zgsd2w2k.js} +20 -22
- package/dist/{cli-7r9tvk8v.js → cli-zmfs06hg.js} +15 -9
- package/dist/{cli-3860pmrq.js → cli-zvsy4abb.js} +4 -4
- package/dist/{cli-5n9w2xzx.js → cli-zyf288rw.js} +2 -2
- package/dist/cli.js +64 -65
- package/dist/{codex-adapter-bn7eaxk5.js → codex-adapter-seht4h9t.js} +9 -9
- package/dist/{codex-hook-nnmezjg9.js → codex-hook-w5nmtrn2.js} +3 -3
- package/dist/{codex-login-ktfg1cxk.js → codex-login-67qarfcg.js} +1 -1
- package/dist/{codex-session-runner-j1e9hffc.js → codex-session-runner-tq95x3gq.js} +10 -10
- package/dist/{commands-amhpafrr.js → commands-0awwqxq5.js} +3 -3
- package/dist/{controller-tw7g10j2.js → controller-hgjx521c.js} +4 -4
- package/dist/{controllers-connect-2ssqz7f4.js → controllers-connect-j4kdmhfj.js} +28 -29
- package/dist/core-8fw1gwg7.js +41 -0
- package/dist/{cursor-adapter-d6knjmwa.js → cursor-adapter-0rg8wk6j.js} +2 -2
- package/dist/{db-fd6xxm77.js → db-8xs2js3s.js} +3 -3
- package/dist/{db-sc59379z.js → db-dd6hj211.js} +4 -2
- package/dist/{devin-adapter-3bp6rape.js → devin-adapter-tn1twrha.js} +1 -1
- package/dist/{devtools-qxfgbsqz.js → devtools-b8qts77k.js} +1 -1
- package/dist/{dispatcher-a2gdqz8c.js → dispatcher-v7drd034.js} +24 -25
- package/dist/{docker-a59g3ebm.js → docker-6007r2fj.js} +2 -2
- package/dist/dsh-adapter-ah8npj2x.js +11 -0
- package/dist/{e2b-qnxyfea6.js → e2b-hg80w0qr.js} +3 -3
- package/dist/{e2b-cn7cvjqy.js → e2b-z1g7vpz6.js} +16 -5
- package/dist/{easter-egg-3d-a0pphy71.js → easter-egg-3d-8n4w3s9k.js} +1 -1
- package/dist/{embedding-space-qepzrach.js → embedding-space-0p921zt3.js} +13 -23
- package/dist/{embeddings-d7vr881x.js → embeddings-9s7kbrc6.js} +1 -1
- package/dist/emscripten-module-Q67P5WYC-3sde6cre.js +2458 -0
- package/dist/{event-bus-7gbsr0g4.js → event-bus-pawddp92.js} +1 -1
- package/dist/{execute-6afts2bn.js → execute-x0fy9j0m.js} +1 -1
- package/dist/{external-channel-881zq1x4.js → external-channel-ktfvn29c.js} +2 -2
- package/dist/ffi-cbfmmtqk.js +85 -0
- package/dist/fx-adapter-15vjxvgm.js +20 -0
- package/dist/getMachineId-bsd-2rd3pnz7.js +36 -0
- package/dist/getMachineId-bsd-3p48mkt1.js +36 -0
- package/dist/{getMachineId-bsd-637a7rbk.js → getMachineId-bsd-bk6tmeen.js} +5 -5
- package/dist/getMachineId-bsd-pssqgwmm.js +37 -0
- package/dist/getMachineId-bsd-v218x3xd.js +36 -0
- package/dist/getMachineId-bsd-wbxcazef.js +36 -0
- package/dist/getMachineId-bsd-x0942pbz.js +36 -0
- package/dist/getMachineId-darwin-5qsy4qcg.js +36 -0
- package/dist/getMachineId-darwin-6v7zsshx.js +37 -0
- package/dist/getMachineId-darwin-fcc3fjag.js +36 -0
- package/dist/getMachineId-darwin-pg84hftj.js +36 -0
- package/dist/{getMachineId-darwin-9vytrcnn.js → getMachineId-darwin-tyyevt26.js} +5 -5
- package/dist/getMachineId-darwin-wagmbf0d.js +36 -0
- package/dist/getMachineId-darwin-zvkmwr3y.js +36 -0
- package/dist/{getMachineId-linux-mkzsvyyz.js → getMachineId-linux-2ncg1epd.js} +3 -3
- package/dist/getMachineId-linux-2tmt2ptc.js +29 -0
- package/dist/getMachineId-linux-empwyp2y.js +29 -0
- package/dist/getMachineId-linux-fanqd45b.js +29 -0
- package/dist/getMachineId-linux-h6fyga0x.js +29 -0
- package/dist/getMachineId-linux-tbhgz1k9.js +29 -0
- package/dist/getMachineId-linux-zrbyw7dt.js +29 -0
- package/dist/getMachineId-unsupported-29g9dkgv.js +19 -0
- package/dist/getMachineId-unsupported-8xfq8djv.js +19 -0
- package/dist/getMachineId-unsupported-8y9cag1p.js +19 -0
- package/dist/getMachineId-unsupported-a6sjrm02.js +19 -0
- package/dist/getMachineId-unsupported-bp3w7ds0.js +19 -0
- package/dist/{getMachineId-unsupported-4cfs2n11.js → getMachineId-unsupported-sj6fk8sw.js} +3 -3
- package/dist/getMachineId-unsupported-v0p5gdxp.js +19 -0
- package/dist/getMachineId-win-hc996p0x.js +38 -0
- package/dist/{getMachineId-win-154s3qma.js → getMachineId-win-msq9ad87.js} +6 -6
- package/dist/getMachineId-win-tajyqwd6.js +38 -0
- package/dist/getMachineId-win-tzc163da.js +38 -0
- package/dist/getMachineId-win-xdaa0mgq.js +38 -0
- package/dist/getMachineId-win-xk6p98m5.js +38 -0
- package/dist/getMachineId-win-xtk658fm.js +38 -0
- package/dist/{google-generative-ai-sw77egmr.js → google-generative-ai-nzndg246.js} +1 -1
- package/dist/{google-vertex-rrw93g8h.js → google-vertex-ragh3nnw.js} +1 -1
- package/dist/grok-adapter-77httan0.js +20 -0
- package/dist/handlers-c1jp5b6h.js +39 -0
- package/dist/heartbeat-5yaj6dym.js +49 -0
- package/dist/{hook-a7eh6zty.js → hook-2jttae8s.js} +13 -14
- package/dist/hook-c99nycyh.js +21 -0
- package/dist/{http-6aw5wanc.js → http-7y9dbfrr.js} +870 -219
- package/dist/{index-kzdqn3dd.js → index-6g9rdcrj.js} +3036 -758
- package/dist/index-7dwh9kxh.js +41 -0
- package/dist/{index-ym9fgxad.js → index-8p03vx1h.js} +8 -8
- package/dist/{index-maddg9ys.js → index-cw8nxnba.js} +4330 -15375
- package/dist/{index-yq9hhhhy.js → index-dm7c6hw5.js} +28 -29
- package/dist/index-fqf82sbk.js +10584 -0
- package/dist/{index-126v2d0t.js → index-g7rthzrv.js} +11 -2923
- package/dist/{index-z2g9469g.js → index-h9xnzfhx.js} +114 -33
- package/dist/{index-42jq9yy3.js → index-jvfp0j47.js} +516 -10
- package/dist/{index-3j803vnb.js → index-q60mhcpd.js} +25094 -20637
- package/dist/index-qxcfv8vq.js +17 -0
- package/dist/{index-rz8ve510.js → index-t274qhhs.js} +6 -6
- package/dist/{index-kdmkfjt7.js → index-t4n9z755.js} +3491 -2487
- package/dist/{index-7dgxveck.js → index-tcegcysh.js} +5 -5
- package/dist/{index-whysn1wf.js → index-tn1m3q9b.js} +3 -3
- package/dist/index-wp9tarbt.js +43 -0
- package/dist/{index-xhad0n8m.js → index-xhp7yp3t.js} +1 -1
- package/dist/index-z6np2405.js +38 -0
- package/dist/{k8s-36gfn847.js → k8s-mr1r12th.js} +2 -2
- package/dist/{keepalive-zhbmztqw.js → keepalive-7eyb8y4t.js} +4 -5
- package/dist/lead-50cgn8s1.js +81 -0
- package/dist/{maintenance-rsp0591h.js → maintenance-tdrd8nwv.js} +1 -1
- package/dist/module-ES6BEMUI-6htewwha.js +1210 -0
- package/dist/{node-0as4n1ef.js → node-gbx1t3pa.js} +1 -1
- package/dist/{node-rxte5hc6.js → node-jkdd5w7m.js} +1 -1
- package/dist/{oauth-refresh-sweep-w3cqmxq7.js → oauth-refresh-sweep-f4c7g37h.js} +3 -4
- package/dist/{object-webhooks-331hay92.js → object-webhooks-p190rdxp.js} +7 -7
- package/dist/{onboard-n2w80m2n.js → onboard-56h4sks6.js} +12 -10
- package/dist/{opencode-adapter-z98127cz.js → opencode-adapter-xg3yxfr0.js} +8 -8
- package/dist/{otel-impl-xsk35tvf.js → otel-impl-kepzgm4n.js} +36360 -9179
- package/dist/{pending-2e6trkxd.js → pending-xgv316w0.js} +25 -26
- package/dist/{pi-mono-adapter-wh6yndtm.js → pi-mono-adapter-txe0syzb.js} +19 -22
- package/dist/{pricing-refresh-9355dj1t.js → pricing-refresh-041zpyhf.js} +2 -2
- package/dist/{rbac-roles-8eajw4s6.js → rbac-roles-8f3jbcaf.js} +2 -2
- package/dist/{rbac-roles-58y3m912.js → rbac-roles-cw7rrw5b.js} +3 -3
- package/dist/{render-v2-7gskkmd4.js → render-v2-2ezw4mzt.js} +10 -10
- package/dist/{resume-0drnmpja.js → resume-p14wdx8m.js} +13 -13
- package/dist/{runtime-d2tcmqte.js → runtime-he7c9g1r.js} +1 -1
- package/dist/{session-access-0ztys6bd.js → session-access-8jvq86fj.js} +5 -5
- package/dist/{session-source-backfill-cdm5s046.js → session-source-backfill-6fe3hcgb.js} +3 -3
- package/dist/{setup-pqwb9tcc.js → setup-6v0bn4r1.js} +15 -6
- package/dist/thread-buffer-8860v1ta.js +40 -0
- package/dist/{token-util-pjgekqxr.js → token-util-hnzceyn9.js} +1 -1
- package/dist/{token-pgr2w4s3.js → token-xnc02n6w.js} +21 -14
- package/dist/{tree-visibility-rwz67mje.js → tree-visibility-g1a8ff4r.js} +2 -2
- package/dist/{user-merge-jobs-mxrhamwt.js → user-merge-jobs-vjsps179.js} +3 -3
- package/dist/{virtual-modules-71y1gsmg.js → virtual-modules-mreda4fp.js} +3 -3
- package/dist/{work-objects-3k4ykt9j.js → work-objects-hfw15e35.js} +29 -33
- package/dist/{worker-follow-up-y0h64xpr.js → worker-follow-up-gbaz2ydz.js} +24 -25
- package/dist/worker-hkm8ftqp.js +81 -0
- package/dist/{x-d27jj7z7.js → x-k29vmskt.js} +2 -2
- package/openapi.json +303 -20
- package/package.json +45 -45
- 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/be/db/model-profiles.ts +103 -12
- 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 +26 -0
- package/src/be/db/task-idempotency.ts +63 -0
- package/src/be/db/tasks/read.ts +7 -0
- package/src/be/db/tasks/write.ts +4 -2
- package/src/be/db/workflow-idempotency.ts +6 -1
- package/src/be/db/workflows/read.ts +79 -0
- package/src/be/db.ts +65 -151
- 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/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/model-group-resolution.ts +134 -0
- package/src/be/model-tier-resolution.ts +120 -17
- package/src/be/model-validation.ts +9 -1
- package/src/be/repo-checked-update.ts +58 -5
- package/src/be/requester-timezone.ts +10 -0
- package/src/be/runtime-pools/routing.ts +22 -8
- 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 +36 -4
- package/src/be/scripts/run-credential.ts +1 -8
- package/src/be/scripts/typecheck.ts +32 -7
- 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 +104 -14
- package/src/be/users.ts +33 -12
- package/src/comb/review-batch.ts +16 -5
- package/src/commands/context-preamble.ts +237 -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 +23 -7
- package/src/commands/setup.tsx +17 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/hooks/hook.ts +8 -2
- package/src/hooks/native-tool-hooks.ts +4 -2
- package/src/http/apps.ts +82 -42
- package/src/http/comb.ts +21 -5
- package/src/http/config.ts +8 -4
- package/src/http/db-query.ts +8 -2
- 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/operator-actor.ts +3 -8
- package/src/http/poll.ts +20 -1
- package/src/http/repos.ts +30 -12
- package/src/http/request-principal.ts +27 -1
- package/src/http/schedules.ts +59 -11
- 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/skills.ts +70 -0
- package/src/http/status.ts +2 -0
- package/src/http/tasks.ts +103 -15
- package/src/http/trackers/jira.ts +18 -3
- package/src/http/trackers/linear.ts +3 -0
- package/src/kv-limits.ts +2 -0
- package/src/kv-reserved-namespaces.ts +25 -2
- package/src/prompts/base-prompt.ts +10 -6
- package/src/prompts/session-templates.ts +52 -3
- package/src/prompts/session-turns.ts +30 -0
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +11 -9
- package/src/providers/claude-managed-adapter.ts +14 -0
- package/src/providers/claude-sdk-session.ts +14 -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/realtime/browser.generated.txt +1 -1
- package/src/scheduler/schedule-task.ts +1 -0
- 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 +4 -1
- package/src/scripts-runtime/types/stdlib.d.ts +19 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +3 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +19 -0
- package/src/slack/actions.ts +24 -0
- 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/config.ts +4 -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 +265 -19
- package/src/slack/responses.ts +62 -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/tasks/follow-up-gate.ts +142 -38
- package/src/tasks/worker-follow-up.ts +126 -37
- package/src/tests/agents-list-model-display.test.ts +4 -0
- package/src/tests/amp-adapter.test.ts +57 -9
- package/src/tests/apps-script-types.test.ts +63 -16
- package/src/tests/apps-sort-order.test.ts +87 -0
- package/src/tests/base-prompt.test.ts +36 -2
- package/src/tests/bedrock-model-groups.test.ts +4 -0
- package/src/tests/channel-activity.test.ts +9 -0
- package/src/tests/chatgpt-subscription-model-groups.test.ts +4 -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-gpt6-release.test.ts +4 -0
- package/src/tests/comb-review-batch.test.ts +17 -4
- package/src/tests/comb-status.test.ts +1 -0
- package/src/tests/db-client.test.ts +11 -5
- package/src/tests/db-retention-defaults.test.ts +28 -3
- 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 +23 -1
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/e2b-dispatch.test.ts +13 -1
- package/src/tests/entrypoint-mcp-config.test.ts +642 -0
- package/src/tests/entrypoint-repo-autoclone-args.test.ts +10 -0
- 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/follow-up-gate-shadow.test.ts +268 -10
- package/src/tests/fx-adapter.test.ts +4 -5
- 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/linear-outbound-sync.test.ts +59 -25
- 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/operator-actor-keyless.test.ts +103 -0
- package/src/tests/opus-5-5-registry.test.ts +4 -0
- package/src/tests/profile-tier-alias.test.ts +9 -3
- package/src/tests/provider-runtime-dependencies.test.ts +26 -15
- package/src/tests/routing-affinity-inventory.test.ts +11 -0
- package/src/tests/runner-context-preamble.test.ts +202 -0
- package/src/tests/runner-repo-clone-args.test.ts +125 -0
- 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/scripts-namespaces.test.ts +3 -1
- 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-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 +9 -4
- 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/ui-spec-script-actions-config.test.ts +7 -3
- package/src/tests/workflow-system-one-extraction.test.ts +21 -0
- package/src/tests/workflow-triggers-v2.test.ts +35 -11
- package/src/tests/workflow-wait-filter.test.ts +7 -7
- package/src/tests/worktree-reaper.test.ts +15 -4
- package/src/tools/app-patch.ts +6 -2
- package/src/tools/app-upsert.ts +8 -4
- package/src/tools/defer-task.ts +17 -77
- 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/repos/update-repo.ts +37 -19
- package/src/tools/schedules/create-schedule.ts +20 -3
- package/src/tools/schedules/patch-schedule.ts +30 -4
- package/src/tools/schedules/run-schedule-now.ts +21 -1
- package/src/tools/schedules/update-schedule.ts +30 -4
- 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/send-task.ts +17 -3
- package/src/tools/slack-download-file.ts +15 -12
- package/src/tools/slack-post.ts +14 -3
- package/src/tools/slack-read.ts +3 -1
- package/src/tools/slack-reply.ts +22 -2
- package/src/tools/slack-start-thread.ts +8 -1
- package/src/tools/slack-upload-file.ts +99 -96
- package/src/tools/swarm-config/set-config.ts +3 -1
- package/src/tools/swarm-x.ts +0 -2
- package/src/tools/task-action.ts +16 -3
- package/src/tools/utils.ts +4 -1
- package/src/types.ts +18 -2
- package/src/utils/amp-models.ts +20 -4
- package/src/utils/constants.ts +20 -0
- package/src/utils/deferral-time.ts +61 -0
- package/src/utils/request-auth-context.ts +15 -16
- package/src/utils/secret-scrubber.ts +7 -5
- package/src/workflows/engine.ts +42 -19
- package/src/workflows/executors/agent-task.ts +13 -2
- package/src/workflows/executors/code-match.ts +11 -31
- package/src/workflows/executors/script.ts +13 -0
- package/src/workflows/executors/swarm-script.ts +0 -2
- package/src/workflows/executors/system-one-extraction.ts +9 -6
- package/src/workflows/executors/wait.ts +1 -1
- package/src/workflows/foreach-driver.ts +11 -13
- package/src/workflows/input.ts +24 -1
- package/src/workflows/model-validation.ts +13 -1
- package/src/workflows/node-timeout.ts +18 -0
- package/src/workflows/predicate-sandbox.ts +171 -0
- package/src/workflows/retry-poller.ts +3 -2
- package/src/workflows/triggers.ts +21 -11
- package/src/workflows/wait-filter.ts +14 -192
- package/src/x/composio.ts +10 -1
- package/templates/skills/apps/SKILL.md +4 -2
- package/templates/skills/apps/content.md +4 -2
- package/templates/skills/code-quality/content.md +4 -4
- package/templates/skills/heartbeat-runbook/content.md +1 -0
- package/templates/skills/scheduled-task-resilience/SKILL.md +2 -0
- package/templates/skills/scheduled-task-resilience/content.md +2 -0
- package/templates/skills/slack-interaction/content.md +4 -0
- package/templates/skills/swarm-docs/content.md +8 -0
- package/templates/skills/swarm-scripts/SKILL.md +44 -0
- package/templates/skills/swarm-scripts/content.md +44 -0
- package/dist/acp-adapter-tbt61zkm.js +0 -17
- package/dist/cli-5ss6qqt9.js +0 -45
- package/dist/cli-b9ygp1kz.js +0 -459
- package/dist/cli-dzzh58sy.js +0 -6996
- package/dist/cli-j9ccfveb.js +0 -1849
- package/dist/cli-kj0hyr43.js +0 -51
- package/dist/cli-m8f4379k.js +0 -173
- package/dist/cli-mna6pmfx.js +0 -1485
- package/dist/cli-r8ddn0hf.js +0 -25583
- package/dist/core-bwp98v4w.js +0 -42
- package/dist/dsh-adapter-43ygwqn7.js +0 -9
- package/dist/fx-adapter-cr2hq17y.js +0 -20
- package/dist/grok-adapter-ayddnbsc.js +0 -20
- package/dist/handlers-7ghs84x2.js +0 -41
- package/dist/heartbeat-4c022m6a.js +0 -50
- package/dist/hook-4k84x499.js +0 -22
- package/dist/index-dtt0d634.js +0 -44
- package/dist/index-hmszyqkk.js +0 -42
- package/dist/index-j6rm1rtn.js +0 -39
- package/dist/index-rwwhsmjg.js +0 -13
- package/dist/index-t56y945n.js +0 -4
- package/dist/index-vfemrwwk.js +0 -10002
- package/dist/lead-g2j4q39z.js +0 -83
- package/dist/thread-buffer-epx3san4.js +0 -42
- package/dist/worker-09gqn9xy.js +0 -83
- package/dist/{azure-openai-responses-jeaas6x0.js → azure-openai-responses-e76k86gf.js} +4 -4
- package/dist/{openai-codex-responses-70g39cgz.js → openai-codex-responses-z2h941b8.js} +4 -4
- package/dist/{openai-completions-cv3hp4h5.js → openai-completions-5bxdkeg9.js} +4 -4
- package/dist/{openai-responses-trsvnks6.js → openai-responses-dzf3e8r5.js} +4 -4
package/src/http/memory.ts
CHANGED
|
@@ -47,7 +47,7 @@ import { can, type RbacPrincipal } from "../rbac";
|
|
|
47
47
|
import { AgentMemorySchema, AgentMemoryScopeSchema, AgentMemorySourceSchema } from "../types";
|
|
48
48
|
import { getRequestAuth } from "../utils/request-auth-context";
|
|
49
49
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
50
|
-
import { agentFirstPrincipal, rejectGuest } from "./request-principal";
|
|
50
|
+
import { agentFirstPrincipal, rejectGuest, requestPrincipal } from "./request-principal";
|
|
51
51
|
import { bodyTask, route } from "./route-def";
|
|
52
52
|
import { jsonError, parseQueryParams } from "./utils";
|
|
53
53
|
|
|
@@ -831,6 +831,22 @@ export async function handleMemory(
|
|
|
831
831
|
contextKey,
|
|
832
832
|
} = parsed.body;
|
|
833
833
|
const memoryAgentId = agentId ?? (scope === "agent" ? myAgentId : undefined);
|
|
834
|
+
// An agent-bound token writes its own memory. Another agent's needs a lead.
|
|
835
|
+
const auth = getRequestAuth(req);
|
|
836
|
+
if (
|
|
837
|
+
auth?.kind === "agent" &&
|
|
838
|
+
memoryAgentId !== undefined &&
|
|
839
|
+
memoryAgentId !== auth.agentId &&
|
|
840
|
+
!can({
|
|
841
|
+
principal: await ingestPrincipal(req, myAgentId),
|
|
842
|
+
verb: "memory.edit.any",
|
|
843
|
+
resource: { kind: "owned", ownerAgentId: memoryAgentId },
|
|
844
|
+
source: "http",
|
|
845
|
+
}).allow
|
|
846
|
+
) {
|
|
847
|
+
jsonError(res, "An agent token can index memory only for its own agent", 403);
|
|
848
|
+
return true;
|
|
849
|
+
}
|
|
834
850
|
|
|
835
851
|
if (source === "session_summary" && sourceTaskId) {
|
|
836
852
|
const sourceTask = await getTaskById(sourceTaskId);
|
|
@@ -1370,6 +1386,17 @@ export async function handleMemory(
|
|
|
1370
1386
|
if (reEmbedMemory.match(req.method, pathSegments)) {
|
|
1371
1387
|
const parsed = await reEmbedMemory.parse(req, res, pathSegments, new URLSearchParams());
|
|
1372
1388
|
if (!parsed) return true;
|
|
1389
|
+
// Operator-first: the shared key stays the operator even with X-Agent-ID.
|
|
1390
|
+
// An agent session token must belong to a lead.
|
|
1391
|
+
const reembedDecision = can({
|
|
1392
|
+
principal: await requestPrincipal(req, myAgentId, { unauthenticatedFallback: "operator" }),
|
|
1393
|
+
verb: "memory.reembed",
|
|
1394
|
+
source: "http",
|
|
1395
|
+
});
|
|
1396
|
+
if (!reembedDecision.allow) {
|
|
1397
|
+
jsonError(res, `Forbidden: ${reembedDecision.reason}`, 403);
|
|
1398
|
+
return true;
|
|
1399
|
+
}
|
|
1373
1400
|
|
|
1374
1401
|
const { agentId, batchSize } = parsed.body;
|
|
1375
1402
|
const store = getMemoryStore();
|
package/src/http/metrics.ts
CHANGED
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
type MetricWidget,
|
|
25
25
|
MetricWidgetSchema,
|
|
26
26
|
} from "../types";
|
|
27
|
+
import { scrubObject } from "../utils/secret-scrubber";
|
|
27
28
|
import { assertSelectOnlyQuery, executeReadOnlyQuery } from "./db-query";
|
|
28
29
|
import { route } from "./route-def";
|
|
29
30
|
import { jsonError } from "./utils";
|
|
@@ -87,7 +88,9 @@ function resolveVariableOptions(metric: Metric) {
|
|
|
87
88
|
}
|
|
88
89
|
const options = resolveVariableOptionValues(variable);
|
|
89
90
|
optionsByKey[variable.key] = options;
|
|
90
|
-
|
|
91
|
+
// Options are query output, like widget rows: the response gets a scrubbed copy.
|
|
92
|
+
// `optionsByKey` keeps the raw values for validation and parameter binding.
|
|
93
|
+
return { ...variable, options: scrubObject(options) };
|
|
91
94
|
});
|
|
92
95
|
return { variables, optionsByKey };
|
|
93
96
|
}
|
|
@@ -162,8 +165,11 @@ function runMetricWidget(widget: MetricWidget, variables: Record<string, MetricP
|
|
|
162
165
|
widget,
|
|
163
166
|
result: {
|
|
164
167
|
...result,
|
|
165
|
-
|
|
166
|
-
|
|
168
|
+
// Rows can hold secrets pasted into free text: scrub them, as /api/db-query does.
|
|
169
|
+
rows: scrubObject(
|
|
170
|
+
result.rows.map((row) =>
|
|
171
|
+
Object.fromEntries(result.columns.map((column, index) => [column, row[index]])),
|
|
172
|
+
),
|
|
167
173
|
),
|
|
168
174
|
truncated: result.total > result.rows.length,
|
|
169
175
|
maxRows,
|
|
@@ -180,7 +186,8 @@ function runMetric(metric: Metric, providedVariables: Record<string, unknown> =
|
|
|
180
186
|
...metric,
|
|
181
187
|
definition: { ...metric.definition, variables: resolved.variables },
|
|
182
188
|
},
|
|
183
|
-
|
|
189
|
+
// A default can be the first option of an options query, so scrub the echo too.
|
|
190
|
+
variables: scrubObject(variables),
|
|
184
191
|
widgets,
|
|
185
192
|
// Kept as the first widget result for older callers during the PR cycle.
|
|
186
193
|
result: widgets[0]?.result,
|
package/src/http/onboarding.ts
CHANGED
|
@@ -26,7 +26,7 @@ import { assertUrlSafe, publicEndpointSsrfOptions } from "../oauth/mcp-wrapper";
|
|
|
26
26
|
import { ProviderNameSchema } from "../types";
|
|
27
27
|
import { isCombEnabled } from "../utils/constants";
|
|
28
28
|
import { splitCredentialPool } from "../utils/credentials";
|
|
29
|
-
import { isPrivateAddress } from "../utils/egress-guard";
|
|
29
|
+
import { createSsrfGuardedFetch, EgressDeniedError, isPrivateAddress } from "../utils/egress-guard";
|
|
30
30
|
import { getOpenRouterAttributionHeaders } from "../utils/openrouter-base-url";
|
|
31
31
|
import { ensureConfigAdmin } from "./config";
|
|
32
32
|
import {
|
|
@@ -383,6 +383,8 @@ async function handleMemoryProbe(body: OnboardingMemoryRequest): Promise<Onboard
|
|
|
383
383
|
timeout: 15_000,
|
|
384
384
|
maxRetries: 0,
|
|
385
385
|
fetchOptions: { redirect: "manual" },
|
|
386
|
+
// The guard resolves the hostname and refuses a private address.
|
|
387
|
+
fetch: configuredEndpoint ? undefined : createSsrfGuardedFetch(publicEndpointSsrfOptions()),
|
|
386
388
|
});
|
|
387
389
|
const response = await client.embeddings.create({
|
|
388
390
|
model,
|
|
@@ -420,6 +422,15 @@ async function handleMemoryProbe(body: OnboardingMemoryRequest): Promise<Onboard
|
|
|
420
422
|
);
|
|
421
423
|
return { ok: true, dimensions, latencyMs };
|
|
422
424
|
} catch (error) {
|
|
425
|
+
if (error instanceof Error && error.cause instanceof EgressDeniedError) {
|
|
426
|
+
// Same answer as the URL check above: the step state stays as is.
|
|
427
|
+
return {
|
|
428
|
+
ok: false,
|
|
429
|
+
latencyMs: 0,
|
|
430
|
+
error: "The endpoint URL is not allowed.",
|
|
431
|
+
errorClass: "network",
|
|
432
|
+
};
|
|
433
|
+
}
|
|
423
434
|
const errorClass = classifyMemoryError(error);
|
|
424
435
|
const latencyMs = Math.max(0, Math.round(performance.now() - started));
|
|
425
436
|
const message = memoryErrorMessage(errorClass, memoryErrorStatus(error));
|
|
@@ -57,14 +57,9 @@ export function getOperatorActor(req: IncomingMessage, res: ServerResponse): Ide
|
|
|
57
57
|
const rawKey = extractBearer(req);
|
|
58
58
|
const swarmKey = getApiKey();
|
|
59
59
|
|
|
60
|
-
//
|
|
61
|
-
//
|
|
62
|
-
|
|
63
|
-
if (!swarmKey) {
|
|
64
|
-
return { kind: "operator", id: fingerprintApiKey("") };
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
if (!rawKey || !verifyTokenEquality(swarmKey, rawKey)) {
|
|
60
|
+
// With no swarm key configured there is no operator credential to match, so
|
|
61
|
+
// a non-user caller (such as an agent session token) is refused here too.
|
|
62
|
+
if (!swarmKey || !rawKey || !verifyTokenEquality(swarmKey, rawKey)) {
|
|
68
63
|
jsonError(res, "Unauthorized", 401);
|
|
69
64
|
return null;
|
|
70
65
|
}
|
package/src/http/poll.ts
CHANGED
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
updateAgentStatusFromCapacity,
|
|
27
27
|
upsertChannelActivityCursor,
|
|
28
28
|
} from "../be/db";
|
|
29
|
+
import { resolveGroupForAgent } from "../be/model-group-resolution";
|
|
29
30
|
import { checkProfileForAgent } from "../be/model-profile-check";
|
|
30
31
|
import {
|
|
31
32
|
modelTierOverridesDiffer,
|
|
@@ -669,13 +670,31 @@ export async function handlePoll(
|
|
|
669
670
|
profileOk.set(memoKey, ok);
|
|
670
671
|
return ok;
|
|
671
672
|
};
|
|
673
|
+
// A model group task waits, the same way, for an agent with a member that
|
|
674
|
+
// passes; otherwise claim would hard-stop it with [model-group-unavailable].
|
|
675
|
+
const groupOk = new Map<string, boolean>();
|
|
676
|
+
const passesGroupCheck = async (
|
|
677
|
+
group: string,
|
|
678
|
+
vcsRepo: string | null | undefined,
|
|
679
|
+
): Promise<boolean> => {
|
|
680
|
+
const memoKey = JSON.stringify([group, vcsRepo ?? null]);
|
|
681
|
+
const cached = groupOk.get(memoKey);
|
|
682
|
+
if (cached !== undefined) return cached;
|
|
683
|
+
const ok =
|
|
684
|
+
(await resolveGroupForAgent(group, myAgentId, { vcsRepo, includeRepoSecrets }))
|
|
685
|
+
.kind !== "none";
|
|
686
|
+
groupOk.set(memoKey, ok);
|
|
687
|
+
return ok;
|
|
688
|
+
};
|
|
672
689
|
// The filter runs inside the paginated scan, so incompatible rows never use up the limit.
|
|
673
690
|
const unassignedIds = await getUnassignedTaskIdsForAgent(
|
|
674
691
|
myAgentId,
|
|
675
692
|
5,
|
|
676
693
|
async (task) =>
|
|
677
694
|
(await poolTaskRunsOnHarness(task, harness)) &&
|
|
678
|
-
(
|
|
695
|
+
(task.profile
|
|
696
|
+
? await passesProfileCheck(task.profile, task.vcsRepo)
|
|
697
|
+
: !task.modelGroup || (await passesGroupCheck(task.modelGroup, task.vcsRepo))),
|
|
679
698
|
);
|
|
680
699
|
// Budget admission gate (Phase 3). Pool path is workers-only —
|
|
681
700
|
// per-agent budgets matter most here, but we still check global.
|
package/src/http/repos.ts
CHANGED
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { createSwarmRepo, deleteSwarmRepo, getSwarmRepoById, getSwarmRepos } from "../be/db";
|
|
4
|
-
import { updateSwarmRepoChecked } from "../be/repo-checked-update";
|
|
4
|
+
import { execConfigRefusal, updateSwarmRepoChecked } from "../be/repo-checked-update";
|
|
5
5
|
import { changesMergePolicy } from "../be/repo-merge-policy";
|
|
6
6
|
import { can } from "../rbac";
|
|
7
7
|
import { emitIntegrationConnected } from "../telemetry";
|
|
8
8
|
import { RepoGuidelinesInputSchema, RepoHooksSchema, SwarmRepoSchema } from "../types";
|
|
9
|
-
import {
|
|
9
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
10
|
+
import { agentFirstPrincipal, refuseAgentTokenWithout } from "./request-principal";
|
|
10
11
|
import { route } from "./route-def";
|
|
11
12
|
import { json, jsonError } from "./utils";
|
|
12
13
|
|
|
13
14
|
// ─── Route Definitions ───────────────────────────────────────────────────────
|
|
14
15
|
|
|
16
|
+
/** Workers pass `url`, `clonePath` and `defaultBranch` to git as arguments, so none may read as an option. */
|
|
17
|
+
const notOptionLike = (schema: z.ZodString, field: string) =>
|
|
18
|
+
schema.refine((value) => !value.startsWith("-"), `${field} must not start with "-"`);
|
|
19
|
+
|
|
15
20
|
const getRepo = route({
|
|
16
21
|
method: "get",
|
|
17
22
|
path: "/api/repos/{id}",
|
|
@@ -50,10 +55,10 @@ const createRepo = route({
|
|
|
50
55
|
summary: "Create a new repo",
|
|
51
56
|
tags: ["Repos"],
|
|
52
57
|
body: z.object({
|
|
53
|
-
url: z.string().min(1),
|
|
58
|
+
url: notOptionLike(z.string().min(1), "url"),
|
|
54
59
|
name: z.string().min(1),
|
|
55
|
-
clonePath: z.string().optional(),
|
|
56
|
-
defaultBranch: z.string().optional(),
|
|
60
|
+
clonePath: notOptionLike(z.string(), "clonePath").optional(),
|
|
61
|
+
defaultBranch: notOptionLike(z.string(), "defaultBranch").optional(),
|
|
57
62
|
autoClone: z.boolean().optional(),
|
|
58
63
|
hooks: RepoHooksSchema.optional(),
|
|
59
64
|
guidelines: RepoGuidelinesInputSchema.nullable().optional(),
|
|
@@ -63,7 +68,7 @@ const createRepo = route({
|
|
|
63
68
|
400: { description: "Validation error", schema: z.object({ error: z.string() }) },
|
|
64
69
|
403: {
|
|
65
70
|
description:
|
|
66
|
-
"Only the lead, the operator or a user can turn allowMerge on
|
|
71
|
+
"Only the lead, the operator or a user can turn allowMerge on, set a mergePolicy or enable hooks",
|
|
67
72
|
schema: z.object({ error: z.string() }),
|
|
68
73
|
},
|
|
69
74
|
409: { description: "Duplicate repo", schema: z.object({ error: z.string() }) },
|
|
@@ -79,10 +84,10 @@ const updateRepo = route({
|
|
|
79
84
|
tags: ["Repos"],
|
|
80
85
|
params: z.object({ id: z.string().uuid() }),
|
|
81
86
|
body: z.object({
|
|
82
|
-
url: z.string().optional(),
|
|
87
|
+
url: notOptionLike(z.string(), "url").optional(),
|
|
83
88
|
name: z.string().optional(),
|
|
84
|
-
clonePath: z.string().optional(),
|
|
85
|
-
defaultBranch: z.string().optional(),
|
|
89
|
+
clonePath: notOptionLike(z.string(), "clonePath").optional(),
|
|
90
|
+
defaultBranch: notOptionLike(z.string(), "defaultBranch").optional(),
|
|
86
91
|
autoClone: z.boolean().optional(),
|
|
87
92
|
hooks: RepoHooksSchema.nullable().optional(),
|
|
88
93
|
guidelines: RepoGuidelinesInputSchema.nullable().optional(),
|
|
@@ -90,13 +95,16 @@ const updateRepo = route({
|
|
|
90
95
|
responses: {
|
|
91
96
|
200: { description: "Repo updated", schema: SwarmRepoSchema },
|
|
92
97
|
403: {
|
|
93
|
-
description:
|
|
98
|
+
description:
|
|
99
|
+
"Only the lead, the operator or a user can change allowMerge, mergePolicy, url, clonePath or hooks",
|
|
94
100
|
schema: z.object({ error: z.string() }),
|
|
95
101
|
},
|
|
96
102
|
404: { description: "Repo not found", schema: z.object({ error: z.string() }) },
|
|
97
103
|
409: { description: "Duplicate repo", schema: z.object({ error: z.string() }) },
|
|
98
104
|
},
|
|
99
|
-
|
|
105
|
+
// `url`, `clonePath` and `hooks` changes gate on `repo.exec-config.write` instead; the
|
|
106
|
+
// handler decides per changed field inside the update transaction.
|
|
107
|
+
rbac: { permission: "repo.merge-policy.write", alsoAdmits: ["repo.exec-config.write"] },
|
|
100
108
|
});
|
|
101
109
|
|
|
102
110
|
const deleteRepo = route({
|
|
@@ -110,6 +118,7 @@ const deleteRepo = route({
|
|
|
110
118
|
200: { description: "Repo deleted", schema: z.object({ success: z.boolean() }) },
|
|
111
119
|
404: { description: "Repo not found", schema: z.object({ error: z.string() }) },
|
|
112
120
|
},
|
|
121
|
+
rbac: { permission: "repo.delete" },
|
|
113
122
|
});
|
|
114
123
|
|
|
115
124
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
@@ -168,6 +177,13 @@ export async function handleRepos(
|
|
|
168
177
|
return true;
|
|
169
178
|
}
|
|
170
179
|
}
|
|
180
|
+
// A non-lead agent token may create a repo, but not one with hooks enabled: an explicit
|
|
181
|
+
// `hooks: { enabled: true }` is refused and an omitted `hooks` stores it disabled.
|
|
182
|
+
const execRefusal = await execConfigRefusal(getRequestAuth(req), "http");
|
|
183
|
+
if (execRefusal && parsed.body.hooks?.enabled === true) {
|
|
184
|
+
jsonError(res, execRefusal, 403);
|
|
185
|
+
return true;
|
|
186
|
+
}
|
|
171
187
|
try {
|
|
172
188
|
const repo = await createSwarmRepo({
|
|
173
189
|
url: parsed.body.url,
|
|
@@ -175,7 +191,7 @@ export async function handleRepos(
|
|
|
175
191
|
clonePath: parsed.body.clonePath,
|
|
176
192
|
defaultBranch: parsed.body.defaultBranch,
|
|
177
193
|
autoClone: parsed.body.autoClone,
|
|
178
|
-
hooks: parsed.body.hooks,
|
|
194
|
+
hooks: parsed.body.hooks ?? (execRefusal ? { enabled: false } : undefined),
|
|
179
195
|
guidelines: parsed.body.guidelines,
|
|
180
196
|
});
|
|
181
197
|
try {
|
|
@@ -213,6 +229,7 @@ export async function handleRepos(
|
|
|
213
229
|
guidelines: parsed.body.guidelines,
|
|
214
230
|
},
|
|
215
231
|
() => allowMergeRefusal(req, myAgentId),
|
|
232
|
+
() => execConfigRefusal(getRequestAuth(req), "http"),
|
|
216
233
|
);
|
|
217
234
|
if (result.kind === "refused") {
|
|
218
235
|
jsonError(res, result.refusal, 403);
|
|
@@ -237,6 +254,7 @@ export async function handleRepos(
|
|
|
237
254
|
if (deleteRepo.match(req.method, pathSegments)) {
|
|
238
255
|
const parsed = await deleteRepo.parse(req, res, pathSegments, queryParams);
|
|
239
256
|
if (!parsed) return true;
|
|
257
|
+
if (await refuseAgentTokenWithout(req, res, "repo.delete")) return true;
|
|
240
258
|
const deleted = await deleteSwarmRepo(parsed.params.id);
|
|
241
259
|
if (!deleted) {
|
|
242
260
|
jsonError(res, "Repo not found", 404);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { getAgentById } from "../be/db";
|
|
3
|
-
import type
|
|
3
|
+
import { can, type PermissionVerb, type RbacPrincipal, type RbacResource } from "../rbac";
|
|
4
4
|
import {
|
|
5
5
|
authUser,
|
|
6
6
|
authUserId,
|
|
@@ -168,3 +168,29 @@ export function rejectGuest(req: IncomingMessage, res: ServerResponse): boolean
|
|
|
168
168
|
jsonError(res, "Forbidden", 403);
|
|
169
169
|
return true;
|
|
170
170
|
}
|
|
171
|
+
|
|
172
|
+
/**
|
|
173
|
+
* Refuse an agent-bound session token (`aseph_`) whose agent may not do `verb`
|
|
174
|
+
* on `resource`. Only that credential is checked here: the shared API key,
|
|
175
|
+
* user tokens and page sessions keep the route's other checks, so a worker on
|
|
176
|
+
* the shared key behaves as before. Writes a 403 and returns true on refusal.
|
|
177
|
+
*/
|
|
178
|
+
export async function refuseAgentTokenWithout(
|
|
179
|
+
req: IncomingMessage,
|
|
180
|
+
res: ServerResponse,
|
|
181
|
+
verb: PermissionVerb,
|
|
182
|
+
resource: RbacResource = { kind: "none" },
|
|
183
|
+
): Promise<boolean> {
|
|
184
|
+
const auth = getRequestAuth(req);
|
|
185
|
+
if (auth?.kind !== "agent") return false;
|
|
186
|
+
const agent = await getAgentById(auth.agentId);
|
|
187
|
+
const decision = can({
|
|
188
|
+
principal: { kind: "agent", agentId: auth.agentId, isLead: agent?.isLead === true },
|
|
189
|
+
verb,
|
|
190
|
+
resource,
|
|
191
|
+
source: "http",
|
|
192
|
+
});
|
|
193
|
+
if (decision.allow) return false;
|
|
194
|
+
jsonError(res, `Forbidden: ${decision.reason}`, 403);
|
|
195
|
+
return true;
|
|
196
|
+
}
|
package/src/http/schedules.ts
CHANGED
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
withFavoriteFlags,
|
|
18
18
|
} from "../be/db";
|
|
19
19
|
import {
|
|
20
|
+
modelGroupRefError,
|
|
20
21
|
modelProfileRefError,
|
|
21
22
|
scheduleProfileUpdate,
|
|
22
23
|
taskProfileError,
|
|
@@ -39,6 +40,7 @@ import {
|
|
|
39
40
|
ScheduledTaskTargetTypeSchema,
|
|
40
41
|
splitLegacyModelAlias,
|
|
41
42
|
} from "../types";
|
|
43
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
42
44
|
import { authorizeHttpAssetKeyWrite } from "./asset-key-write";
|
|
43
45
|
import { resolveHttpFavoriteOwner } from "./favorite-owner";
|
|
44
46
|
import { agentFirstPrincipal } from "./request-principal";
|
|
@@ -64,6 +66,8 @@ const scheduleUpdateBodySchema = z.object({
|
|
|
64
66
|
modelTier: ModelTierSchema.nullable().optional(),
|
|
65
67
|
/** Model profile for every fired task. Exclusive with model/modelTier; setting one clears the other. */
|
|
66
68
|
profile: z.string().nullable().optional(),
|
|
69
|
+
/** Model group for every fired task. Exclusive with model/modelTier/profile; setting one clears the others. */
|
|
70
|
+
modelGroup: z.string().nullable().optional(),
|
|
67
71
|
/** Accept a `model` the catalog does not list (a custom id). Without it an unknown id is a 400. */
|
|
68
72
|
allowCustomModel: z.boolean().optional(),
|
|
69
73
|
nextRunAt: z.string().nullable().optional(),
|
|
@@ -127,6 +131,8 @@ const createSchedule = route({
|
|
|
127
131
|
modelTier: ModelTierSchema.optional(),
|
|
128
132
|
/** Model profile for every fired task. Exclusive with model/modelTier. */
|
|
129
133
|
profile: z.string().optional(),
|
|
134
|
+
/** Model group for every fired task. Exclusive with model/modelTier/profile. */
|
|
135
|
+
modelGroup: z.string().optional(),
|
|
130
136
|
/** Accept a `model` the catalog does not list (a custom id). Without it an unknown id is a 400. */
|
|
131
137
|
allowCustomModel: z.boolean().optional(),
|
|
132
138
|
scheduleType: z.enum(["recurring", "one_time"]).optional(),
|
|
@@ -429,6 +435,7 @@ export async function handleSchedules(
|
|
|
429
435
|
profile: body.profile,
|
|
430
436
|
model: body.model,
|
|
431
437
|
modelTier: body.modelTier,
|
|
438
|
+
modelGroup: body.modelGroup,
|
|
432
439
|
agentId: body.targetAgentId,
|
|
433
440
|
});
|
|
434
441
|
if (profileError) {
|
|
@@ -483,6 +490,7 @@ export async function handleSchedules(
|
|
|
483
490
|
timezone: body.timezone,
|
|
484
491
|
...splitLegacyModelAlias({ model: body.model, modelTier: body.modelTier }),
|
|
485
492
|
profile: body.profile?.trim() || undefined,
|
|
493
|
+
modelGroup: body.modelGroup?.trim() || undefined,
|
|
486
494
|
scheduleType: body.scheduleType,
|
|
487
495
|
targetType: body.targetType,
|
|
488
496
|
workflowId: body.workflowId,
|
|
@@ -498,7 +506,11 @@ export async function handleSchedules(
|
|
|
498
506
|
|
|
499
507
|
createSchedule.respond(res, 201, schedule);
|
|
500
508
|
} catch (error) {
|
|
501
|
-
// The profile was deleted between taskProfileError and the insert.
|
|
509
|
+
// The profile or group was deleted between taskProfileError and the insert.
|
|
510
|
+
if (modelGroupRefError(error)) {
|
|
511
|
+
jsonError(res, `Unknown model group "${body.modelGroup}".`, 400);
|
|
512
|
+
return true;
|
|
513
|
+
}
|
|
502
514
|
if (modelProfileRefError(error) === "missing") {
|
|
503
515
|
jsonError(res, `Unknown model profile "${body.profile}".`, 400);
|
|
504
516
|
return true;
|
|
@@ -518,6 +530,25 @@ export async function handleSchedules(
|
|
|
518
530
|
return true;
|
|
519
531
|
}
|
|
520
532
|
|
|
533
|
+
// A schedule runs as its creator. An agent-bound token may run it only as
|
|
534
|
+
// its creator or a lead.
|
|
535
|
+
if (
|
|
536
|
+
getRequestAuth(req)?.kind === "agent" &&
|
|
537
|
+
!can({
|
|
538
|
+
principal: await agentFirstPrincipal(req, myAgentId),
|
|
539
|
+
verb: "schedule.run.any",
|
|
540
|
+
resource: { kind: "owned", ownerAgentId: schedule.createdByAgentId },
|
|
541
|
+
source: "http",
|
|
542
|
+
}).allow
|
|
543
|
+
) {
|
|
544
|
+
jsonError(
|
|
545
|
+
res,
|
|
546
|
+
`Schedule "${schedule.name}" runs as the agent that created it. Only that agent or a lead can run it.`,
|
|
547
|
+
403,
|
|
548
|
+
);
|
|
549
|
+
return true;
|
|
550
|
+
}
|
|
551
|
+
|
|
521
552
|
if (!schedule.enabled) {
|
|
522
553
|
jsonError(res, "Schedule is disabled", 400);
|
|
523
554
|
return true;
|
|
@@ -671,7 +702,12 @@ export async function handleSchedules(
|
|
|
671
702
|
if (parsed.body.modelTier !== undefined || normalizedModel.modelTier) {
|
|
672
703
|
body.modelTier = normalizedModel.modelTier ?? null;
|
|
673
704
|
}
|
|
674
|
-
} else if (
|
|
705
|
+
} else if (
|
|
706
|
+
agentChanged &&
|
|
707
|
+
existing.model &&
|
|
708
|
+
!profileUpdate.fields.profile &&
|
|
709
|
+
!profileUpdate.fields.modelGroup
|
|
710
|
+
) {
|
|
675
711
|
// Harness only: the stored id already passed the catalog check when it was written.
|
|
676
712
|
const modelError = await explicitModelErrorForAgent({
|
|
677
713
|
model: existing.model,
|
|
@@ -774,6 +810,10 @@ export async function handleSchedules(
|
|
|
774
810
|
|
|
775
811
|
// Recalculate nextRunAt when timing fields or enabled status changes
|
|
776
812
|
const newEnabled = parsed.body.enabled !== undefined ? parsed.body.enabled : existing.enabled;
|
|
813
|
+
const cronTimezoneChanged =
|
|
814
|
+
Boolean(existing.cronExpression) &&
|
|
815
|
+
parsed.body.timezone !== undefined &&
|
|
816
|
+
parsed.body.timezone !== existing.timezone;
|
|
777
817
|
if (existing.scheduleType === "one_time") {
|
|
778
818
|
if (!newEnabled) {
|
|
779
819
|
body.nextRunAt = null;
|
|
@@ -784,6 +824,7 @@ export async function handleSchedules(
|
|
|
784
824
|
} else if (
|
|
785
825
|
parsed.body.cronExpression !== undefined ||
|
|
786
826
|
parsed.body.intervalMs !== undefined ||
|
|
827
|
+
cronTimezoneChanged ||
|
|
787
828
|
(parsed.body.enabled === true && !existing.enabled)
|
|
788
829
|
) {
|
|
789
830
|
const timing = mergeScheduleTiming(
|
|
@@ -793,15 +834,18 @@ export async function handleSchedules(
|
|
|
793
834
|
},
|
|
794
835
|
{ cronExpression: parsed.body.cronExpression, intervalMs: parsed.body.intervalMs },
|
|
795
836
|
);
|
|
796
|
-
const mergedTimezone =
|
|
797
|
-
parsed.body.timezone !== undefined ? parsed.body.timezone : existing.timezone;
|
|
798
837
|
if (timing.mergedCron || timing.mergedInterval) {
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
838
|
+
try {
|
|
839
|
+
body.nextRunAt = calculateNextRun({
|
|
840
|
+
...existing,
|
|
841
|
+
cronExpression: timing.mergedCron ?? undefined,
|
|
842
|
+
intervalMs: timing.mergedInterval ?? undefined,
|
|
843
|
+
timezone: parsed.body.timezone ?? existing.timezone,
|
|
844
|
+
});
|
|
845
|
+
} catch {
|
|
846
|
+
jsonError(res, "Cannot calculate the next run for this schedule.", 400);
|
|
847
|
+
return true;
|
|
848
|
+
}
|
|
805
849
|
}
|
|
806
850
|
}
|
|
807
851
|
}
|
|
@@ -814,7 +858,11 @@ export async function handleSchedules(
|
|
|
814
858
|
try {
|
|
815
859
|
schedule = await updateScheduledTask(parsed.params.id, body);
|
|
816
860
|
} catch (error) {
|
|
817
|
-
// The profile was deleted between scheduleProfileUpdate and the write.
|
|
861
|
+
// The profile or group was deleted between scheduleProfileUpdate and the write.
|
|
862
|
+
if (modelGroupRefError(error)) {
|
|
863
|
+
jsonError(res, `Unknown model group "${body.modelGroup}".`, 400);
|
|
864
|
+
return true;
|
|
865
|
+
}
|
|
818
866
|
if (modelProfileRefError(error) !== "missing") throw error;
|
|
819
867
|
jsonError(res, `Unknown model profile "${body.profile}".`, 400);
|
|
820
868
|
return true;
|
|
@@ -192,9 +192,11 @@ export async function handleScriptConnectionProxy(
|
|
|
192
192
|
);
|
|
193
193
|
mcpCallRoute.respond(res, 200, result);
|
|
194
194
|
} catch (err) {
|
|
195
|
+
// callMcpServerTool scrubs the upstream result and its own errors. This
|
|
196
|
+
// also covers errors raised while resolving the server and its headers.
|
|
195
197
|
mcpCallRoute.respond(res, 200, {
|
|
196
198
|
ok: false,
|
|
197
|
-
error: err instanceof Error ? err.message : String(err),
|
|
199
|
+
error: scrubSecrets(err instanceof Error ? err.message : String(err)),
|
|
198
200
|
});
|
|
199
201
|
}
|
|
200
202
|
return true;
|
package/src/http/script-runs.ts
CHANGED
|
@@ -31,6 +31,8 @@ import { lintWorkflowLabels } from "../script-workflows/label-lint";
|
|
|
31
31
|
import { scriptRunMaxAgentTasks, scriptRunMaxSteps } from "../script-workflows/limits";
|
|
32
32
|
import {
|
|
33
33
|
abortScriptRunLimit,
|
|
34
|
+
DURABLE_RUNS_NATIVE_REFUSED,
|
|
35
|
+
durableScriptRunsAllowed,
|
|
34
36
|
startScriptRunProcess,
|
|
35
37
|
terminateScriptRunProcess,
|
|
36
38
|
} from "../script-workflows/supervisor";
|
|
@@ -49,7 +51,7 @@ import {
|
|
|
49
51
|
ScriptRunStatusSchema,
|
|
50
52
|
TERMINAL_SCRIPT_RUN_STATUSES,
|
|
51
53
|
} from "../types";
|
|
52
|
-
import { getAppUrl,
|
|
54
|
+
import { getAppUrl, getScriptApiBaseUrl } from "../utils/constants";
|
|
53
55
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
54
56
|
import {
|
|
55
57
|
executeRawLlm,
|
|
@@ -82,6 +84,10 @@ const listScriptRunsQuerySchema = z.object({
|
|
|
82
84
|
status: ScriptRunStatusSchema.optional(),
|
|
83
85
|
agentId: z.string().optional(),
|
|
84
86
|
scriptName: z.string().optional(),
|
|
87
|
+
/** Object calls on this durable script. */
|
|
88
|
+
objectScriptId: z.string().optional(),
|
|
89
|
+
/** One object of that script. */
|
|
90
|
+
objectId: z.string().optional(),
|
|
85
91
|
limit: z.coerce.number().int().min(1).max(500).optional(),
|
|
86
92
|
offset: z.coerce.number().int().min(0).optional(),
|
|
87
93
|
});
|
|
@@ -447,6 +453,11 @@ export async function handleScriptRuns(
|
|
|
447
453
|
const agent = await requireAgent(res, agentId);
|
|
448
454
|
if (!agent) return true;
|
|
449
455
|
|
|
456
|
+
if (!durableScriptRunsAllowed()) {
|
|
457
|
+
jsonError(res, DURABLE_RUNS_NATIVE_REFUSED, 400);
|
|
458
|
+
return true;
|
|
459
|
+
}
|
|
460
|
+
|
|
450
461
|
const secretRefusal = refuseSourceWithSecrets(parsed.body.source);
|
|
451
462
|
if (secretRefusal) {
|
|
452
463
|
json(res, secretRefusal, 400);
|
|
@@ -508,7 +519,7 @@ export async function handleScriptRuns(
|
|
|
508
519
|
const { run, existing } = creation;
|
|
509
520
|
|
|
510
521
|
if (!existing && parsed.body.background) {
|
|
511
|
-
startScriptRunProcess(run,
|
|
522
|
+
startScriptRunProcess(run, getScriptApiBaseUrl(), bearerToken(req)).catch(async (err) => {
|
|
512
523
|
await updateScriptRun(run.id, {
|
|
513
524
|
status: "failed",
|
|
514
525
|
pid: null,
|
|
@@ -537,20 +548,20 @@ export async function handleScriptRuns(
|
|
|
537
548
|
if (listScriptRunsRoute.match(req.method, pathSegments)) {
|
|
538
549
|
const parsed = await listScriptRunsRoute.parse(req, res, pathSegments, queryParams);
|
|
539
550
|
if (!parsed) return true;
|
|
540
|
-
const
|
|
551
|
+
const filter = {
|
|
541
552
|
status: parsed.query.status,
|
|
542
553
|
agentId: parsed.query.agentId,
|
|
543
554
|
scriptName: parsed.query.scriptName,
|
|
544
|
-
|
|
545
|
-
|
|
555
|
+
objectScriptId: parsed.query.objectScriptId,
|
|
556
|
+
objectId: parsed.query.objectId,
|
|
546
557
|
};
|
|
547
558
|
listScriptRunsRoute.respond(res, 200, {
|
|
548
|
-
runs: await listScriptRuns(
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
scriptName: opts.scriptName,
|
|
559
|
+
runs: await listScriptRuns({
|
|
560
|
+
...filter,
|
|
561
|
+
limit: parsed.query.limit ?? 50,
|
|
562
|
+
offset: parsed.query.offset ?? 0,
|
|
553
563
|
}),
|
|
564
|
+
total: await countScriptRuns(filter),
|
|
554
565
|
});
|
|
555
566
|
return true;
|
|
556
567
|
}
|