@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/apps.ts
CHANGED
|
@@ -38,6 +38,7 @@ import {
|
|
|
38
38
|
migrateAppSchema,
|
|
39
39
|
withAppDefinitionLock,
|
|
40
40
|
} from "../apps/schema-migrate";
|
|
41
|
+
import { appWriteTypesWarnings } from "../apps/script-types";
|
|
41
42
|
import {
|
|
42
43
|
appDefinitionNeedsRepair,
|
|
43
44
|
createApp,
|
|
@@ -62,7 +63,13 @@ import {
|
|
|
62
63
|
rollbackApp,
|
|
63
64
|
snapshotApp,
|
|
64
65
|
} from "../apps/version";
|
|
65
|
-
import {
|
|
66
|
+
import {
|
|
67
|
+
getAgentById,
|
|
68
|
+
getAppVersion,
|
|
69
|
+
getAppVersions,
|
|
70
|
+
getTaskById,
|
|
71
|
+
withFavoriteFlags,
|
|
72
|
+
} from "../be/db";
|
|
66
73
|
import type { RbacResource } from "../rbac";
|
|
67
74
|
import { can } from "../rbac";
|
|
68
75
|
import { APP_SESSION_KEY_PATTERN, appSessionContextKey } from "../tasks/context-key";
|
|
@@ -145,6 +152,8 @@ const AppSummarySchema = z.object({
|
|
|
145
152
|
icon: AppIconSchema.optional(),
|
|
146
153
|
createdAt: z.string(),
|
|
147
154
|
updatedAt: z.string(),
|
|
155
|
+
/** Whether the caller starred the app (an `app` favorite). */
|
|
156
|
+
favorite: z.boolean(),
|
|
148
157
|
});
|
|
149
158
|
|
|
150
159
|
/**
|
|
@@ -234,7 +243,9 @@ const AppUserConfigSchema = z.record(AppNameSchema, AppUserConfigFieldSchema);
|
|
|
234
243
|
const compatWarningsSchema = z
|
|
235
244
|
.array(z.string())
|
|
236
245
|
.optional()
|
|
237
|
-
.describe(
|
|
246
|
+
.describe(
|
|
247
|
+
"Advisory findings: quickjs-executor compatibility of the app's scripts, and whether the app lost its generated script types to the type budget.",
|
|
248
|
+
);
|
|
238
249
|
const appWriteResponseSchema = z.object({
|
|
239
250
|
app: AppRecordSchema,
|
|
240
251
|
migration: AppMigrationReportSchema,
|
|
@@ -1000,19 +1011,12 @@ function filtersFromQuery(
|
|
|
1000
1011
|
return { filters, issues };
|
|
1001
1012
|
}
|
|
1002
1013
|
|
|
1003
|
-
function compareValues(
|
|
1004
|
-
left: unknown,
|
|
1005
|
-
right: unknown,
|
|
1006
|
-
direction: "asc" | "desc",
|
|
1007
|
-
dateValues = false,
|
|
1008
|
-
): number {
|
|
1014
|
+
function compareValues(left: unknown, right: unknown, direction: "asc" | "desc"): number {
|
|
1009
1015
|
if (left === right) return 0;
|
|
1010
1016
|
if (left === undefined || left === null) return 1;
|
|
1011
1017
|
if (right === undefined || right === null) return -1;
|
|
1012
1018
|
let result: number;
|
|
1013
|
-
if (
|
|
1014
|
-
result = Date.parse(left) - Date.parse(right);
|
|
1015
|
-
} else if (typeof left === "number" && typeof right === "number") {
|
|
1019
|
+
if (typeof left === "number" && typeof right === "number") {
|
|
1016
1020
|
result = left - right;
|
|
1017
1021
|
} else if (typeof left === "boolean" && typeof right === "boolean") {
|
|
1018
1022
|
result = Number(left) - Number(right);
|
|
@@ -1026,6 +1030,30 @@ function rowValue(row: AppRow, column: string): unknown {
|
|
|
1026
1030
|
return Object.hasOwn(row, column) ? row[column] : undefined;
|
|
1027
1031
|
}
|
|
1028
1032
|
|
|
1033
|
+
// Sorts like compareValues but parses each date string once, not twice per
|
|
1034
|
+
// comparison: Date.parse inside the comparator froze the event loop for seconds
|
|
1035
|
+
// on large tables. Order is identical (nulls last, NaN compares as a tie).
|
|
1036
|
+
export function sortRowsByColumn(
|
|
1037
|
+
rows: AppRow[],
|
|
1038
|
+
column: string,
|
|
1039
|
+
dir: "asc" | "desc",
|
|
1040
|
+
dateValues: boolean,
|
|
1041
|
+
): AppRow[] {
|
|
1042
|
+
const keyed = rows.map((row) => {
|
|
1043
|
+
const value = rowValue(row, column);
|
|
1044
|
+
return { row, value, ts: dateValues && typeof value === "string" ? Date.parse(value) : 0 };
|
|
1045
|
+
});
|
|
1046
|
+
keyed.sort((a, b) => {
|
|
1047
|
+
if (dateValues && typeof a.value === "string" && typeof b.value === "string") {
|
|
1048
|
+
if (a.value === b.value) return 0;
|
|
1049
|
+
const result = a.ts - b.ts;
|
|
1050
|
+
return dir === "asc" ? result : -result;
|
|
1051
|
+
}
|
|
1052
|
+
return compareValues(a.value, b.value, dir);
|
|
1053
|
+
});
|
|
1054
|
+
return keyed.map((k) => k.row);
|
|
1055
|
+
}
|
|
1056
|
+
|
|
1029
1057
|
export function rowMatchesFilters(row: AppRow, filters: RowFilter[]): boolean {
|
|
1030
1058
|
return filters.every((filter) => rowValue(row, filter.column) === filter.value);
|
|
1031
1059
|
}
|
|
@@ -1043,17 +1071,13 @@ export function applyQuery(
|
|
|
1043
1071
|
);
|
|
1044
1072
|
const sort = query.sort;
|
|
1045
1073
|
if (sort) {
|
|
1046
|
-
selected =
|
|
1047
|
-
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
model.columns[sort.column]!.kind === "date"),
|
|
1054
|
-
);
|
|
1055
|
-
return result;
|
|
1056
|
-
});
|
|
1074
|
+
selected = sortRowsByColumn(
|
|
1075
|
+
selected,
|
|
1076
|
+
sort.column,
|
|
1077
|
+
sort.dir,
|
|
1078
|
+
SORTABLE_SYSTEM_DATE_COLUMNS.has(sort.column) ||
|
|
1079
|
+
(Object.hasOwn(model.columns, sort.column) && model.columns[sort.column]!.kind === "date"),
|
|
1080
|
+
);
|
|
1057
1081
|
}
|
|
1058
1082
|
return selected.slice(0, query.limit ?? 200);
|
|
1059
1083
|
}
|
|
@@ -1077,7 +1101,7 @@ export async function selectAppRows(
|
|
|
1077
1101
|
if (jsonFilterIssues.length > 0) throw new AppRowValidationError(jsonFilterIssues);
|
|
1078
1102
|
|
|
1079
1103
|
// SQL narrows the scan; the `===` re-check keeps the exact filter semantics.
|
|
1080
|
-
|
|
1104
|
+
let rows = (
|
|
1081
1105
|
await listAppRows(
|
|
1082
1106
|
appId,
|
|
1083
1107
|
modelName,
|
|
@@ -1088,6 +1112,7 @@ export async function selectAppRows(
|
|
|
1088
1112
|
? [{ column: filter.column, value: filter.value }]
|
|
1089
1113
|
: [],
|
|
1090
1114
|
),
|
|
1115
|
+
model.columns,
|
|
1091
1116
|
)
|
|
1092
1117
|
).filter((row) => rowMatchesFilters(row, filters));
|
|
1093
1118
|
|
|
@@ -1108,16 +1133,13 @@ export async function selectAppRows(
|
|
|
1108
1133
|
if (model.columns[column]?.kind === "json") {
|
|
1109
1134
|
throw new AppRowValidationError([{ path: "sort", message: "json columns cannot be sorted" }]);
|
|
1110
1135
|
}
|
|
1111
|
-
rows
|
|
1112
|
-
|
|
1113
|
-
|
|
1114
|
-
|
|
1115
|
-
|
|
1116
|
-
|
|
1117
|
-
|
|
1118
|
-
);
|
|
1119
|
-
return result;
|
|
1120
|
-
});
|
|
1136
|
+
rows = sortRowsByColumn(
|
|
1137
|
+
rows,
|
|
1138
|
+
column,
|
|
1139
|
+
dir,
|
|
1140
|
+
SORTABLE_SYSTEM_DATE_COLUMNS.has(column) ||
|
|
1141
|
+
(Object.hasOwn(model.columns, column) && model.columns[column]!.kind === "date"),
|
|
1142
|
+
);
|
|
1121
1143
|
}
|
|
1122
1144
|
const total = rows.length;
|
|
1123
1145
|
return { rows: rows.slice(0, limit), total };
|
|
@@ -1153,13 +1175,17 @@ export async function handleApps(
|
|
|
1153
1175
|
invalidDefinition(res, definition.issues);
|
|
1154
1176
|
return true;
|
|
1155
1177
|
}
|
|
1156
|
-
const
|
|
1178
|
+
const app = await createApp({
|
|
1179
|
+
name: parsed.body.name,
|
|
1180
|
+
description: parsed.body.description,
|
|
1181
|
+
definition: definition.definition,
|
|
1182
|
+
});
|
|
1183
|
+
const warnings = [
|
|
1184
|
+
...(await scriptCompatWarnings(definition.definition)),
|
|
1185
|
+
...(await appWriteTypesWarnings(app.id)),
|
|
1186
|
+
];
|
|
1157
1187
|
createAppRoute.respond(res, 201, {
|
|
1158
|
-
app
|
|
1159
|
-
name: parsed.body.name,
|
|
1160
|
-
description: parsed.body.description,
|
|
1161
|
-
definition: definition.definition,
|
|
1162
|
-
}),
|
|
1188
|
+
app,
|
|
1163
1189
|
...(warnings.length > 0 ? { warnings } : {}),
|
|
1164
1190
|
});
|
|
1165
1191
|
return true;
|
|
@@ -1168,8 +1194,12 @@ export async function handleApps(
|
|
|
1168
1194
|
if (listAppsRoute.match(req.method, pathSegments)) {
|
|
1169
1195
|
const parsed = await listAppsRoute.parse(req, res, pathSegments, queryParams);
|
|
1170
1196
|
if (!parsed) return true;
|
|
1197
|
+
const favoriteScope = (await resolveHttpFavoriteOwner(req, myAgentId))?.scope;
|
|
1171
1198
|
listAppsRoute.respond(res, 200, {
|
|
1172
|
-
apps: await
|
|
1199
|
+
apps: await withFavoriteFlags(
|
|
1200
|
+
await listApps({ q: parsed.query.q, limit: parsed.query.limit }),
|
|
1201
|
+
{ favoriteScope, itemType: "app" },
|
|
1202
|
+
),
|
|
1173
1203
|
});
|
|
1174
1204
|
return true;
|
|
1175
1205
|
}
|
|
@@ -1619,7 +1649,12 @@ export async function handleApps(
|
|
|
1619
1649
|
return true;
|
|
1620
1650
|
}
|
|
1621
1651
|
const warnings =
|
|
1622
|
-
writtenDefinition === undefined
|
|
1652
|
+
writtenDefinition === undefined
|
|
1653
|
+
? []
|
|
1654
|
+
: [
|
|
1655
|
+
...(await scriptCompatWarnings(writtenDefinition)),
|
|
1656
|
+
...(await appWriteTypesWarnings(parsed.params.id)),
|
|
1657
|
+
];
|
|
1623
1658
|
patchAppRoute.respond(res, 200, {
|
|
1624
1659
|
app,
|
|
1625
1660
|
migration,
|
|
@@ -1711,7 +1746,12 @@ export async function handleApps(
|
|
|
1711
1746
|
return true;
|
|
1712
1747
|
}
|
|
1713
1748
|
const warnings =
|
|
1714
|
-
writtenDefinition === undefined
|
|
1749
|
+
writtenDefinition === undefined
|
|
1750
|
+
? []
|
|
1751
|
+
: [
|
|
1752
|
+
...(await scriptCompatWarnings(writtenDefinition)),
|
|
1753
|
+
...(await appWriteTypesWarnings(parsed.params.id)),
|
|
1754
|
+
];
|
|
1715
1755
|
updateAppRoute.respond(res, 200, {
|
|
1716
1756
|
app,
|
|
1717
1757
|
migration,
|
package/src/http/comb.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
4
|
+
import { getTaskById } from "../be/db";
|
|
4
5
|
import { getCombConfig } from "../comb/config";
|
|
5
6
|
import {
|
|
6
7
|
REVIEW_BATCH_MAX,
|
|
@@ -11,8 +12,9 @@ import {
|
|
|
11
12
|
import { can } from "../rbac";
|
|
12
13
|
import { TaskCreationBlockedError } from "../tasks/errors";
|
|
13
14
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
14
|
-
import { requestPrincipal } from "./request-principal";
|
|
15
|
-
import { route } from "./route-def";
|
|
15
|
+
import { agentFirstPrincipal, requestPrincipal } from "./request-principal";
|
|
16
|
+
import { bodyTask, route } from "./route-def";
|
|
17
|
+
import { denyParentAttach } from "./session-access";
|
|
16
18
|
import { jsonError } from "./utils";
|
|
17
19
|
|
|
18
20
|
const skippedSchema = z.object({
|
|
@@ -50,11 +52,12 @@ const reviewBatchRoute = route({
|
|
|
50
52
|
method: "post",
|
|
51
53
|
path: "/api/comb/review-batches",
|
|
52
54
|
pattern: ["api", "comb", "review-batches"],
|
|
53
|
-
summary: "Send agent-fs comments to the swarm as one
|
|
55
|
+
summary: "Send agent-fs comments to the swarm as one task",
|
|
54
56
|
description:
|
|
55
|
-
"Comb's 'Send to swarm'. The server reads each comment again from agent-fs with its bootstrap key, skips replies, resolved comments, and comments already sent, and creates
|
|
57
|
+
"Comb's 'Send to swarm'. The server reads each comment again from agent-fs with its bootstrap key, skips replies, resolved comments, and comments already sent, and creates one task. An optional parentTaskId attaches it as a follow-up for the parent’s agent. Without a parent assignee it routes to the lead. Each sent comment gets a `[comb:sent task=<id>]` reply from the swarm service account. A comment is sent at most once. An optional `note` from the sender goes into the task text. When an earlier send lost its reply, the batch posts that reply again (`repaired`). Answers 404 while COMB_ENABLED is off.",
|
|
56
58
|
tags: ["Comb"],
|
|
57
59
|
body: z.object({
|
|
60
|
+
parentTaskId: z.uuid().optional(),
|
|
58
61
|
orgId: z.string().min(1),
|
|
59
62
|
driveId: z.string().min(1),
|
|
60
63
|
// agent-fs comment ids are UUIDs, so a malformed id never costs an agent-fs read.
|
|
@@ -89,6 +92,7 @@ const reviewBatchRoute = route({
|
|
|
89
92
|
schema: batchErrorSchema,
|
|
90
93
|
},
|
|
91
94
|
},
|
|
95
|
+
session: bodyTask("parentTaskId"),
|
|
92
96
|
rbac: { permission: "task.create.own" },
|
|
93
97
|
});
|
|
94
98
|
|
|
@@ -118,8 +122,20 @@ export async function handleComb(
|
|
|
118
122
|
}
|
|
119
123
|
|
|
120
124
|
try {
|
|
125
|
+
const { parentTaskId, ...batch } = parsed.body;
|
|
126
|
+
const parent = parentTaskId ? await getTaskById(parentTaskId) : null;
|
|
127
|
+
if (parentTaskId && !parent) {
|
|
128
|
+
jsonError(res, "Parent task not found", 404);
|
|
129
|
+
return true;
|
|
130
|
+
}
|
|
131
|
+
const sender = parent ? await agentFirstPrincipal(req, myAgentId) : null;
|
|
132
|
+
if (parent && sender && (await denyParentAttach(req, res, myAgentId, parent, sender)))
|
|
133
|
+
return true;
|
|
121
134
|
const result = await sendReviewBatch({
|
|
122
|
-
...
|
|
135
|
+
...batch,
|
|
136
|
+
parent: parent
|
|
137
|
+
? { id: parent.id, agentId: parent.agentId, agentCaller: sender?.kind === "agent" }
|
|
138
|
+
: undefined,
|
|
123
139
|
requestedByUserId: await resolveHttpRequesterUserId(req, myAgentId),
|
|
124
140
|
});
|
|
125
141
|
reviewBatchRoute.respond(res, result.taskId === null ? 200 : 201, result);
|
package/src/http/config.ts
CHANGED
|
@@ -190,8 +190,8 @@ export async function ensureConfigAdmin(
|
|
|
190
190
|
}
|
|
191
191
|
|
|
192
192
|
/**
|
|
193
|
-
* A human-only key (see `isHumanOnlyConfigKey`) needs
|
|
194
|
-
*
|
|
193
|
+
* A human-only key (see `isHumanOnlyConfigKey`) needs a user token or dashboard
|
|
194
|
+
* user session, with admin access when RBAC is enabled. The operator key resolves to the operator,
|
|
195
195
|
* and every worker holds it, so it is refused like an agent or a guest. A
|
|
196
196
|
* page session is refused whoever its viewer is. The operator key can still
|
|
197
197
|
* mint an admin user token; see the limit on `HUMAN_ONLY_CONFIG_KEYS`.
|
|
@@ -311,7 +311,8 @@ const envPresence = route({
|
|
|
311
311
|
}),
|
|
312
312
|
responses: {
|
|
313
313
|
200: {
|
|
314
|
-
description:
|
|
314
|
+
description:
|
|
315
|
+
"Map of key -> boolean. Empty values are normally absent; an explicitly empty WORKFLOW_INPUT_ENV_ALLOWLIST or Slack icon setting counts as present.",
|
|
315
316
|
schema: z.object({ presence: z.record(z.string(), z.boolean()) }),
|
|
316
317
|
},
|
|
317
318
|
400: { description: "Validation error" },
|
|
@@ -501,7 +502,10 @@ export async function handleConfig(
|
|
|
501
502
|
// Organization identity is trimmed by both /status and telemetry.
|
|
502
503
|
// Match that definition without changing presence semantics for secrets.
|
|
503
504
|
const value = key === "SWARM_ORG_NAME" ? process.env[key]?.trim() : process.env[key];
|
|
504
|
-
|
|
505
|
+
// An empty workflow allowlist is an active deny-all setting.
|
|
506
|
+
presence[key] =
|
|
507
|
+
value !== undefined &&
|
|
508
|
+
(key === "WORKFLOW_INPUT_ENV_ALLOWLIST" || isSlackIconConfigKey(key) || value !== "");
|
|
505
509
|
}
|
|
506
510
|
envPresence.respond(res, 200, { presence });
|
|
507
511
|
return true;
|
package/src/http/db-query.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
-
import { scrubObject } from "../utils/secret-scrubber";
|
|
3
|
+
import { createSweepScrubber, scrubObject } from "../utils/secret-scrubber";
|
|
4
4
|
import { executeReadOnlyQueryBounded } from "./db-query-bounded";
|
|
5
5
|
import {
|
|
6
6
|
assertSingleStatement,
|
|
@@ -139,7 +139,13 @@ export async function handleDbQuery(
|
|
|
139
139
|
);
|
|
140
140
|
// Rows can hold secrets pasted into free text (task output, logs, events).
|
|
141
141
|
// The MCP tool gets this from the registrar; the HTTP route does it here.
|
|
142
|
-
|
|
142
|
+
// The scrub is synchronous, so one sweep scrubber per request stays valid; it
|
|
143
|
+
// skips the rules a clean row cannot trigger (rows run to MBs on this route).
|
|
144
|
+
dbQueryRoute.respond(
|
|
145
|
+
res,
|
|
146
|
+
200,
|
|
147
|
+
scrubObject(result, undefined, undefined, createSweepScrubber()),
|
|
148
|
+
);
|
|
143
149
|
} catch (err: unknown) {
|
|
144
150
|
if (err instanceof DbQueryConcurrencyCapError) {
|
|
145
151
|
// Machine-readable code + Retry-After so a caller can back off instead
|
package/src/http/heartbeat.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { checkHeartbeatChecklist, runHeartbeatSweep } from "../heartbeat/heartbeat";
|
|
4
|
+
import { refuseAgentTokenWithout } from "./request-principal";
|
|
4
5
|
import { route } from "./route-def";
|
|
5
6
|
import { json } from "./utils";
|
|
6
7
|
|
|
@@ -24,6 +25,7 @@ const triggerSweep = route({
|
|
|
24
25
|
401: { description: "Unauthorized" },
|
|
25
26
|
},
|
|
26
27
|
auth: { apiKey: true },
|
|
28
|
+
rbac: { permission: "heartbeat.trigger" },
|
|
27
29
|
});
|
|
28
30
|
|
|
29
31
|
const triggerChecklist = route({
|
|
@@ -40,6 +42,7 @@ const triggerChecklist = route({
|
|
|
40
42
|
401: { description: "Unauthorized" },
|
|
41
43
|
},
|
|
42
44
|
auth: { apiKey: true },
|
|
45
|
+
rbac: { permission: "heartbeat.trigger" },
|
|
43
46
|
});
|
|
44
47
|
|
|
45
48
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
@@ -52,6 +55,7 @@ export async function handleHeartbeat(
|
|
|
52
55
|
if (triggerSweep.match(req.method, pathSegments)) {
|
|
53
56
|
const parsed = await triggerSweep.parse(req, res, pathSegments, new URLSearchParams());
|
|
54
57
|
if (!parsed) return true;
|
|
58
|
+
if (await refuseAgentTokenWithout(req, res, "heartbeat.trigger")) return true;
|
|
55
59
|
|
|
56
60
|
try {
|
|
57
61
|
await runHeartbeatSweep();
|
|
@@ -66,6 +70,7 @@ export async function handleHeartbeat(
|
|
|
66
70
|
if (triggerChecklist.match(req.method, pathSegments)) {
|
|
67
71
|
const parsed = await triggerChecklist.parse(req, res, pathSegments, new URLSearchParams());
|
|
68
72
|
if (!parsed) return true;
|
|
73
|
+
if (await refuseAgentTokenWithout(req, res, "heartbeat.trigger")) return true;
|
|
69
74
|
|
|
70
75
|
try {
|
|
71
76
|
await checkHeartbeatChecklist();
|
package/src/http/index.ts
CHANGED
|
@@ -22,6 +22,7 @@ import { startEventLoopLagProbe, stopEventLoopLagProbe, withLoopPath } from "../
|
|
|
22
22
|
import { startHumanFreeDrain, stopHumanFreeDrain } from "../be/human-free-drain";
|
|
23
23
|
import { initMcpEventsDispatcher } from "../be/mcp-events/dispatcher";
|
|
24
24
|
import { startMcpOverflowSweep, stopMcpOverflowSweep } from "../be/mcp-overflow-sweep";
|
|
25
|
+
import { setDeploymentEnvReader } from "../be/memory";
|
|
25
26
|
import {
|
|
26
27
|
enqueueAuditRow,
|
|
27
28
|
flushAuditBuffer,
|
|
@@ -72,7 +73,11 @@ import { startTelemetryTicker } from "../telemetry-snapshot";
|
|
|
72
73
|
import { API_DRAINING_HEADER } from "../utils/api-drain";
|
|
73
74
|
import { getApiKey } from "../utils/api-key";
|
|
74
75
|
import { ensure, initialize } from "../utils/business-use";
|
|
75
|
-
import {
|
|
76
|
+
import {
|
|
77
|
+
getConfiguredAppUrls,
|
|
78
|
+
getScriptApiBaseUrl,
|
|
79
|
+
setApiLoopbackBaseUrl,
|
|
80
|
+
} from "../utils/constants";
|
|
76
81
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
77
82
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
78
83
|
import { initWorkflows } from "../workflows";
|
|
@@ -687,6 +692,9 @@ try {
|
|
|
687
692
|
throw err;
|
|
688
693
|
}
|
|
689
694
|
warnIfCorsAllowsAnyOrigin();
|
|
695
|
+
// Before any embed: the provider exempts only the deployment env's base URL
|
|
696
|
+
// from the SSRF check, and it fixes that choice when it builds its client.
|
|
697
|
+
setDeploymentEnvReader(getDeploymentEnvValue);
|
|
690
698
|
|
|
691
699
|
// Register every stored secret (config secrets of all scopes, OAuth and MCP
|
|
692
700
|
// OAuth credentials, script API tokens) with the scrubber before listen, so
|
|
@@ -808,6 +816,7 @@ httpServer
|
|
|
808
816
|
const boundAddress = httpServer.address();
|
|
809
817
|
if (boundAddress && typeof boundAddress === "object") {
|
|
810
818
|
setExtensionLoopbackBaseUrl(`http://127.0.0.1:${boundAddress.port}`);
|
|
819
|
+
setApiLoopbackBaseUrl(`http://127.0.0.1:${boundAddress.port}`);
|
|
811
820
|
}
|
|
812
821
|
console.log(`MCP HTTP server running on http://localhost:${port}/mcp`);
|
|
813
822
|
|
|
@@ -921,7 +930,7 @@ httpServer
|
|
|
921
930
|
await initWorkflows();
|
|
922
931
|
|
|
923
932
|
// Reconcile durable script workflow subprocesses
|
|
924
|
-
await startScriptRunSupervisor(
|
|
933
|
+
await startScriptRunSupervisor(getScriptApiBaseUrl());
|
|
925
934
|
|
|
926
935
|
// Start scheduler (if enabled). The interval is read post-hydration, like
|
|
927
936
|
// heartbeat below, and parsed so an unusable value keeps the 10s default (#3169).
|
|
@@ -992,10 +1001,7 @@ httpServer
|
|
|
992
1001
|
// prefix) changed, then embed rows with a missing or wrong-length vector.
|
|
993
1002
|
// Non-blocking, idempotent, resumable. See src/be/memory/embedding-space.ts.
|
|
994
1003
|
import("../be/memory/embedding-space")
|
|
995
|
-
.then(({ runEmbeddingMaintenance
|
|
996
|
-
setDeploymentEnvReader(getDeploymentEnvValue);
|
|
997
|
-
return runEmbeddingMaintenance({ backfill: true });
|
|
998
|
-
})
|
|
1004
|
+
.then(({ runEmbeddingMaintenance }) => runEmbeddingMaintenance({ backfill: true }))
|
|
999
1005
|
.catch((err) => {
|
|
1000
1006
|
console.error("[embedding-space] startup maintenance failed (non-fatal):", err);
|
|
1001
1007
|
});
|
package/src/http/kv.ts
CHANGED
|
@@ -11,12 +11,14 @@ import {
|
|
|
11
11
|
listKv,
|
|
12
12
|
upsertKv,
|
|
13
13
|
} from "../be/db";
|
|
14
|
+
import { MAX_KV_BODY_BYTES } from "../kv-limits";
|
|
14
15
|
import { mcpOverflowAuthError } from "../kv-overflow";
|
|
15
16
|
import {
|
|
16
17
|
privateNamespaceError,
|
|
17
18
|
requiresLeadToWrite,
|
|
18
19
|
reservedNamespaceError,
|
|
19
20
|
reservedRoomKeyError,
|
|
21
|
+
scrubReservedRead,
|
|
20
22
|
} from "../kv-reserved-namespaces";
|
|
21
23
|
import { hasKvViewArgs, resolveKvView } from "../kv-view";
|
|
22
24
|
import { can } from "../rbac";
|
|
@@ -46,10 +48,6 @@ import { BODY_TOO_LARGE, enforceContentLengthCap, jsonError } from "./utils";
|
|
|
46
48
|
* and overrides anything in the URL/body so pages can't escape their namespace.
|
|
47
49
|
*/
|
|
48
50
|
|
|
49
|
-
// 2 MiB cap on PUT bodies. Pre-flighted via Content-Length; the parsed JSON
|
|
50
|
-
// body itself is enforced too (`value` size ≤ MAX_KV_BODY_BYTES after stringify).
|
|
51
|
-
const MAX_KV_BODY_BYTES = 2 * 1024 * 1024;
|
|
52
|
-
|
|
53
51
|
// `limit` upper bound on list endpoints. Anything higher gets clamped silently
|
|
54
52
|
// — callers should paginate via offset.
|
|
55
53
|
const MAX_KV_LIST_LIMIT = 1000;
|
|
@@ -693,6 +691,7 @@ async function sendGet(
|
|
|
693
691
|
jsonError(res, "not found", 404);
|
|
694
692
|
return true;
|
|
695
693
|
}
|
|
694
|
+
entry.value = scrubReservedRead(namespace, entry.value);
|
|
696
695
|
if (hasKvViewArgs(query)) {
|
|
697
696
|
const view = resolveKvView(entry.value, query);
|
|
698
697
|
if (!view.ok) {
|
|
@@ -791,7 +790,10 @@ async function sendList(
|
|
|
791
790
|
const limit = Math.min(query.limit ?? 100, MAX_KV_LIST_LIMIT);
|
|
792
791
|
const offset = query.offset ?? 0;
|
|
793
792
|
const prefix = query.prefix && query.prefix.length > 0 ? query.prefix : undefined;
|
|
794
|
-
const entries = await listKv(namespace, { prefix, limit, offset })
|
|
793
|
+
const entries = (await listKv(namespace, { prefix, limit, offset })).map((entry) => ({
|
|
794
|
+
...entry,
|
|
795
|
+
value: scrubReservedRead(namespace, entry.value),
|
|
796
|
+
}));
|
|
795
797
|
const total = await countKv(namespace, { prefix });
|
|
796
798
|
respond(res, 200, { entries, total, namespace });
|
|
797
799
|
return true;
|
package/src/http/mcp-oauth.ts
CHANGED
|
@@ -34,6 +34,7 @@ import {
|
|
|
34
34
|
} from "../oauth/mcp-wrapper";
|
|
35
35
|
import { McpAuthMethodSchema } from "../types";
|
|
36
36
|
import { getAppUrl, getPublicMcpBaseUrl } from "../utils/constants";
|
|
37
|
+
import { refuseAgentTokenWithout } from "./request-principal";
|
|
37
38
|
import { route } from "./route-def";
|
|
38
39
|
import { jsonError } from "./utils";
|
|
39
40
|
|
|
@@ -186,6 +187,15 @@ async function discoverForMcp(resourceUrl: string): Promise<DiscoveryResult | nu
|
|
|
186
187
|
if (!issuer) return null;
|
|
187
188
|
|
|
188
189
|
const as = await discoverAuthorizationServerMetadata(issuer);
|
|
190
|
+
// The browser is sent to authorization_endpoint and the API posts to the others.
|
|
191
|
+
for (const endpoint of [
|
|
192
|
+
as.authorization_endpoint,
|
|
193
|
+
as.token_endpoint,
|
|
194
|
+
as.registration_endpoint,
|
|
195
|
+
as.revocation_endpoint,
|
|
196
|
+
]) {
|
|
197
|
+
if (endpoint) assertUrlSafe(endpoint, mcpOAuthSsrfOptions());
|
|
198
|
+
}
|
|
189
199
|
|
|
190
200
|
return {
|
|
191
201
|
resourceUrl: prmd.resource ?? resourceUrl,
|
|
@@ -334,6 +344,7 @@ const refreshRoute = route({
|
|
|
334
344
|
tags: ["MCP OAuth"],
|
|
335
345
|
auth: { apiKey: true },
|
|
336
346
|
params: z.object({ mcpServerId: z.string() }),
|
|
347
|
+
rbac: { permission: "mcp-oauth.manage" },
|
|
337
348
|
body: z
|
|
338
349
|
.object({
|
|
339
350
|
userId: z.string().optional(),
|
|
@@ -356,6 +367,7 @@ const disconnectRoute = route({
|
|
|
356
367
|
tags: ["MCP OAuth"],
|
|
357
368
|
auth: { apiKey: true },
|
|
358
369
|
params: z.object({ mcpServerId: z.string() }),
|
|
370
|
+
rbac: { permission: "mcp-oauth.manage" },
|
|
359
371
|
query: z.object({ userId: z.string().optional() }),
|
|
360
372
|
responses: {
|
|
361
373
|
200: { description: "Token revoked/deleted", schema: OkResponseSchema },
|
|
@@ -371,6 +383,7 @@ const manualClientRoute = route({
|
|
|
371
383
|
tags: ["MCP OAuth"],
|
|
372
384
|
auth: { apiKey: true },
|
|
373
385
|
params: z.object({ mcpServerId: z.string() }),
|
|
386
|
+
rbac: { permission: "mcp-oauth.manage" },
|
|
374
387
|
body: z.object({
|
|
375
388
|
clientId: z.string().min(1),
|
|
376
389
|
clientSecret: z.string().optional(),
|
|
@@ -918,6 +931,7 @@ export async function handleMcpOAuth(
|
|
|
918
931
|
if (refreshRoute.match(req.method, pathSegments)) {
|
|
919
932
|
const parsed = await refreshRoute.parse(req, res, pathSegments, queryParams);
|
|
920
933
|
if (!parsed) return true;
|
|
934
|
+
if (await refuseAgentTokenWithout(req, res, "mcp-oauth.manage")) return true;
|
|
921
935
|
|
|
922
936
|
const userId = parsed.body?.userId ?? null;
|
|
923
937
|
const existing = await getMcpOAuthToken(parsed.params.mcpServerId, userId);
|
|
@@ -965,6 +979,7 @@ export async function handleMcpOAuth(
|
|
|
965
979
|
if (disconnectRoute.match(req.method, pathSegments)) {
|
|
966
980
|
const parsed = await disconnectRoute.parse(req, res, pathSegments, queryParams);
|
|
967
981
|
if (!parsed) return true;
|
|
982
|
+
if (await refuseAgentTokenWithout(req, res, "mcp-oauth.manage")) return true;
|
|
968
983
|
|
|
969
984
|
const userId = parsed.query.userId ?? null;
|
|
970
985
|
const token = await getMcpOAuthToken(parsed.params.mcpServerId, userId);
|
|
@@ -1002,6 +1017,7 @@ export async function handleMcpOAuth(
|
|
|
1002
1017
|
if (manualClientRoute.match(req.method, pathSegments)) {
|
|
1003
1018
|
const parsed = await manualClientRoute.parse(req, res, pathSegments, queryParams);
|
|
1004
1019
|
if (!parsed) return true;
|
|
1020
|
+
if (await refuseAgentTokenWithout(req, res, "mcp-oauth.manage")) return true;
|
|
1005
1021
|
|
|
1006
1022
|
const server = await getMcpOrError(res, parsed.params.mcpServerId);
|
|
1007
1023
|
if (!server) return true;
|
package/src/http/mcp-servers.ts
CHANGED
|
@@ -17,6 +17,7 @@ import { updateMcpServerChecked } from "../be/mcp-server-checked-update";
|
|
|
17
17
|
import { updateTouchesStdioExecution } from "../be/mcp-server-stdio-gate";
|
|
18
18
|
import { enqueueAdmissionRow } from "../be/rbac-audit";
|
|
19
19
|
import { getUserGrant } from "../be/rbac-roles";
|
|
20
|
+
import { isApiOnlyConfigKey, isInternalConfigKey } from "../be/swarm-config-guard";
|
|
20
21
|
import { ensureMcpToken } from "../oauth/ensure-mcp-token";
|
|
21
22
|
import { assertUrlSafe, publicEndpointSsrfOptions } from "../oauth/mcp-wrapper";
|
|
22
23
|
import { isCodexOAuthConfigKey } from "../providers/codex-oauth/env-keys";
|
|
@@ -29,7 +30,7 @@ import {
|
|
|
29
30
|
} from "../rbac";
|
|
30
31
|
import { AgentMcpServerSchema, McpServerSchema, McpServerWithInstallInfoSchema } from "../types";
|
|
31
32
|
import { getRequestAuth } from "../utils/request-auth-context";
|
|
32
|
-
import { agentFirstPrincipal, authUserId } from "./request-principal";
|
|
33
|
+
import { agentFirstPrincipal, authUserId, refuseAgentTokenWithout } from "./request-principal";
|
|
33
34
|
import { route } from "./route-def";
|
|
34
35
|
import { jsonError } from "./utils";
|
|
35
36
|
|
|
@@ -223,7 +224,11 @@ const getAgentMcpServersRoute = route({
|
|
|
223
224
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
224
225
|
|
|
225
226
|
async function canResolveMcpSecretsForHttpUser(req: IncomingMessage): Promise<boolean> {
|
|
226
|
-
const
|
|
227
|
+
const auth = getRequestAuth(req);
|
|
228
|
+
// Task tokens are ACP harness credentials and read no config secrets (as on
|
|
229
|
+
// /api/config/resolved). The worker resolves installed servers with its own key.
|
|
230
|
+
if (auth?.kind === "agent" && auth.tokenKind === "task") return false;
|
|
231
|
+
const userId = authUserId(auth);
|
|
227
232
|
if (!userId) return true;
|
|
228
233
|
if (!isRbacEnabled()) return true;
|
|
229
234
|
|
|
@@ -320,7 +325,14 @@ export async function handleMcpServers(
|
|
|
320
325
|
return true;
|
|
321
326
|
}
|
|
322
327
|
|
|
323
|
-
|
|
328
|
+
// API-only and internal rows never leave the API, and Codex OAuth rows carry
|
|
329
|
+
// the refresh token: none of them resolve into an env var or a header.
|
|
330
|
+
const configs = (await getResolvedConfig(parsed.params.id)).filter(
|
|
331
|
+
(c) =>
|
|
332
|
+
!isApiOnlyConfigKey(c.key) &&
|
|
333
|
+
!isInternalConfigKey(c.key) &&
|
|
334
|
+
!isCodexOAuthConfigKey(c.key),
|
|
335
|
+
);
|
|
324
336
|
const configMap = new Map(configs.map((c) => [c.key, c.value]));
|
|
325
337
|
|
|
326
338
|
const serversWithSecrets = await Promise.all(
|
|
@@ -441,6 +453,15 @@ export async function handleMcpServers(
|
|
|
441
453
|
jsonError(res, "MCP server not found", 404);
|
|
442
454
|
return true;
|
|
443
455
|
}
|
|
456
|
+
if (
|
|
457
|
+
parsed.body.agentId !== singleHeader(req, "x-agent-id") &&
|
|
458
|
+
(await refuseAgentTokenWithout(req, res, "mcp-server.install.any", {
|
|
459
|
+
kind: "agent",
|
|
460
|
+
agentId: parsed.body.agentId,
|
|
461
|
+
}))
|
|
462
|
+
) {
|
|
463
|
+
return true;
|
|
464
|
+
}
|
|
444
465
|
|
|
445
466
|
try {
|
|
446
467
|
const agentMcpServer = await installMcpServer(parsed.body.agentId, parsed.params.id);
|
|
@@ -455,6 +476,15 @@ export async function handleMcpServers(
|
|
|
455
476
|
if (uninstallMcpServerRoute.match(req.method, pathSegments)) {
|
|
456
477
|
const parsed = await uninstallMcpServerRoute.parse(req, res, pathSegments, queryParams);
|
|
457
478
|
if (!parsed) return true;
|
|
479
|
+
if (
|
|
480
|
+
parsed.params.agentId !== singleHeader(req, "x-agent-id") &&
|
|
481
|
+
(await refuseAgentTokenWithout(req, res, "mcp-server.uninstall.any", {
|
|
482
|
+
kind: "agent",
|
|
483
|
+
agentId: parsed.params.agentId,
|
|
484
|
+
}))
|
|
485
|
+
) {
|
|
486
|
+
return true;
|
|
487
|
+
}
|
|
458
488
|
|
|
459
489
|
const removed = await uninstallMcpServer(parsed.params.agentId, parsed.params.id);
|
|
460
490
|
uninstallMcpServerRoute.respond(res, 200, { success: removed });
|
|
@@ -611,6 +641,16 @@ export async function handleMcpServers(
|
|
|
611
641
|
if (deleteMcpServerRoute.match(req.method, pathSegments)) {
|
|
612
642
|
const parsed = await deleteMcpServerRoute.parse(req, res, pathSegments, queryParams);
|
|
613
643
|
if (!parsed) return true;
|
|
644
|
+
const existing = await getMcpServerById(parsed.params.id);
|
|
645
|
+
if (
|
|
646
|
+
existing &&
|
|
647
|
+
(await refuseAgentTokenWithout(req, res, "mcp-server.delete.any", {
|
|
648
|
+
kind: "owned",
|
|
649
|
+
ownerAgentId: existing.ownerAgentId,
|
|
650
|
+
}))
|
|
651
|
+
) {
|
|
652
|
+
return true;
|
|
653
|
+
}
|
|
614
654
|
|
|
615
655
|
const result = await deleteMcpServer(parsed.params.id);
|
|
616
656
|
if (!result.deleted) {
|