@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
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
releaseTask,
|
|
18
18
|
} from "../db";
|
|
19
19
|
import { type AgentTaskRow, rowToAgentTask } from "../db/tasks/read";
|
|
20
|
+
import { resolveGroupForAgent } from "../model-group-resolution";
|
|
20
21
|
import { checkProfileForAgent, runtimeReadsRepoSecrets } from "../model-profile-check";
|
|
21
22
|
import { poolTaskRunsOnHarness } from "../model-validation";
|
|
22
23
|
import {
|
|
@@ -194,22 +195,35 @@ export async function routePoolTasks(
|
|
|
194
195
|
task: AgentTask,
|
|
195
196
|
viaWake: boolean,
|
|
196
197
|
): Promise<boolean> => {
|
|
197
|
-
|
|
198
|
+
// A model group task waits for an agent with a member that passes; a hop's
|
|
199
|
+
// resume names its member as `profile`, which wins.
|
|
200
|
+
const profile = task.profile;
|
|
201
|
+
const group = profile ? undefined : task.modelGroup;
|
|
202
|
+
if (!profile && !group) return true;
|
|
198
203
|
for (const includeRepoSecrets of secretViews(agent, viaWake)) {
|
|
199
204
|
const memoKey = JSON.stringify([
|
|
200
205
|
agent.id,
|
|
201
|
-
|
|
206
|
+
profile ? "profile" : "group",
|
|
207
|
+
profile ?? group,
|
|
202
208
|
task.vcsRepo ?? null,
|
|
203
209
|
includeRepoSecrets,
|
|
204
210
|
]);
|
|
205
211
|
let ok = profileOk.get(memoKey);
|
|
206
212
|
if (ok === undefined) {
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
+
if (profile) {
|
|
214
|
+
const result = await checkProfileForAgent(agent.id, profile, {
|
|
215
|
+
vcsRepo: task.vcsRepo,
|
|
216
|
+
includeRepoSecrets,
|
|
217
|
+
fallbacks: false,
|
|
218
|
+
});
|
|
219
|
+
ok = result?.ok !== false;
|
|
220
|
+
} else {
|
|
221
|
+
const resolution = await resolveGroupForAgent(group as string, agent.id, {
|
|
222
|
+
vcsRepo: task.vcsRepo,
|
|
223
|
+
includeRepoSecrets,
|
|
224
|
+
});
|
|
225
|
+
ok = resolution.kind !== "none";
|
|
226
|
+
}
|
|
213
227
|
profileOk.set(memoKey, ok);
|
|
214
228
|
}
|
|
215
229
|
if (!ok) return false;
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
type CredentialBinding,
|
|
15
15
|
placeholderForConfigKey,
|
|
16
16
|
} from "@/scripts-runtime/credential-broker";
|
|
17
|
+
import { createSsrfGuardedFetch } from "@/utils/egress-guard";
|
|
17
18
|
import { refreshSecretScrubberCache } from "@/utils/secret-scrubber";
|
|
18
19
|
import { listMcpServerTools } from "./mcp-proxy";
|
|
19
20
|
import { assertPostgresDsn } from "./sql-connections";
|
|
@@ -1510,7 +1511,10 @@ export async function fetchOpenapiSpec(
|
|
|
1510
1511
|
Accept: "application/json, application/yaml;q=0.9, text/yaml;q=0.8, */*;q=0.5",
|
|
1511
1512
|
});
|
|
1512
1513
|
if (opts.etag) headers.set("If-None-Match", opts.etag);
|
|
1513
|
-
|
|
1514
|
+
// Guarded: each hop resolves the name and connects only to a checked address.
|
|
1515
|
+
const fetchImpl =
|
|
1516
|
+
openapiSpecFetchForTesting ??
|
|
1517
|
+
createSsrfGuardedFetch(openapiSpecUrlOptions(), Bun.fetch as typeof fetch);
|
|
1514
1518
|
let response: Response | null = null;
|
|
1515
1519
|
for (let hop = 0; hop <= 5; hop += 1) {
|
|
1516
1520
|
response = await fetchImpl(parsed, {
|
|
@@ -14,7 +14,34 @@ import { resolveAgentFsIdentity } from "./agent-fs-identity";
|
|
|
14
14
|
import { getResolvedConfig } from "./db";
|
|
15
15
|
import { resolveOAuthBindingToken } from "./oauth-credential-bindings";
|
|
16
16
|
import { listRelationalCredentialBindings } from "./script-connections";
|
|
17
|
-
import { isApiOnlyConfigKey, isInternalConfigKey } from "./swarm-config-guard";
|
|
17
|
+
import { isApiOnlyConfigKey, isInternalConfigKey, isReservedConfigKey } from "./swarm-config-guard";
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Binding keys that may also resolve from the API process env when no config
|
|
21
|
+
* row holds them. Only the documented default GitHub binding. Every other
|
|
22
|
+
* binding resolves from swarm_config rows alone.
|
|
23
|
+
*/
|
|
24
|
+
const ENV_FALLBACK_CONFIG_KEYS = new Set(["GITHUB_TOKEN"]);
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* The value a config binding substitutes. Reserved, API-only and internal keys
|
|
28
|
+
* never resolve, from config or from the env.
|
|
29
|
+
*/
|
|
30
|
+
function resolveBindingConfigValue(
|
|
31
|
+
configMap: Map<string, string>,
|
|
32
|
+
configKey: string,
|
|
33
|
+
): string | undefined {
|
|
34
|
+
if (
|
|
35
|
+
isReservedConfigKey(configKey) ||
|
|
36
|
+
isApiOnlyConfigKey(configKey) ||
|
|
37
|
+
isInternalConfigKey(configKey)
|
|
38
|
+
) {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
const value = configMap.get(configKey);
|
|
42
|
+
if (value !== undefined) return value;
|
|
43
|
+
return ENV_FALLBACK_CONFIG_KEYS.has(configKey) ? process.env[configKey] : undefined;
|
|
44
|
+
}
|
|
18
45
|
|
|
19
46
|
// Relational-only credential binding store. The legacy SCRIPT_CREDENTIAL_BINDINGS
|
|
20
47
|
// swarm-config JSON blob is retired (migrated to relational rows at boot), so
|
|
@@ -103,7 +130,7 @@ export async function buildScriptCredentialBindingsWithFailures(input: {
|
|
|
103
130
|
const configMap = new Map(resolvedConfigs.map((config) => [config.key, config.value]));
|
|
104
131
|
const broker = new CredentialBroker(
|
|
105
132
|
new RelationalCredentialBindingStore(),
|
|
106
|
-
(configKey) => configMap
|
|
133
|
+
(configKey) => resolveBindingConfigValue(configMap, configKey),
|
|
107
134
|
defaultCredentialBindings(),
|
|
108
135
|
(oauthAuthorizationId) => resolveOAuthBindingToken(oauthAuthorizationId),
|
|
109
136
|
);
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
import { MAX_KV_BODY_BYTES } from "../../kv-limits";
|
|
2
|
+
import {
|
|
3
|
+
DEFAULT_SCRIPT_RESOURCES,
|
|
4
|
+
type ScriptCaller,
|
|
5
|
+
type ScriptExecutorName,
|
|
6
|
+
type ScriptFsMode,
|
|
7
|
+
} from "../../scripts-runtime/executors/types";
|
|
8
|
+
import type { RunScriptInput, RunScriptOutput } from "../../scripts-runtime/loader";
|
|
9
|
+
import type { ScriptRecord } from "../../types";
|
|
10
|
+
import type { ScriptRunProvenance } from "../../utils/request-auth-context";
|
|
11
|
+
import { scrubSecrets } from "../../utils/secret-scrubber";
|
|
12
|
+
import { claimKv, deleteKv, getDbClient, getKv, upsertKv } from "../db";
|
|
13
|
+
import { runScriptWithRunCredential } from "./run-credential";
|
|
14
|
+
|
|
15
|
+
type DurableState = { codeVersion: number; stateVersion: number; state: unknown };
|
|
16
|
+
|
|
17
|
+
export type DurableCallInput = Pick<
|
|
18
|
+
RunScriptInput,
|
|
19
|
+
| "runtimeInstanceId"
|
|
20
|
+
| "sourceTaskId"
|
|
21
|
+
| "egressSecrets"
|
|
22
|
+
| "failedBindings"
|
|
23
|
+
| "userConfig"
|
|
24
|
+
| "agentFs"
|
|
25
|
+
| "apiConnections"
|
|
26
|
+
| "mcpConnections"
|
|
27
|
+
> & {
|
|
28
|
+
script: ScriptRecord;
|
|
29
|
+
objectId: string;
|
|
30
|
+
method: string;
|
|
31
|
+
args?: unknown;
|
|
32
|
+
agentId: string;
|
|
33
|
+
caller: ScriptCaller;
|
|
34
|
+
provenance?: ScriptRunProvenance;
|
|
35
|
+
executor?: ScriptExecutorName | null;
|
|
36
|
+
fsMode?: ScriptFsMode;
|
|
37
|
+
nested?: boolean;
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
export type DurableCallResult =
|
|
41
|
+
| {
|
|
42
|
+
ok: true;
|
|
43
|
+
output: RunScriptOutput;
|
|
44
|
+
object: { id: string; stateVersion: number; destroyed: boolean };
|
|
45
|
+
}
|
|
46
|
+
| {
|
|
47
|
+
ok: false;
|
|
48
|
+
code: "busy" | "reentry" | "not_callable" | "too_large" | "lease_lost" | "run_failed";
|
|
49
|
+
message: string;
|
|
50
|
+
output?: RunScriptOutput;
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
/** Execute one object method and commit its state while the lease remains valid. */
|
|
54
|
+
export async function callDurableObject({
|
|
55
|
+
script,
|
|
56
|
+
objectId,
|
|
57
|
+
method,
|
|
58
|
+
args,
|
|
59
|
+
agentId,
|
|
60
|
+
caller,
|
|
61
|
+
provenance = {},
|
|
62
|
+
executor,
|
|
63
|
+
fsMode,
|
|
64
|
+
nested = false,
|
|
65
|
+
...runContext
|
|
66
|
+
}: DurableCallInput): Promise<DurableCallResult> {
|
|
67
|
+
let signature: { kind?: string; methods?: Record<string, unknown> };
|
|
68
|
+
try {
|
|
69
|
+
signature = JSON.parse(script.signatureJson);
|
|
70
|
+
} catch {
|
|
71
|
+
return { ok: false, code: "not_callable", message: "not callable" };
|
|
72
|
+
}
|
|
73
|
+
if (
|
|
74
|
+
signature?.kind !== "durable" ||
|
|
75
|
+
!signature.methods ||
|
|
76
|
+
!Object.hasOwn(signature.methods, method)
|
|
77
|
+
) {
|
|
78
|
+
return { ok: false, code: "not_callable", message: "not callable" };
|
|
79
|
+
}
|
|
80
|
+
const identity = `${script.id}:${objectId}`;
|
|
81
|
+
const objectChain = provenance.objectChain ?? [];
|
|
82
|
+
if (objectChain.includes(identity)) {
|
|
83
|
+
return { ok: false, code: "reentry", message: "already in this call chain" };
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const namespace = `durable:${script.id}`;
|
|
87
|
+
const leaseKey = `lease/${objectId}`;
|
|
88
|
+
const stateKey = `state/${objectId}`;
|
|
89
|
+
const token = crypto.randomUUID();
|
|
90
|
+
const deadline = Date.now() + (nested ? 5_000 : 30_000);
|
|
91
|
+
for (;;) {
|
|
92
|
+
if (
|
|
93
|
+
await claimKv({
|
|
94
|
+
namespace,
|
|
95
|
+
key: leaseKey,
|
|
96
|
+
value: { token },
|
|
97
|
+
valueType: "json",
|
|
98
|
+
expiresAt: Date.now() + DEFAULT_SCRIPT_RESOURCES.wallClockMs + 10_000,
|
|
99
|
+
})
|
|
100
|
+
)
|
|
101
|
+
break;
|
|
102
|
+
const remaining = deadline - Date.now();
|
|
103
|
+
if (remaining <= 0) return { ok: false, code: "busy", message: "object busy" };
|
|
104
|
+
await Bun.sleep(Math.min(remaining, 50 + Math.floor(Math.random() * 351)));
|
|
105
|
+
if (Date.now() >= deadline) return { ok: false, code: "busy", message: "object busy" };
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
const client = getDbClient();
|
|
109
|
+
const release = async () => {
|
|
110
|
+
await client.transaction(async () => {
|
|
111
|
+
const lease = await getKv(namespace, leaseKey);
|
|
112
|
+
if ((lease?.value as { token?: string } | undefined)?.token === token) {
|
|
113
|
+
await deleteKv(namespace, leaseKey);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
};
|
|
117
|
+
|
|
118
|
+
let output: RunScriptOutput | undefined;
|
|
119
|
+
try {
|
|
120
|
+
const entry = await getKv(namespace, stateKey);
|
|
121
|
+
const stored = entry?.value as DurableState | undefined;
|
|
122
|
+
output = await runScriptWithRunCredential(
|
|
123
|
+
{
|
|
124
|
+
...runContext,
|
|
125
|
+
source: script.source,
|
|
126
|
+
args,
|
|
127
|
+
agentId,
|
|
128
|
+
executor: executor === undefined ? script.executor : executor,
|
|
129
|
+
fsMode: fsMode ?? script.fsMode,
|
|
130
|
+
signal: AbortSignal.timeout(DEFAULT_SCRIPT_RESOURCES.wallClockMs),
|
|
131
|
+
durable: {
|
|
132
|
+
id: objectId,
|
|
133
|
+
method,
|
|
134
|
+
state: stored?.state,
|
|
135
|
+
codeVersion: script.version,
|
|
136
|
+
storedCodeVersion: stored?.codeVersion ?? script.version,
|
|
137
|
+
caller,
|
|
138
|
+
},
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
...provenance,
|
|
142
|
+
objectChain: [...objectChain, identity],
|
|
143
|
+
depth: (provenance.depth ?? 0) + 1,
|
|
144
|
+
},
|
|
145
|
+
);
|
|
146
|
+
if (output.error || output.exitCode !== 0 || !output.durable) {
|
|
147
|
+
await release();
|
|
148
|
+
return { ok: false, code: "run_failed", message: "object run failed", output };
|
|
149
|
+
}
|
|
150
|
+
const { state, destroyed } = output.durable;
|
|
151
|
+
const ttl = output.durable.idleTtlSec;
|
|
152
|
+
const idleTtlSec = typeof ttl === "number" && Number.isFinite(ttl) && ttl > 0 ? ttl : null;
|
|
153
|
+
const encoded = JSON.stringify(state);
|
|
154
|
+
if (encoded === undefined) {
|
|
155
|
+
await release();
|
|
156
|
+
return { ok: false, code: "run_failed", message: "state must be JSON-serializable" };
|
|
157
|
+
}
|
|
158
|
+
if (Buffer.byteLength(encoded, "utf8") > MAX_KV_BODY_BYTES) {
|
|
159
|
+
await release();
|
|
160
|
+
return { ok: false, code: "too_large", message: "state too large" };
|
|
161
|
+
}
|
|
162
|
+
// A version bump is a change too, so `migrate` runs once per code version.
|
|
163
|
+
const changed =
|
|
164
|
+
!stored || stored.codeVersion !== script.version || encoded !== JSON.stringify(stored.state);
|
|
165
|
+
const stateVersion = (stored?.stateVersion ?? 0) + (!destroyed && changed ? 1 : 0);
|
|
166
|
+
const committed = await client.transaction(async () => {
|
|
167
|
+
const lease = await getKv(namespace, leaseKey);
|
|
168
|
+
if ((lease?.value as { token?: string } | undefined)?.token !== token) return false;
|
|
169
|
+
if (destroyed) {
|
|
170
|
+
await deleteKv(namespace, stateKey);
|
|
171
|
+
} else if (changed) {
|
|
172
|
+
await upsertKv({
|
|
173
|
+
namespace,
|
|
174
|
+
key: stateKey,
|
|
175
|
+
value: { codeVersion: script.version, stateVersion, state },
|
|
176
|
+
valueType: "json",
|
|
177
|
+
expiresAt: idleTtlSec !== null ? Date.now() + idleTtlSec * 1000 : null,
|
|
178
|
+
});
|
|
179
|
+
} else if (idleTtlSec !== null) {
|
|
180
|
+
const expiresAt = Date.now() + idleTtlSec * 1000;
|
|
181
|
+
const refreshed = await client.run(
|
|
182
|
+
"UPDATE kv_entries SET expires_at = ? WHERE namespace = ? AND key = ?",
|
|
183
|
+
[expiresAt, namespace, stateKey],
|
|
184
|
+
);
|
|
185
|
+
// A generic KV read can remove the expired row while the method runs.
|
|
186
|
+
if (refreshed.changes === 0) {
|
|
187
|
+
await upsertKv({ namespace, key: stateKey, value: stored, valueType: "json", expiresAt });
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
await deleteKv(namespace, leaseKey);
|
|
191
|
+
return true;
|
|
192
|
+
});
|
|
193
|
+
if (!committed) return { ok: false, code: "lease_lost", message: "lease lost" };
|
|
194
|
+
return { ok: true, output, object: { id: objectId, stateVersion, destroyed } };
|
|
195
|
+
} catch (error) {
|
|
196
|
+
await release();
|
|
197
|
+
return {
|
|
198
|
+
ok: false,
|
|
199
|
+
code: "run_failed",
|
|
200
|
+
message: scrubSecrets(error instanceof Error ? error.message : "object run failed"),
|
|
201
|
+
output,
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
}
|
|
@@ -7,8 +7,15 @@
|
|
|
7
7
|
* Extraction is best-effort and non-blocking — failures return null.
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
|
+
import { chown } from "node:fs/promises";
|
|
10
11
|
import { fileURLToPath } from "node:url";
|
|
11
|
-
import {
|
|
12
|
+
import { readRunDirFile } from "../../scripts-runtime/executors/native";
|
|
13
|
+
import { getDeploymentScriptExecutorName } from "../../scripts-runtime/executors/registry";
|
|
14
|
+
import {
|
|
15
|
+
buildSandboxedCommand,
|
|
16
|
+
DEFAULT_SANDBOX_LIMITS,
|
|
17
|
+
resolveSandboxIdentity,
|
|
18
|
+
} from "../../utils/sandboxed-process";
|
|
12
19
|
|
|
13
20
|
const TIMEOUT_MS = 5_000;
|
|
14
21
|
|
|
@@ -20,6 +27,12 @@ function extractorPath(): string {
|
|
|
20
27
|
}
|
|
21
28
|
|
|
22
29
|
export async function extractArgsJsonSchema(source: string): Promise<string | null> {
|
|
30
|
+
// The extractor evaluates the module in native Bun. A deployment pinned to
|
|
31
|
+
// quickjs must not run script code natively, so no schema is extracted there;
|
|
32
|
+
// the quickjs runner still validates args against `argsSchema` at run time.
|
|
33
|
+
// shortcut: no argsJsonSchema under SCRIPT_EXECUTOR=quickjs; extract inside quickjs to restore it.
|
|
34
|
+
if (getDeploymentScriptExecutorName() === "quickjs") return null;
|
|
35
|
+
|
|
23
36
|
const tmpdir = `${process.env.TMPDIR ?? "/tmp"}/schema-extract-${crypto.randomUUID()}`;
|
|
24
37
|
|
|
25
38
|
try {
|
|
@@ -28,20 +41,34 @@ export async function extractArgsJsonSchema(source: string): Promise<string | nu
|
|
|
28
41
|
const sourceFile = `${tmpdir}/source.ts`;
|
|
29
42
|
const resultFile = `${tmpdir}/result.json`;
|
|
30
43
|
await Bun.write(sourceFile, source);
|
|
44
|
+
// Same identity as the native script executor: nobody:nogroup on a root API.
|
|
45
|
+
// The extractor writes its shims, the user module and the result here.
|
|
46
|
+
const runAs = resolveSandboxIdentity();
|
|
47
|
+
if (runAs) {
|
|
48
|
+
await Promise.all([tmpdir, sourceFile].map((path) => chown(path, runAs.uid, runAs.gid)));
|
|
49
|
+
}
|
|
31
50
|
|
|
32
51
|
// The extractor imports user-supplied source. Run it under the same ulimit
|
|
33
52
|
// sandbox and --no-orphans wrapper as a script run, so a hostile argsSchema
|
|
34
53
|
// module gets the memory, CPU, process and file caps of the runtime.
|
|
35
54
|
const env: Record<string, string> = {
|
|
36
55
|
PATH: process.env.PATH ?? "/usr/bin:/bin",
|
|
37
|
-
|
|
56
|
+
// The dropped identity cannot use the API's HOME.
|
|
57
|
+
HOME: runAs ? tmpdir : (process.env.HOME ?? "/tmp"),
|
|
38
58
|
TMPDIR: tmpdir,
|
|
39
59
|
SWARM_SCHEMA_SOURCE_FILE: sourceFile,
|
|
40
60
|
SWARM_SCHEMA_RESULT_FILE: resultFile,
|
|
41
61
|
SWARM_SCHEMA_TMPDIR: tmpdir,
|
|
42
62
|
};
|
|
43
63
|
if (process.env.SCRIPT_RUNTIME_DIR) env.SCRIPT_RUNTIME_DIR = process.env.SCRIPT_RUNTIME_DIR;
|
|
44
|
-
const
|
|
64
|
+
const command = buildSandboxedCommand(
|
|
65
|
+
["bun", "run", extractorPath()],
|
|
66
|
+
env,
|
|
67
|
+
DEFAULT_SANDBOX_LIMITS,
|
|
68
|
+
"inline",
|
|
69
|
+
runAs,
|
|
70
|
+
);
|
|
71
|
+
const proc = Bun.spawn(command, {
|
|
45
72
|
env,
|
|
46
73
|
cwd: tmpdir,
|
|
47
74
|
stdout: "ignore",
|
|
@@ -54,7 +81,12 @@ export async function extractArgsJsonSchema(source: string): Promise<string | nu
|
|
|
54
81
|
|
|
55
82
|
if (exitCode !== 0) return null;
|
|
56
83
|
|
|
57
|
-
|
|
84
|
+
// The child owns the tmpdir: read its result only through the checked reader.
|
|
85
|
+
const result = await readRunDirFile(resultFile, {
|
|
86
|
+
maxBytes: DEFAULT_SANDBOX_LIMITS.maxFileKb * 1024,
|
|
87
|
+
...(runAs ? { ownerUid: runAs.uid } : {}),
|
|
88
|
+
});
|
|
89
|
+
if (result === undefined) return null;
|
|
58
90
|
const parsed: unknown = JSON.parse(result);
|
|
59
91
|
if (parsed === null) return null;
|
|
60
92
|
return JSON.stringify(parsed);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type RunScriptInput, type RunScriptOutput, runScript } from "../../scripts-runtime/loader";
|
|
2
|
+
import type { ScriptRunProvenance } from "../../utils/request-auth-context";
|
|
2
3
|
import { getAgentById } from "../db";
|
|
3
4
|
import {
|
|
4
5
|
mintScriptRunToken,
|
|
@@ -35,14 +36,6 @@ export type ScriptApiCredential = {
|
|
|
35
36
|
release: () => Promise<void>;
|
|
36
37
|
};
|
|
37
38
|
|
|
38
|
-
/**
|
|
39
|
-
* Where a script run came from, bound to its token so the rows it creates can
|
|
40
|
-
* be traced back (`sourceStepId`, `parentScriptRunId`). `sourceStepId` is the
|
|
41
|
-
* swarm-script workflow step that started the run, inherited by nested runs;
|
|
42
|
-
* `sourceScriptRunId` is the run's own `script_runs` id.
|
|
43
|
-
*/
|
|
44
|
-
export type ScriptRunProvenance = { sourceStepId?: string; sourceScriptRunId?: string };
|
|
45
|
-
|
|
46
39
|
/**
|
|
47
40
|
* Resolve the api credential a script run acts as. When the run has a real
|
|
48
41
|
* executing agent, mint a short-lived token bound to it so `ctx.swarm` calls
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { fileURLToPath } from "node:url";
|
|
2
2
|
import ts from "typescript";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
getScriptAppTypes,
|
|
5
|
+
getScriptAppTypesReport,
|
|
6
|
+
scriptAppTypesWarnings,
|
|
7
|
+
} from "@/apps/script-types";
|
|
4
8
|
import { getScriptApiTypes, getScriptMcpTypes } from "@/be/script-connections";
|
|
5
9
|
import type { ScriptTypeContext } from "./type-contributors";
|
|
6
10
|
|
|
@@ -26,7 +30,7 @@ export type ScriptDiagnostic = {
|
|
|
26
30
|
};
|
|
27
31
|
|
|
28
32
|
export type ScriptTypecheckResult =
|
|
29
|
-
| { ok: true }
|
|
33
|
+
| { ok: true; warnings?: string[] }
|
|
30
34
|
| { ok: false; diagnostics: string[]; structured: ScriptDiagnostic[] };
|
|
31
35
|
|
|
32
36
|
export const SCRIPT_SDK_TYPES = `
|
|
@@ -477,7 +481,7 @@ export interface SwarmSdk {
|
|
|
477
481
|
schedule_list(args?: { enabled?: boolean; name?: string; scheduleType?: "recurring" | "one_time"; targetType?: "agent-task" | "workflow" | "script"; workflowId?: string; scriptName?: string; hideCompleted?: boolean; consecutiveErrorsMin?: number; lastRunStatus?: "failed" | "succeeded"; includeFull?: boolean }): Promise<unknown>;
|
|
478
482
|
// --- scripts ---
|
|
479
483
|
script_search(args: { query?: string; scope?: ScriptScope; limit?: number }): Promise<unknown>;
|
|
480
|
-
script_run(args: { name?: string; source?: string; args?: unknown; intent?: string; scope?: ScriptScope; fsMode?: ScriptFsMode; executor?: ScriptExecutorName | null; idempotencyKey?: string }): Promise<unknown>;
|
|
484
|
+
script_run(args: { name?: string; source?: string; object?: { id: string; method: string }; args?: unknown; intent?: string; scope?: ScriptScope; fsMode?: ScriptFsMode; executor?: ScriptExecutorName | null; idempotencyKey?: string }): Promise<unknown>;
|
|
481
485
|
// --- savings calibration (REST only) ---
|
|
482
486
|
/** The savings curve in use (shipped or derived from this deployment) and the stored row's metadata. */
|
|
483
487
|
savings_calibrationGet(): Promise<unknown>;
|
|
@@ -896,7 +900,25 @@ export interface ScriptShResult {
|
|
|
896
900
|
exitCode: number;
|
|
897
901
|
}
|
|
898
902
|
|
|
903
|
+
/** The invoking agent, or the saved script that made a nested call. */
|
|
904
|
+
export type ScriptCaller =
|
|
905
|
+
| { kind: "agent"; agentId: string }
|
|
906
|
+
| { kind: "script"; agentId: string; scriptId?: string; objectId?: string }
|
|
907
|
+
| null;
|
|
908
|
+
|
|
909
|
+
export abstract class DurableObject<S> {
|
|
910
|
+
constructor(id: string);
|
|
911
|
+
readonly id: string;
|
|
912
|
+
state: S;
|
|
913
|
+
abstract initialState(): S | Promise<S>;
|
|
914
|
+
migrate?(state: unknown, fromVersion: number): S | Promise<S>;
|
|
915
|
+
destroy(): void;
|
|
916
|
+
static idleTtlSec?: number;
|
|
917
|
+
}
|
|
918
|
+
|
|
899
919
|
export interface ScriptContext {
|
|
920
|
+
/** Frozen caller identity supplied by the host. */
|
|
921
|
+
caller: ScriptCaller;
|
|
900
922
|
run?: ScriptRunContext;
|
|
901
923
|
step?: ScriptWorkflowSteps;
|
|
902
924
|
swarm: SwarmSdk & { config: SwarmConfig };
|
|
@@ -1593,19 +1615,22 @@ export async function typecheckScript(
|
|
|
1593
1615
|
): Promise<ScriptTypecheckResult> {
|
|
1594
1616
|
const apiTypes = getScriptApiTypes(context);
|
|
1595
1617
|
const mcpTypes = getScriptMcpTypes(context);
|
|
1596
|
-
const
|
|
1618
|
+
const appTypesReport = await getScriptAppTypesReport(context, source);
|
|
1619
|
+
const appTypes = appTypesReport.source;
|
|
1597
1620
|
const sdkTypes = await scriptSdkTypesWithGeneratedApis(apiTypes, mcpTypes, appTypes);
|
|
1598
1621
|
const stdlibTypes = appTypes
|
|
1599
1622
|
? await scriptStdlibTypesWithGeneratedApis(apiTypes, mcpTypes, appTypes)
|
|
1600
1623
|
: SCRIPT_STDLIB_TYPES;
|
|
1601
|
-
|
|
1624
|
+
const result = await typecheckWithAmbient({
|
|
1602
1625
|
source,
|
|
1603
1626
|
modules: { "swarm-sdk": sdkTypes, stdlib: stdlibTypes },
|
|
1604
1627
|
checkFile: `/// <reference path="./runtime-globals.d.ts" />
|
|
1605
1628
|
import run from "./user-script";
|
|
1606
|
-
import type { ScriptMain } from "swarm-sdk";
|
|
1607
|
-
const _scriptMain: ScriptMain = run;
|
|
1629
|
+
import type { ScriptMain, DurableObject } from "swarm-sdk";
|
|
1630
|
+
const _scriptMain: ScriptMain | (abstract new (id: string) => DurableObject<any>) = run;
|
|
1608
1631
|
void _scriptMain;
|
|
1609
1632
|
`,
|
|
1610
1633
|
});
|
|
1634
|
+
const warnings = scriptAppTypesWarnings(source, appTypesReport.omitted);
|
|
1635
|
+
return result.ok && warnings.length > 0 ? { ok: true, warnings } : result;
|
|
1611
1636
|
}
|
|
@@ -467,7 +467,12 @@ export default async function memoryEval(args: any, ctx: any) {
|
|
|
467
467
|
try {
|
|
468
468
|
const kvResult = await ctx.swarm.kv_get({ key: KV_KEY, namespace: KV_NS });
|
|
469
469
|
const payload = kvResult?.data ?? kvResult;
|
|
470
|
-
|
|
470
|
+
// Keep only points with a YYYY-MM-DD date: the date sorts and labels the chart.
|
|
471
|
+
if (Array.isArray(payload?.value)) {
|
|
472
|
+
history = payload.value.filter(
|
|
473
|
+
(p: any) => typeof p?.date === "string" && /^\d{4}-\d{2}-\d{2}$/.test(p.date),
|
|
474
|
+
);
|
|
475
|
+
}
|
|
471
476
|
} catch (_e) {
|
|
472
477
|
// first run — no history yet
|
|
473
478
|
}
|
|
@@ -625,7 +630,11 @@ function buildMarkdownReport(r: any): string {
|
|
|
625
630
|
function buildDashboardHtml(report: any, history: DailyPoint[]): string {
|
|
626
631
|
const fmtNum = (v: unknown) =>
|
|
627
632
|
typeof v === "number" ? new Intl.NumberFormat("en-US").format(v) : String(v ?? "");
|
|
628
|
-
|
|
633
|
+
// Escape "<" and the JS line separators so the JSON cannot end the inline <script>.
|
|
634
|
+
const dataJson = JSON.stringify(history)
|
|
635
|
+
.replace(/</g, "\\u003c")
|
|
636
|
+
.replace(/\u2028/g, "\\u2028")
|
|
637
|
+
.replace(/\u2029/g, "\\u2029");
|
|
629
638
|
|
|
630
639
|
const metricCards = [
|
|
631
640
|
["Carry-forward", `${report.axis1.score}%`],
|
|
@@ -24,19 +24,38 @@ export default async function toolUsage(args: any, ctx: any) {
|
|
|
24
24
|
const limit = parsed.data.limit || 20;
|
|
25
25
|
const agentId = parsed.data.agentId;
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
// Tool names live inside the `content` JSON of session_logs (no dedicated
|
|
28
|
+
// column). The `"type":"tool_use"` filter skips tool_result lines, and
|
|
29
|
+
// instr/substr take the first tool name of each log line. session_logs has
|
|
30
|
+
// no agent column: the agent filter goes through the task that owns the log.
|
|
31
|
+
// Every value from args is a bound parameter.
|
|
32
|
+
const params: unknown[] = [`-${days} days`];
|
|
33
|
+
let agentFilter = "";
|
|
34
|
+
if (agentId) {
|
|
35
|
+
agentFilter = "AND taskId IN (SELECT id FROM agent_tasks WHERE agentId = ?)";
|
|
36
|
+
params.push(agentId);
|
|
37
|
+
}
|
|
38
|
+
params.push(limit);
|
|
28
39
|
const sql = `
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
40
|
+
WITH tu AS (
|
|
41
|
+
SELECT substr(content, instr(content, '"type":"tool_use"')) AS tail
|
|
42
|
+
FROM session_logs
|
|
43
|
+
WHERE content LIKE '%"type":"tool_use"%'
|
|
44
|
+
AND createdAt > datetime('now', ?)
|
|
45
|
+
${agentFilter}
|
|
46
|
+
),
|
|
47
|
+
nm AS (
|
|
48
|
+
SELECT substr(tail, instr(tail, '"name":"') + 8) AS rest
|
|
49
|
+
FROM tu WHERE instr(tail, '"name":"') > 0
|
|
50
|
+
)
|
|
51
|
+
SELECT substr(rest, 1, instr(rest, '"') - 1) AS tool_name, count(*) AS calls
|
|
52
|
+
FROM nm
|
|
34
53
|
GROUP BY tool_name
|
|
35
54
|
ORDER BY calls DESC
|
|
36
|
-
LIMIT
|
|
55
|
+
LIMIT ?
|
|
37
56
|
`;
|
|
38
57
|
|
|
39
|
-
const res: any = await ctx.swarm.db_query({ sql });
|
|
58
|
+
const res: any = await ctx.swarm.db_query({ sql, params });
|
|
40
59
|
const payload = res?.data ?? res;
|
|
41
60
|
const columns: string[] = payload?.columns ?? [];
|
|
42
61
|
const rows: any[] = (payload?.rows ?? []).map((row: any[]) =>
|