@desplega.ai/agent-swarm 2.13.5 → 2.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp-adapter-99n6z9ky.js +17 -0
- package/dist/{acp-targets-w8dbs4nr.js → acp-targets-23exz4z4.js} +10 -10
- package/dist/{actions-8zrcbjrx.js → actions-zcr25x27.js} +60 -39
- package/dist/{agent-fs-provision-cbt2ttds.js → agent-fs-provision-7fa9e12e.js} +4 -4
- package/dist/{amp-adapter-8x6zp8w4.js → amp-adapter-s7ytmv6b.js} +3 -3
- package/dist/{app-zfa9dwjw.js → app-5d3sz1hy.js} +7 -7
- package/dist/{approval-notifications-rv92zmza.js → approval-notifications-7qgkzkzx.js} +8 -8
- package/dist/{assistant-q7s7rm1q.js → assistant-p2yvhc3j.js} +37 -32
- package/dist/{boot-args-schema-g27kpzr1.js → boot-args-schema-ry6cb0p7.js} +1 -1
- package/dist/{boot-reembed-1mjs52nt.js → boot-reembed-2hkm3vz2.js} +1 -1
- package/dist/{boot-reembed-m62dpdkg.js → boot-reembed-c9643ms3.js} +1 -1
- package/dist/{boot-scrub-sweep-ss1vcamw.js → boot-scrub-sweep-3ycxr51t.js} +2 -2
- package/dist/{boot-seeds-hwnvgbb3.js → boot-seeds-2hzvvzg0.js} +4 -4
- package/dist/{boxd-y0szhp0g.js → boxd-9py3x0jb.js} +2 -2
- package/dist/{claude-adapter-0rjmbhjk.js → claude-adapter-dnkww93e.js} +9 -9
- package/dist/{claude-managed-adapter-6k032agg.js → claude-managed-adapter-yk0cr5x6.js} +4 -4
- package/dist/{claude-managed-setup-6czvve8q.js → claude-managed-setup-4byxpp47.js} +5 -5
- package/dist/{claude-sdk-session-pr0znb81.js → claude-sdk-session-4wf3dbvs.js} +12467 -12285
- package/dist/{cli-t0n9svkb.js → cli-096aftq6.js} +12 -7
- package/dist/{cli-2wzkvfgm.js → cli-0e914dp9.js} +3 -3
- package/dist/{cli-vcpyttcw.js → cli-0h6m6z5g.js} +1 -1
- package/dist/{cli-q41qar56.js → cli-0k7ppk9k.js} +130 -8
- package/dist/{cli-ks06cd0n.js → cli-1nfabrt4.js} +8 -8
- package/dist/{cli-ebpq3c5z.js → cli-2414h5r9.js} +8 -8
- package/dist/{cli-nrt048ys.js → cli-24wervhz.js} +37 -0
- package/dist/{cli-pedm2kht.js → cli-2ayk9gn8.js} +2 -2
- package/dist/{cli-kr0jpw9c.js → cli-2ckwgs7q.js} +1 -1
- package/dist/{cli-evy3egte.js → cli-2savn6mm.js} +11 -100
- package/dist/{cli-n79j1vxc.js → cli-2zjxake1.js} +4 -4
- package/dist/{cli-z3x7h79n.js → cli-37p61fcg.js} +9 -9
- package/dist/{cli-2vp0z049.js → cli-39t9d248.js} +1 -1
- package/dist/{cli-sa02jsqt.js → cli-3mhdmcd4.js} +1 -1
- package/dist/{cli-34fygf87.js → cli-3wsabyt0.js} +2 -2
- package/dist/{cli-grbngev5.js → cli-466jjrwe.js} +11 -2
- package/dist/{cli-zxa1vmx7.js → cli-6ajyhxh7.js} +2 -2
- package/dist/{cli-bvamr9g0.js → cli-6yy4fepf.js} +4 -4
- package/dist/{cli-3vw6dd4g.js → cli-73rmgm45.js} +2 -2
- package/dist/{cli-8b4rpnwj.js → cli-7ca8hczj.js} +1 -1
- package/dist/{cli-0h8skzss.js → cli-7g5qj2ca.js} +4 -3
- package/dist/{cli-srre41gb.js → cli-7w1fs01q.js} +2 -2
- package/dist/{cli-tgc1kgg3.js → cli-84wxwt3z.js} +1 -1
- package/dist/{cli-4gaf3tx5.js → cli-84xn7bgz.js} +1 -1
- package/dist/{cli-s8dhq7rj.js → cli-879txsac.js} +5 -5
- package/dist/{cli-9n6g14vs.js → cli-8vbxjzk0.js} +3 -3
- package/dist/{cli-cmbb2t8a.js → cli-91amj3md.js} +2 -2
- package/dist/{cli-ewk3sg68.js → cli-930zbczq.js} +3 -3
- package/dist/{cli-6msnpj1z.js → cli-9fwznq4p.js} +10 -10
- package/dist/{cli-qmx8bnt4.js → cli-9j1t3kf6.js} +2 -2
- package/dist/{cli-t879ww0y.js → cli-9j47sgzy.js} +2 -2
- package/dist/{cli-0qt3epg4.js → cli-ad00h1st.js} +7 -7
- package/dist/{cli-avax5mp9.js → cli-adzmmcvf.js} +19 -7
- package/dist/{cli-ffn0a515.js → cli-ayxxkk3p.js} +68 -25
- package/dist/{cli-4vynxtrb.js → cli-bqfx72e6.js} +10 -3
- package/dist/{cli-887vhew6.js → cli-cbg0j1yt.js} +2716 -2643
- package/dist/{cli-fw67mnyc.js → cli-cg1q8ymp.js} +1 -1
- package/dist/{cli-he5nxaa8.js → cli-dw9rtjm3.js} +1 -1
- package/dist/{cli-emdfd8fh.js → cli-dy754erz.js} +9 -1
- package/dist/{cli-3860pmrq.js → cli-edxfzgah.js} +4 -4
- package/dist/{cli-v09eza21.js → cli-ejnhs815.js} +15 -15
- package/dist/{cli-k0nebh10.js → cli-enavhq6r.js} +1 -1
- package/dist/{cli-b42yfn17.js → cli-f2rwt43y.js} +13 -13
- package/dist/{cli-tvyt8w6n.js → cli-f9g96z28.js} +8 -8
- package/dist/{cli-zbbtp02a.js → cli-fww016hh.js} +457 -70
- package/dist/{cli-vbge4rsp.js → cli-g6a696c0.js} +4 -4
- package/dist/{cli-z1vam71h.js → cli-gc6b94tj.js} +2 -2
- package/dist/{cli-5tq15aa7.js → cli-gcyws2bp.js} +2 -2
- package/dist/{cli-srktrbby.js → cli-hzhv7yac.js} +1 -1
- package/dist/{cli-cp163xga.js → cli-jcnc5ret.js} +44 -32
- package/dist/{cli-j69pzrrz.js → cli-jgq9xptq.js} +5 -5
- package/dist/{cli-kwj3131p.js → cli-jwnac23b.js} +1 -1
- package/dist/{cli-wzecestt.js → cli-kc7vd07m.js} +616 -289
- package/dist/{cli-8pd1t17c.js → cli-kg63yp1r.js} +14 -14
- package/dist/{cli-zzq96q57.js → cli-krk8y8c7.js} +727 -139
- package/dist/{cli-5web09sb.js → cli-m0ea8ggd.js} +8 -10
- package/dist/{cli-qrvk9nka.js → cli-md4tn21h.js} +13 -13
- package/dist/{cli-1jq2em7b.js → cli-mv8ft7b0.js} +10 -9
- package/dist/{cli-ryem5cfq.js → cli-mw1tmn3x.js} +217 -27
- package/dist/{cli-abby987g.js → cli-njvpngc6.js} +3 -3
- package/dist/{cli-55h8m1x3.js → cli-phe2vcw5.js} +6 -6
- package/dist/{cli-prz1p3ft.js → cli-pq0kv31y.js} +5 -5
- package/dist/{cli-q1h041y8.js → cli-q457ga28.js} +6 -6
- package/dist/{cli-z40t85ms.js → cli-q5n3deaf.js} +1 -1
- package/dist/{cli-7ypg8hka.js → cli-qkbevqer.js} +3 -3
- package/dist/{cli-f9xw9pr4.js → cli-qrwjk4xy.js} +5 -5
- package/dist/{cli-kezzteka.js → cli-r04ve9xw.js} +1 -1
- package/dist/{cli-zntvmqmm.js → cli-r495stwd.js} +2 -2
- package/dist/{cli-1kvcsd2f.js → cli-r9d2tya0.js} +71 -3
- package/dist/{cli-ybte1fqc.js → cli-rp1n2xpd.js} +1 -1
- package/dist/{cli-sejvnjvw.js → cli-rs1rzwp4.js} +1 -1
- package/dist/{cli-94mxerrp.js → cli-rzbsh6bw.js} +1 -1
- package/dist/{cli-94gx6ze9.js → cli-s4pccby1.js} +1 -1
- package/dist/{cli-hd5bm1e1.js → cli-shyhb4t5.js} +10 -10
- package/dist/{cli-r3dxpmyt.js → cli-srq69pn1.js} +1 -1
- package/dist/{cli-7r9tvk8v.js → cli-tc165vrb.js} +8 -3
- package/dist/{cli-ced4azn1.js → cli-v4z5v3jd.js} +298 -80
- package/dist/{cli-ehg90jd1.js → cli-vxmmttmt.js} +55 -50
- package/dist/{cli-tt7dkwjj.js → cli-w4bvtxet.js} +7 -7
- package/dist/{cli-x2adbg4j.js → cli-wd7b5hgc.js} +1 -1
- package/dist/{cli-htb5bpz2.js → cli-wvbaq052.js} +1 -1
- package/dist/{cli-ywy8yz6t.js → cli-wvgg7r4j.js} +2 -2
- package/dist/{cli-19d6v8er.js → cli-wym6rxgt.js} +165 -6
- package/dist/{cli-f7b9nyvk.js → cli-yd7e590v.js} +12 -12
- package/dist/{cli-69zzpjgh.js → cli-yjb3cddd.js} +1 -1
- package/dist/{cli-5n9w2xzx.js → cli-z8t4485r.js} +2 -2
- package/dist/{cli-jdq3jmny.js → cli-ze1ndjs4.js} +4 -6
- package/dist/cli.js +28 -28
- package/dist/{codex-adapter-bn7eaxk5.js → codex-adapter-eq61radw.js} +8 -8
- package/dist/{codex-hook-nnmezjg9.js → codex-hook-8nmepvz6.js} +3 -3
- package/dist/{codex-login-ktfg1cxk.js → codex-login-vbd9707w.js} +1 -1
- package/dist/{codex-session-runner-j1e9hffc.js → codex-session-runner-rfx355h4.js} +9 -9
- package/dist/{commands-amhpafrr.js → commands-d1z0sx62.js} +3 -3
- package/dist/{controller-tw7g10j2.js → controller-9hz6d8x3.js} +4 -4
- package/dist/{controllers-connect-2ssqz7f4.js → controllers-connect-tz07d2xr.js} +24 -25
- package/dist/core-dynsv289.js +41 -0
- package/dist/{cursor-adapter-d6knjmwa.js → cursor-adapter-ef22ze3j.js} +2 -2
- package/dist/{db-fd6xxm77.js → db-gd81d68c.js} +3 -3
- package/dist/{db-sc59379z.js → db-vrckks6q.js} +4 -2
- package/dist/{devin-adapter-3bp6rape.js → devin-adapter-kdt6a2bh.js} +1 -1
- package/dist/{dispatcher-a2gdqz8c.js → dispatcher-76as8w2t.js} +21 -22
- package/dist/{docker-a59g3ebm.js → docker-51ta7jsh.js} +2 -2
- package/dist/dsh-adapter-ypfvcdyz.js +11 -0
- package/dist/{e2b-cn7cvjqy.js → e2b-05kn3kpq.js} +16 -5
- package/dist/{e2b-qnxyfea6.js → e2b-dm9r8hpy.js} +3 -3
- package/dist/{easter-egg-3d-a0pphy71.js → easter-egg-3d-sg21j15g.js} +1 -1
- package/dist/{embedding-space-qepzrach.js → embedding-space-zsdw37bb.js} +13 -23
- package/dist/{embeddings-d7vr881x.js → embeddings-p4e3e1m6.js} +1 -1
- package/dist/{event-bus-7gbsr0g4.js → event-bus-tvf2grf4.js} +1 -1
- package/dist/{execute-6afts2bn.js → execute-nztd0af0.js} +1 -1
- package/dist/{external-channel-881zq1x4.js → external-channel-717yzn4d.js} +2 -2
- package/dist/fx-adapter-9k0hptnz.js +20 -0
- package/dist/grok-adapter-skdj2pce.js +20 -0
- package/dist/handlers-5btjqkz6.js +39 -0
- package/dist/{heartbeat-4c022m6a.js → heartbeat-vfb1gy84.js} +24 -25
- package/dist/{hook-a7eh6zty.js → hook-ctz0xmp3.js} +11 -11
- package/dist/{hook-4k84x499.js → hook-eh52p7yd.js} +6 -6
- package/dist/{http-6aw5wanc.js → http-zregegrx.js} +784 -166
- package/dist/{index-xhad0n8m.js → index-5kx15d19.js} +1 -1
- package/dist/index-7w8p6em0.js +41 -0
- package/dist/index-evay0xyk.js +17 -0
- package/dist/{index-yq9hhhhy.js → index-fdym6ryb.js} +25 -26
- package/dist/{index-3j803vnb.js → index-mtnbhe12.js} +20533 -19786
- package/dist/index-vz4semsx.js +38 -0
- package/dist/{index-z2g9469g.js → index-x9qf8dg7.js} +108 -28
- package/dist/index-y3s0xp2v.js +43 -0
- package/dist/{k8s-36gfn847.js → k8s-ejkk0aw7.js} +2 -2
- package/dist/{keepalive-zhbmztqw.js → keepalive-zdqay870.js} +4 -5
- package/dist/lead-6cscw8a5.js +82 -0
- package/dist/{maintenance-rsp0591h.js → maintenance-t5ndg11m.js} +1 -1
- package/dist/{node-rxte5hc6.js → node-jkdd5w7m.js} +1 -1
- package/dist/{oauth-refresh-sweep-w3cqmxq7.js → oauth-refresh-sweep-y9zyd7t6.js} +3 -4
- package/dist/{object-webhooks-331hay92.js → object-webhooks-mkca91s0.js} +7 -7
- package/dist/{onboard-n2w80m2n.js → onboard-ss995244.js} +11 -9
- package/dist/{opencode-adapter-z98127cz.js → opencode-adapter-mwpz0278.js} +8 -8
- package/dist/{otel-impl-xsk35tvf.js → otel-impl-6n6vva3x.js} +2 -2
- package/dist/{pending-2e6trkxd.js → pending-2sxh1t6j.js} +22 -23
- package/dist/{pi-mono-adapter-wh6yndtm.js → pi-mono-adapter-sfb7zy43.js} +13 -13
- package/dist/{pricing-refresh-9355dj1t.js → pricing-refresh-h79bg4cf.js} +2 -2
- package/dist/{rbac-roles-8eajw4s6.js → rbac-roles-ckq0czp4.js} +2 -2
- package/dist/{rbac-roles-58y3m912.js → rbac-roles-jg2e260w.js} +3 -3
- package/dist/{render-v2-7gskkmd4.js → render-v2-ymbshmn0.js} +7 -7
- package/dist/{resume-0drnmpja.js → resume-jdhnt4jk.js} +10 -10
- package/dist/{runtime-d2tcmqte.js → runtime-y28jhhnf.js} +1 -1
- package/dist/{session-access-0ztys6bd.js → session-access-k4ta5hvp.js} +5 -5
- package/dist/{session-source-backfill-cdm5s046.js → session-source-backfill-528j4s8j.js} +3 -3
- package/dist/{setup-pqwb9tcc.js → setup-d6pj82fr.js} +15 -6
- package/dist/thread-buffer-9w6x5zec.js +40 -0
- package/dist/{tree-visibility-rwz67mje.js → tree-visibility-kjxv3nxk.js} +2 -2
- package/dist/{user-merge-jobs-mxrhamwt.js → user-merge-jobs-rabbncf6.js} +3 -3
- package/dist/{virtual-modules-71y1gsmg.js → virtual-modules-22k51txd.js} +3 -3
- package/dist/{work-objects-3k4ykt9j.js → work-objects-xtjbar3r.js} +26 -30
- package/dist/{worker-follow-up-y0h64xpr.js → worker-follow-up-fg48vk6d.js} +21 -22
- package/dist/worker-g4aj93dt.js +82 -0
- package/dist/{x-d27jj7z7.js → x-vfsqypht.js} +2 -2
- package/openapi.json +247 -20
- package/package.json +10 -10
- package/src/apps/definition.ts +76 -24
- package/src/apps/row-store.ts +67 -0
- package/src/apps/script-types.ts +131 -21
- package/src/apps/store.ts +4 -1
- package/src/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 +2 -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 +51 -147
- 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/repo-checked-update.ts +58 -5
- package/src/be/requester-timezone.ts +10 -0
- package/src/be/script-connections.ts +5 -1
- package/src/be/script-credential-broker.ts +29 -2
- package/src/be/scripts/durable.ts +204 -0
- package/src/be/scripts/extract-schema.ts +29 -4
- package/src/be/scripts/run-credential.ts +1 -8
- package/src/be/scripts/typecheck.ts +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 +87 -7
- 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/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/repos.ts +27 -11
- package/src/http/request-principal.ts +27 -1
- package/src/http/schedules.ts +36 -8
- 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 +92 -14
- 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/session-templates.ts +49 -0
- package/src/prompts/session-turns.ts +30 -0
- package/src/providers/amp-adapter.ts +1 -1
- 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/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 +1 -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/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 +264 -19
- package/src/slack/responses.ts +61 -5
- package/src/slack/session-mirror.ts +10 -5
- package/src/slack/task-output.ts +25 -14
- package/src/slack/templates.ts +9 -0
- package/src/slack/thread-participants.ts +64 -24
- package/src/slack/watcher.ts +4 -4
- package/src/slack/work-objects.ts +1 -1
- package/src/stdio.ts +5 -0
- package/src/tests/agents-list-model-display.test.ts +4 -0
- package/src/tests/apps-script-types.test.ts +63 -16
- package/src/tests/apps-sort-order.test.ts +87 -0
- 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-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/fixtures/onboard/content.env.txt +2 -2
- package/src/tests/fixtures/onboard/dev.env.txt +2 -2
- package/src/tests/fixtures/onboard/full-all.env.txt +2 -2
- package/src/tests/fixtures/onboard/full.env.txt +2 -2
- package/src/tests/fixtures/onboard/research.env.txt +2 -2
- package/src/tests/fixtures/onboard/solo.env.txt +2 -2
- package/src/tests/fixtures/runner-missing-dependency.ts +2 -1
- package/src/tests/fx-adapter.test.ts +4 -5
- package/src/tests/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/model-groups-live-catalog.test.ts +4 -0
- package/src/tests/oauth-credential-bindings.test.ts +8 -3
- package/src/tests/oauth-refresh-failure.test.ts +15 -3
- package/src/tests/onboard-env.test.ts +1 -1
- package/src/tests/openai-compatible-providers.test.ts +5 -0
- package/src/tests/openapi-route-headers.test.ts +2 -1
- package/src/tests/opus-5-5-registry.test.ts +4 -0
- package/src/tests/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 +116 -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-triggers-v2.test.ts +35 -11
- 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/run-schedule-now.ts +21 -1
- package/src/tools/script-apis.ts +9 -4
- package/src/tools/script-common.ts +2 -2
- package/src/tools/script-run.ts +8 -0
- package/src/tools/script-upsert.ts +1 -1
- package/src/tools/slack-download-file.ts +15 -12
- package/src/tools/slack-post.ts +7 -1
- package/src/tools/slack-read.ts +3 -1
- package/src/tools/slack-reply.ts +16 -0
- package/src/tools/slack-start-thread.ts +8 -1
- package/src/tools/slack-upload-file.ts +99 -96
- package/src/tools/swarm-config/set-config.ts +3 -1
- package/src/tools/swarm-x.ts +0 -2
- package/src/tools/utils.ts +3 -0
- package/src/types.ts +8 -2
- 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 +1 -1
- package/src/workflows/engine.ts +6 -11
- package/src/workflows/executors/swarm-script.ts +0 -2
- package/src/workflows/foreach-driver.ts +6 -12
- package/src/workflows/input.ts +24 -1
- package/src/workflows/node-timeout.ts +18 -0
- package/src/workflows/retry-poller.ts +2 -1
- package/src/workflows/triggers.ts +21 -11
- package/src/x/composio.ts +10 -1
- package/templates/skills/apps/SKILL.md +4 -2
- package/templates/skills/apps/content.md +4 -2
- package/templates/skills/code-quality/content.md +4 -4
- package/templates/skills/scheduled-task-resilience/SKILL.md +2 -0
- package/templates/skills/scheduled-task-resilience/content.md +2 -0
- package/templates/skills/swarm-docs/content.md +7 -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-b9ygp1kz.js +0 -459
- package/dist/cli-kj0hyr43.js +0 -51
- package/dist/cli-m8f4379k.js +0 -173
- 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/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/lead-g2j4q39z.js +0 -83
- package/dist/thread-buffer-epx3san4.js +0 -42
- package/dist/worker-09gqn9xy.js +0 -83
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { getAgentById } from "../be/db";
|
|
3
|
-
import type
|
|
3
|
+
import { can, type PermissionVerb, type RbacPrincipal, type RbacResource } from "../rbac";
|
|
4
4
|
import {
|
|
5
5
|
authUser,
|
|
6
6
|
authUserId,
|
|
@@ -168,3 +168,29 @@ export function rejectGuest(req: IncomingMessage, res: ServerResponse): boolean
|
|
|
168
168
|
jsonError(res, "Forbidden", 403);
|
|
169
169
|
return true;
|
|
170
170
|
}
|
|
171
|
+
|
|
172
|
+
/**
|
|
173
|
+
* Refuse an agent-bound session token (`aseph_`) whose agent may not do `verb`
|
|
174
|
+
* on `resource`. Only that credential is checked here: the shared API key,
|
|
175
|
+
* user tokens and page sessions keep the route's other checks, so a worker on
|
|
176
|
+
* the shared key behaves as before. Writes a 403 and returns true on refusal.
|
|
177
|
+
*/
|
|
178
|
+
export async function refuseAgentTokenWithout(
|
|
179
|
+
req: IncomingMessage,
|
|
180
|
+
res: ServerResponse,
|
|
181
|
+
verb: PermissionVerb,
|
|
182
|
+
resource: RbacResource = { kind: "none" },
|
|
183
|
+
): Promise<boolean> {
|
|
184
|
+
const auth = getRequestAuth(req);
|
|
185
|
+
if (auth?.kind !== "agent") return false;
|
|
186
|
+
const agent = await getAgentById(auth.agentId);
|
|
187
|
+
const decision = can({
|
|
188
|
+
principal: { kind: "agent", agentId: auth.agentId, isLead: agent?.isLead === true },
|
|
189
|
+
verb,
|
|
190
|
+
resource,
|
|
191
|
+
source: "http",
|
|
192
|
+
});
|
|
193
|
+
if (decision.allow) return false;
|
|
194
|
+
jsonError(res, `Forbidden: ${decision.reason}`, 403);
|
|
195
|
+
return true;
|
|
196
|
+
}
|
package/src/http/schedules.ts
CHANGED
|
@@ -39,6 +39,7 @@ import {
|
|
|
39
39
|
ScheduledTaskTargetTypeSchema,
|
|
40
40
|
splitLegacyModelAlias,
|
|
41
41
|
} from "../types";
|
|
42
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
42
43
|
import { authorizeHttpAssetKeyWrite } from "./asset-key-write";
|
|
43
44
|
import { resolveHttpFavoriteOwner } from "./favorite-owner";
|
|
44
45
|
import { agentFirstPrincipal } from "./request-principal";
|
|
@@ -518,6 +519,25 @@ export async function handleSchedules(
|
|
|
518
519
|
return true;
|
|
519
520
|
}
|
|
520
521
|
|
|
522
|
+
// A schedule runs as its creator. An agent-bound token may run it only as
|
|
523
|
+
// its creator or a lead.
|
|
524
|
+
if (
|
|
525
|
+
getRequestAuth(req)?.kind === "agent" &&
|
|
526
|
+
!can({
|
|
527
|
+
principal: await agentFirstPrincipal(req, myAgentId),
|
|
528
|
+
verb: "schedule.run.any",
|
|
529
|
+
resource: { kind: "owned", ownerAgentId: schedule.createdByAgentId },
|
|
530
|
+
source: "http",
|
|
531
|
+
}).allow
|
|
532
|
+
) {
|
|
533
|
+
jsonError(
|
|
534
|
+
res,
|
|
535
|
+
`Schedule "${schedule.name}" runs as the agent that created it. Only that agent or a lead can run it.`,
|
|
536
|
+
403,
|
|
537
|
+
);
|
|
538
|
+
return true;
|
|
539
|
+
}
|
|
540
|
+
|
|
521
541
|
if (!schedule.enabled) {
|
|
522
542
|
jsonError(res, "Schedule is disabled", 400);
|
|
523
543
|
return true;
|
|
@@ -774,6 +794,10 @@ export async function handleSchedules(
|
|
|
774
794
|
|
|
775
795
|
// Recalculate nextRunAt when timing fields or enabled status changes
|
|
776
796
|
const newEnabled = parsed.body.enabled !== undefined ? parsed.body.enabled : existing.enabled;
|
|
797
|
+
const cronTimezoneChanged =
|
|
798
|
+
Boolean(existing.cronExpression) &&
|
|
799
|
+
parsed.body.timezone !== undefined &&
|
|
800
|
+
parsed.body.timezone !== existing.timezone;
|
|
777
801
|
if (existing.scheduleType === "one_time") {
|
|
778
802
|
if (!newEnabled) {
|
|
779
803
|
body.nextRunAt = null;
|
|
@@ -784,6 +808,7 @@ export async function handleSchedules(
|
|
|
784
808
|
} else if (
|
|
785
809
|
parsed.body.cronExpression !== undefined ||
|
|
786
810
|
parsed.body.intervalMs !== undefined ||
|
|
811
|
+
cronTimezoneChanged ||
|
|
787
812
|
(parsed.body.enabled === true && !existing.enabled)
|
|
788
813
|
) {
|
|
789
814
|
const timing = mergeScheduleTiming(
|
|
@@ -793,15 +818,18 @@ export async function handleSchedules(
|
|
|
793
818
|
},
|
|
794
819
|
{ cronExpression: parsed.body.cronExpression, intervalMs: parsed.body.intervalMs },
|
|
795
820
|
);
|
|
796
|
-
const mergedTimezone =
|
|
797
|
-
parsed.body.timezone !== undefined ? parsed.body.timezone : existing.timezone;
|
|
798
821
|
if (timing.mergedCron || timing.mergedInterval) {
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
822
|
+
try {
|
|
823
|
+
body.nextRunAt = calculateNextRun({
|
|
824
|
+
...existing,
|
|
825
|
+
cronExpression: timing.mergedCron ?? undefined,
|
|
826
|
+
intervalMs: timing.mergedInterval ?? undefined,
|
|
827
|
+
timezone: parsed.body.timezone ?? existing.timezone,
|
|
828
|
+
});
|
|
829
|
+
} catch {
|
|
830
|
+
jsonError(res, "Cannot calculate the next run for this schedule.", 400);
|
|
831
|
+
return true;
|
|
832
|
+
}
|
|
805
833
|
}
|
|
806
834
|
}
|
|
807
835
|
}
|
|
@@ -192,9 +192,11 @@ export async function handleScriptConnectionProxy(
|
|
|
192
192
|
);
|
|
193
193
|
mcpCallRoute.respond(res, 200, result);
|
|
194
194
|
} catch (err) {
|
|
195
|
+
// callMcpServerTool scrubs the upstream result and its own errors. This
|
|
196
|
+
// also covers errors raised while resolving the server and its headers.
|
|
195
197
|
mcpCallRoute.respond(res, 200, {
|
|
196
198
|
ok: false,
|
|
197
|
-
error: err instanceof Error ? err.message : String(err),
|
|
199
|
+
error: scrubSecrets(err instanceof Error ? err.message : String(err)),
|
|
198
200
|
});
|
|
199
201
|
}
|
|
200
202
|
return true;
|
package/src/http/script-runs.ts
CHANGED
|
@@ -31,6 +31,8 @@ import { lintWorkflowLabels } from "../script-workflows/label-lint";
|
|
|
31
31
|
import { scriptRunMaxAgentTasks, scriptRunMaxSteps } from "../script-workflows/limits";
|
|
32
32
|
import {
|
|
33
33
|
abortScriptRunLimit,
|
|
34
|
+
DURABLE_RUNS_NATIVE_REFUSED,
|
|
35
|
+
durableScriptRunsAllowed,
|
|
34
36
|
startScriptRunProcess,
|
|
35
37
|
terminateScriptRunProcess,
|
|
36
38
|
} from "../script-workflows/supervisor";
|
|
@@ -49,7 +51,7 @@ import {
|
|
|
49
51
|
ScriptRunStatusSchema,
|
|
50
52
|
TERMINAL_SCRIPT_RUN_STATUSES,
|
|
51
53
|
} from "../types";
|
|
52
|
-
import { getAppUrl,
|
|
54
|
+
import { getAppUrl, getScriptApiBaseUrl } from "../utils/constants";
|
|
53
55
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
54
56
|
import {
|
|
55
57
|
executeRawLlm,
|
|
@@ -82,6 +84,10 @@ const listScriptRunsQuerySchema = z.object({
|
|
|
82
84
|
status: ScriptRunStatusSchema.optional(),
|
|
83
85
|
agentId: z.string().optional(),
|
|
84
86
|
scriptName: z.string().optional(),
|
|
87
|
+
/** Object calls on this durable script. */
|
|
88
|
+
objectScriptId: z.string().optional(),
|
|
89
|
+
/** One object of that script. */
|
|
90
|
+
objectId: z.string().optional(),
|
|
85
91
|
limit: z.coerce.number().int().min(1).max(500).optional(),
|
|
86
92
|
offset: z.coerce.number().int().min(0).optional(),
|
|
87
93
|
});
|
|
@@ -447,6 +453,11 @@ export async function handleScriptRuns(
|
|
|
447
453
|
const agent = await requireAgent(res, agentId);
|
|
448
454
|
if (!agent) return true;
|
|
449
455
|
|
|
456
|
+
if (!durableScriptRunsAllowed()) {
|
|
457
|
+
jsonError(res, DURABLE_RUNS_NATIVE_REFUSED, 400);
|
|
458
|
+
return true;
|
|
459
|
+
}
|
|
460
|
+
|
|
450
461
|
const secretRefusal = refuseSourceWithSecrets(parsed.body.source);
|
|
451
462
|
if (secretRefusal) {
|
|
452
463
|
json(res, secretRefusal, 400);
|
|
@@ -508,7 +519,7 @@ export async function handleScriptRuns(
|
|
|
508
519
|
const { run, existing } = creation;
|
|
509
520
|
|
|
510
521
|
if (!existing && parsed.body.background) {
|
|
511
|
-
startScriptRunProcess(run,
|
|
522
|
+
startScriptRunProcess(run, getScriptApiBaseUrl(), bearerToken(req)).catch(async (err) => {
|
|
512
523
|
await updateScriptRun(run.id, {
|
|
513
524
|
status: "failed",
|
|
514
525
|
pid: null,
|
|
@@ -537,20 +548,20 @@ export async function handleScriptRuns(
|
|
|
537
548
|
if (listScriptRunsRoute.match(req.method, pathSegments)) {
|
|
538
549
|
const parsed = await listScriptRunsRoute.parse(req, res, pathSegments, queryParams);
|
|
539
550
|
if (!parsed) return true;
|
|
540
|
-
const
|
|
551
|
+
const filter = {
|
|
541
552
|
status: parsed.query.status,
|
|
542
553
|
agentId: parsed.query.agentId,
|
|
543
554
|
scriptName: parsed.query.scriptName,
|
|
544
|
-
|
|
545
|
-
|
|
555
|
+
objectScriptId: parsed.query.objectScriptId,
|
|
556
|
+
objectId: parsed.query.objectId,
|
|
546
557
|
};
|
|
547
558
|
listScriptRunsRoute.respond(res, 200, {
|
|
548
|
-
runs: await listScriptRuns(
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
scriptName: opts.scriptName,
|
|
559
|
+
runs: await listScriptRuns({
|
|
560
|
+
...filter,
|
|
561
|
+
limit: parsed.query.limit ?? 50,
|
|
562
|
+
offset: parsed.query.offset ?? 0,
|
|
553
563
|
}),
|
|
564
|
+
total: await countScriptRuns(filter),
|
|
554
565
|
});
|
|
555
566
|
return true;
|
|
556
567
|
}
|
package/src/http/scripts.ts
CHANGED
|
@@ -30,6 +30,7 @@ import {
|
|
|
30
30
|
updateScriptApi,
|
|
31
31
|
upsertScriptByName,
|
|
32
32
|
} from "../be/scripts/db";
|
|
33
|
+
import { callDurableObject } from "../be/scripts/durable";
|
|
33
34
|
import { searchScripts } from "../be/scripts/embeddings";
|
|
34
35
|
import { extractArgsJsonSchema } from "../be/scripts/extract-schema";
|
|
35
36
|
import { runScriptWithRunCredential } from "../be/scripts/run-credential";
|
|
@@ -40,9 +41,12 @@ import {
|
|
|
40
41
|
typecheckScript,
|
|
41
42
|
} from "../be/scripts/typecheck";
|
|
42
43
|
import { toScriptSearchResults } from "../be/scripts/user-code-mode";
|
|
44
|
+
import { isScriptRunToken } from "../be/users";
|
|
43
45
|
import { can } from "../rbac";
|
|
44
46
|
import { isExecutorAllowedByDeployment } from "../scripts-runtime/executors/registry";
|
|
47
|
+
import type { ScriptCaller } from "../scripts-runtime/executors/types";
|
|
45
48
|
import { extractScriptSignature, type ScriptSignature } from "../scripts-runtime/extract-signature";
|
|
49
|
+
import type { RunScriptOutput } from "../scripts-runtime/loader";
|
|
46
50
|
import { checkQuickJSCompat, quickJSCompatWarnings } from "../scripts-runtime/quickjs-compat";
|
|
47
51
|
import {
|
|
48
52
|
ScriptApiAuthModeSchema,
|
|
@@ -57,8 +61,9 @@ import {
|
|
|
57
61
|
ScriptScopeSchema,
|
|
58
62
|
ScriptVersionRecordSchema,
|
|
59
63
|
} from "../types";
|
|
60
|
-
import { getCurrentRunProvenance } from "../utils/request-auth-context";
|
|
64
|
+
import { getCurrentRunProvenance, getRequestAuth } from "../utils/request-auth-context";
|
|
61
65
|
import { scrubObject, scrubSecrets } from "../utils/secret-scrubber";
|
|
66
|
+
import { refuseAgentTokenWithout } from "./request-principal";
|
|
62
67
|
import { route, runtimeInstanceHeader } from "./route-def";
|
|
63
68
|
import { json, jsonError } from "./utils";
|
|
64
69
|
|
|
@@ -78,6 +83,9 @@ const runBodySchema = z
|
|
|
78
83
|
.object({
|
|
79
84
|
name: scriptNameSchema.optional(),
|
|
80
85
|
source: z.string().min(1).optional(),
|
|
86
|
+
object: z
|
|
87
|
+
.object({ id: z.string().min(1).max(256), method: z.string().min(1).max(128) })
|
|
88
|
+
.optional(),
|
|
81
89
|
args: z.unknown().optional(),
|
|
82
90
|
intent: z.string().default(""),
|
|
83
91
|
scope: ScriptScopeSchema.optional(),
|
|
@@ -87,6 +95,9 @@ const runBodySchema = z
|
|
|
87
95
|
})
|
|
88
96
|
.refine((body) => Boolean(body.name) !== Boolean(body.source), {
|
|
89
97
|
message: "Provide exactly one of name or source",
|
|
98
|
+
})
|
|
99
|
+
.refine((body) => !body.object || Boolean(body.name), {
|
|
100
|
+
message: "object requires name",
|
|
90
101
|
});
|
|
91
102
|
|
|
92
103
|
const searchBodySchema = z.object({
|
|
@@ -109,6 +120,13 @@ const listScriptsQuerySchema = z.object({
|
|
|
109
120
|
// `extractScriptSignature`, so `JSON.parse(script.signatureJson)` is always
|
|
110
121
|
// exactly this shape.
|
|
111
122
|
const scriptSignatureSchema = z.object({
|
|
123
|
+
kind: z.literal("durable").optional(),
|
|
124
|
+
methods: z
|
|
125
|
+
.record(
|
|
126
|
+
z.string(),
|
|
127
|
+
z.object({ argsType: z.string(), resultType: z.string(), description: z.string() }),
|
|
128
|
+
)
|
|
129
|
+
.optional(),
|
|
112
130
|
argsType: z.string(),
|
|
113
131
|
resultType: z.string(),
|
|
114
132
|
description: z.string(),
|
|
@@ -135,12 +153,26 @@ const rowAuditColumnsShape = {
|
|
|
135
153
|
updated_by: z.string().nullable().optional(),
|
|
136
154
|
};
|
|
137
155
|
|
|
156
|
+
/** `durable` when the stored signature marks a DurableObject class script. */
|
|
157
|
+
function scriptKind(signatureJson: string): "function" | "durable" {
|
|
158
|
+
try {
|
|
159
|
+
return (JSON.parse(signatureJson) as { kind?: unknown } | null)?.kind === "durable"
|
|
160
|
+
? "durable"
|
|
161
|
+
: "function";
|
|
162
|
+
} catch {
|
|
163
|
+
return "function";
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
138
167
|
/** Lean projection served by `GET /api/scripts` — mirrors `ScriptListItem`. */
|
|
139
168
|
const scriptListItemSchema = ScriptRecordSchema.omit({
|
|
140
169
|
source: true,
|
|
141
170
|
signatureJson: true,
|
|
142
171
|
argsJsonSchema: true,
|
|
143
172
|
contentHash: true,
|
|
173
|
+
}).extend({
|
|
174
|
+
/** `durable` for a DurableObject class script, else `function`. */
|
|
175
|
+
kind: z.enum(["function", "durable"]),
|
|
144
176
|
});
|
|
145
177
|
|
|
146
178
|
/**
|
|
@@ -166,6 +198,7 @@ const scriptApiWithSecretSchema = ScriptApiRecordSchema.extend({
|
|
|
166
198
|
// route adds.
|
|
167
199
|
const scriptRunResponseSchema = z.object({
|
|
168
200
|
result: z.unknown().optional(),
|
|
201
|
+
object: z.object({ id: z.string(), stateVersion: z.number(), destroyed: z.boolean() }).optional(),
|
|
169
202
|
autoSaved: z.object({ slug: z.string(), reason: z.string() }).optional(),
|
|
170
203
|
kvSaved: z.object({ namespace: z.string(), key: z.string() }).optional(),
|
|
171
204
|
truncated: z.object({ stdout: z.boolean(), stderr: z.boolean() }),
|
|
@@ -250,7 +283,9 @@ const upsertRoute = route({
|
|
|
250
283
|
warnings: z
|
|
251
284
|
.array(z.string())
|
|
252
285
|
.optional()
|
|
253
|
-
.describe(
|
|
286
|
+
.describe(
|
|
287
|
+
"Advisory findings: quickjs-executor compatibility, and apps the script names that have no generated script types. Never blocks the save.",
|
|
288
|
+
),
|
|
254
289
|
}),
|
|
255
290
|
},
|
|
256
291
|
400: { description: "Validation or typecheck failure" },
|
|
@@ -278,6 +313,7 @@ const runRoute = route({
|
|
|
278
313
|
200: { description: "Script run completed", schema: scriptRunResponseSchema },
|
|
279
314
|
400: { description: "Validation error" },
|
|
280
315
|
404: { description: "Script not found" },
|
|
316
|
+
409: { description: "Object busy, re-entry, or lease lost" },
|
|
281
317
|
501: { description: "workspace-rw scripts are not supported in v1" },
|
|
282
318
|
},
|
|
283
319
|
});
|
|
@@ -692,6 +728,14 @@ export async function handleScripts(
|
|
|
692
728
|
return true;
|
|
693
729
|
}
|
|
694
730
|
|
|
731
|
+
if (
|
|
732
|
+
parsed.body.scope !== "global" &&
|
|
733
|
+
extractScriptSignature(parsed.body.source).kind === "durable"
|
|
734
|
+
) {
|
|
735
|
+
jsonError(res, "DurableObject scripts must be global scope", 400);
|
|
736
|
+
return true;
|
|
737
|
+
}
|
|
738
|
+
|
|
695
739
|
const typecheck = await typecheckScript(parsed.body.source, { agentId: agent.id });
|
|
696
740
|
if (!typecheck.ok) {
|
|
697
741
|
json(
|
|
@@ -739,9 +783,12 @@ export async function handleScripts(
|
|
|
739
783
|
});
|
|
740
784
|
}
|
|
741
785
|
|
|
742
|
-
const warnings =
|
|
743
|
-
|
|
744
|
-
|
|
786
|
+
const warnings = [
|
|
787
|
+
...quickJSCompatWarnings(
|
|
788
|
+
checkQuickJSCompat(parsed.body.source, { fsMode: parsed.body.fsMode }),
|
|
789
|
+
),
|
|
790
|
+
...(typecheck.warnings ?? []),
|
|
791
|
+
];
|
|
745
792
|
upsertRoute.respond(res, 200, {
|
|
746
793
|
name: result.script.name,
|
|
747
794
|
version: result.script.version,
|
|
@@ -757,6 +804,13 @@ export async function handleScripts(
|
|
|
757
804
|
const agent = await requireAgent(res, agentId);
|
|
758
805
|
if (!agent) return true;
|
|
759
806
|
|
|
807
|
+
const callerProvenance = getCurrentRunProvenance();
|
|
808
|
+
const depth = callerProvenance?.depth ?? 0;
|
|
809
|
+
if (depth >= 16) {
|
|
810
|
+
jsonError(res, "call depth exceeds 16", 400);
|
|
811
|
+
return true;
|
|
812
|
+
}
|
|
813
|
+
|
|
760
814
|
// Per-boot identity of the invoking worker process. Carried into the
|
|
761
815
|
// script runtime as system context so SDK work-acquisition calls present
|
|
762
816
|
// the same runtime the worker itself would — never script input.
|
|
@@ -776,6 +830,11 @@ export async function handleScripts(
|
|
|
776
830
|
return true;
|
|
777
831
|
}
|
|
778
832
|
|
|
833
|
+
if (parsed.body.source && extractScriptSignature(parsed.body.source).kind === "durable") {
|
|
834
|
+
jsonError(res, "DurableObject scripts must be saved globally and called by name", 400);
|
|
835
|
+
return true;
|
|
836
|
+
}
|
|
837
|
+
|
|
779
838
|
let source = parsed.body.source;
|
|
780
839
|
let fsMode = parsed.body.fsMode;
|
|
781
840
|
let executor = parsed.body.executor ?? null;
|
|
@@ -792,6 +851,21 @@ export async function handleScripts(
|
|
|
792
851
|
executor = parsed.body.executor !== undefined ? parsed.body.executor : script.executor;
|
|
793
852
|
}
|
|
794
853
|
|
|
854
|
+
const isDurable = namedScript && JSON.parse(namedScript.signatureJson).kind === "durable";
|
|
855
|
+
if (isDurable && namedScript) {
|
|
856
|
+
if (namedScript.scope !== "global") {
|
|
857
|
+
jsonError(res, "DurableObject scripts must be global scope", 400);
|
|
858
|
+
return true;
|
|
859
|
+
}
|
|
860
|
+
if (!parsed.body.object) {
|
|
861
|
+
jsonError(res, "DurableObject scripts require object: { id, method }", 400);
|
|
862
|
+
return true;
|
|
863
|
+
}
|
|
864
|
+
} else if (parsed.body.object) {
|
|
865
|
+
jsonError(res, "not a DurableObject", 400);
|
|
866
|
+
return true;
|
|
867
|
+
}
|
|
868
|
+
|
|
795
869
|
if (fsMode === "workspace-rw") {
|
|
796
870
|
jsonError(res, "workspace-rw scripts are not supported by /api/scripts/run in v1", 501);
|
|
797
871
|
return true;
|
|
@@ -812,32 +886,81 @@ export async function handleScripts(
|
|
|
812
886
|
const runStartTouch = namedScript?.isScratch
|
|
813
887
|
? await touchScratchScriptLastUsed(namedScript.id)
|
|
814
888
|
: null;
|
|
815
|
-
const credentials = await buildScriptCredentialBindingsWithFailures({ agentId: agent.id });
|
|
816
889
|
// The run's script_runs id is fixed up front so the rows the script creates
|
|
817
890
|
// through its token can point at it; a nested call keeps its caller's step.
|
|
818
891
|
const runId = crypto.randomUUID();
|
|
819
|
-
const
|
|
820
|
-
|
|
821
|
-
|
|
822
|
-
|
|
892
|
+
const provenance = {
|
|
893
|
+
...callerProvenance,
|
|
894
|
+
sourceScriptRunId: runId,
|
|
895
|
+
};
|
|
896
|
+
const credentials = await buildScriptCredentialBindingsWithFailures({ agentId: agent.id });
|
|
897
|
+
const runContext = {
|
|
898
|
+
agentId: agent.id,
|
|
899
|
+
runtimeInstanceId,
|
|
900
|
+
sourceTaskId,
|
|
901
|
+
egressSecrets: credentials.egressSecrets,
|
|
902
|
+
failedBindings: credentials.failedBindings,
|
|
903
|
+
userConfig: credentials.userConfig,
|
|
904
|
+
agentFs: credentials.agentFs,
|
|
905
|
+
apiConnections: getScriptApiConnectionDescriptors({ agentId: agent.id }),
|
|
906
|
+
mcpConnections: getScriptMcpConnectionDescriptors({ agentId: agent.id }),
|
|
907
|
+
};
|
|
908
|
+
let output: RunScriptOutput;
|
|
909
|
+
let object: { id: string; stateVersion: number; destroyed: boolean } | undefined;
|
|
910
|
+
if (isDurable && namedScript && parsed.body.object) {
|
|
911
|
+
const auth = getRequestAuth(req);
|
|
912
|
+
// The caller's own script_runs row is written only after it finishes, so
|
|
913
|
+
// a nested call knows the calling agent but not yet the calling script.
|
|
914
|
+
const caller: ScriptCaller =
|
|
915
|
+
auth?.kind === "agent" && (await isScriptRunToken(auth.tokenId))
|
|
916
|
+
? { kind: "script", agentId: agent.id }
|
|
917
|
+
: { kind: "agent", agentId: agent.id };
|
|
918
|
+
const result = await callDurableObject({
|
|
919
|
+
...runContext,
|
|
920
|
+
script: namedScript,
|
|
921
|
+
objectId: parsed.body.object.id,
|
|
922
|
+
method: parsed.body.object.method,
|
|
823
923
|
args: parsed.body.args,
|
|
824
|
-
|
|
924
|
+
caller,
|
|
925
|
+
provenance,
|
|
825
926
|
executor,
|
|
826
|
-
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
|
|
832
|
-
|
|
833
|
-
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
927
|
+
fsMode,
|
|
928
|
+
nested: callerProvenance !== null,
|
|
929
|
+
});
|
|
930
|
+
if (!result.ok && result.code !== "run_failed") {
|
|
931
|
+
const status = ["busy", "reentry", "lease_lost"].includes(result.code) ? 409 : 400;
|
|
932
|
+
jsonError(res, result.message, status);
|
|
933
|
+
return true;
|
|
934
|
+
}
|
|
935
|
+
if (result.ok) {
|
|
936
|
+
output = result.output;
|
|
937
|
+
object = result.object;
|
|
938
|
+
} else {
|
|
939
|
+
output = result.output ?? {
|
|
940
|
+
result: undefined,
|
|
941
|
+
stdout: "",
|
|
942
|
+
stderr: result.message,
|
|
943
|
+
truncated: { stdout: false, stderr: false },
|
|
944
|
+
durationMs: 0,
|
|
945
|
+
exitCode: 1,
|
|
946
|
+
error: "executor_error",
|
|
947
|
+
};
|
|
948
|
+
if (output.exitCode === 0 && !output.error && !output.runtimeError) {
|
|
949
|
+
output = { ...output, exitCode: 1, error: "executor_error", stderr: result.message };
|
|
950
|
+
}
|
|
951
|
+
}
|
|
952
|
+
} else {
|
|
953
|
+
output = await runScriptWithRunCredential(
|
|
954
|
+
{
|
|
955
|
+
...runContext,
|
|
956
|
+
source: source as string,
|
|
957
|
+
args: parsed.body.args,
|
|
958
|
+
fsMode,
|
|
959
|
+
executor,
|
|
960
|
+
},
|
|
961
|
+
{ ...provenance, depth: depth + 1 },
|
|
962
|
+
);
|
|
963
|
+
}
|
|
841
964
|
const ok = output.exitCode === 0 && !output.error && !output.runtimeError;
|
|
842
965
|
|
|
843
966
|
if (namedScript?.isScratch && ok) {
|
|
@@ -921,6 +1044,9 @@ export async function handleScripts(
|
|
|
921
1044
|
// redaction guarantees as the scrubbed run response below.
|
|
922
1045
|
args: scrubObject(parsed.body.args ?? null),
|
|
923
1046
|
scriptName: parsed.body.name ?? "(inline source)",
|
|
1047
|
+
objectScriptId: isDurable ? namedScript?.id : undefined,
|
|
1048
|
+
objectId: parsed.body.object?.id,
|
|
1049
|
+
objectMethod: parsed.body.object?.method,
|
|
924
1050
|
status: ok ? "completed" : "failed",
|
|
925
1051
|
output: scrubObject(output.result),
|
|
926
1052
|
error: runError,
|
|
@@ -936,6 +1062,7 @@ export async function handleScripts(
|
|
|
936
1062
|
200,
|
|
937
1063
|
scrubObject({
|
|
938
1064
|
result: output.result,
|
|
1065
|
+
object,
|
|
939
1066
|
autoSaved,
|
|
940
1067
|
kvSaved,
|
|
941
1068
|
truncated: output.truncated,
|
|
@@ -995,6 +1122,7 @@ export async function handleScripts(
|
|
|
995
1122
|
updatedBy: script.updatedBy,
|
|
996
1123
|
createdAt: script.createdAt,
|
|
997
1124
|
updatedAt: script.updatedAt,
|
|
1125
|
+
kind: scriptKind(script.signatureJson),
|
|
998
1126
|
}));
|
|
999
1127
|
listScriptsRoute.respond(res, 200, { scripts });
|
|
1000
1128
|
return true;
|
|
@@ -1149,6 +1277,25 @@ export async function handleScripts(
|
|
|
1149
1277
|
jsonError(res, "agentId is required: this script has no owning agent to run as", 400);
|
|
1150
1278
|
return true;
|
|
1151
1279
|
}
|
|
1280
|
+
// An agent-bound token must hold the route permission, as the script-apis
|
|
1281
|
+
// tool requires, and must name a registered agent to run as.
|
|
1282
|
+
const auth = getRequestAuth(req);
|
|
1283
|
+
if (auth?.kind === "agent") {
|
|
1284
|
+
const caller = await getAgentById(auth.agentId);
|
|
1285
|
+
const decision = can({
|
|
1286
|
+
principal: { kind: "agent", agentId: auth.agentId, isLead: caller?.isLead === true },
|
|
1287
|
+
verb: "script.api.create",
|
|
1288
|
+
source: "http",
|
|
1289
|
+
});
|
|
1290
|
+
if (!decision.allow) {
|
|
1291
|
+
jsonError(res, `Forbidden: ${decision.reason}`, 403);
|
|
1292
|
+
return true;
|
|
1293
|
+
}
|
|
1294
|
+
if (!(await getAgentById(runAsAgentId))) {
|
|
1295
|
+
jsonError(res, `agentId "${runAsAgentId}" is not a registered agent`, 400);
|
|
1296
|
+
return true;
|
|
1297
|
+
}
|
|
1298
|
+
}
|
|
1152
1299
|
const endpoint = await createScriptApi({
|
|
1153
1300
|
scriptId: script.id,
|
|
1154
1301
|
agentId: runAsAgentId,
|
|
@@ -1182,6 +1329,7 @@ export async function handleScripts(
|
|
|
1182
1329
|
if (revealScriptApiSecretRoute.match(req.method, pathSegments)) {
|
|
1183
1330
|
const parsed = await revealScriptApiSecretRoute.parse(req, res, pathSegments, queryParams);
|
|
1184
1331
|
if (!parsed) return true;
|
|
1332
|
+
if (await refuseAgentTokenWithout(req, res, "script.api.read.secrets")) return true;
|
|
1185
1333
|
const endpoint = await getScriptApiById(parsed.params.endpointId);
|
|
1186
1334
|
if (!endpoint || endpoint.scriptId !== parsed.params.id) {
|
|
1187
1335
|
jsonError(res, "Endpoint not found", 404);
|
|
@@ -1194,6 +1342,7 @@ export async function handleScripts(
|
|
|
1194
1342
|
if (rotateScriptApiRoute.match(req.method, pathSegments)) {
|
|
1195
1343
|
const parsed = await rotateScriptApiRoute.parse(req, res, pathSegments, queryParams);
|
|
1196
1344
|
if (!parsed) return true;
|
|
1345
|
+
if (await refuseAgentTokenWithout(req, res, "script.api.rotate")) return true;
|
|
1197
1346
|
const endpoint = await getScriptApiById(parsed.params.endpointId);
|
|
1198
1347
|
if (!endpoint || endpoint.scriptId !== parsed.params.id) {
|
|
1199
1348
|
jsonError(res, "Endpoint not found", 404);
|
|
@@ -1214,6 +1363,7 @@ export async function handleScripts(
|
|
|
1214
1363
|
if (patchScriptApiRoute.match(req.method, pathSegments)) {
|
|
1215
1364
|
const parsed = await patchScriptApiRoute.parse(req, res, pathSegments, queryParams);
|
|
1216
1365
|
if (!parsed) return true;
|
|
1366
|
+
if (await refuseAgentTokenWithout(req, res, "script.api.update")) return true;
|
|
1217
1367
|
const endpoint = await getScriptApiById(parsed.params.endpointId);
|
|
1218
1368
|
if (!endpoint || endpoint.scriptId !== parsed.params.id) {
|
|
1219
1369
|
jsonError(res, "Endpoint not found", 404);
|
|
@@ -1231,6 +1381,7 @@ export async function handleScripts(
|
|
|
1231
1381
|
if (deleteScriptApiRoute.match(req.method, pathSegments)) {
|
|
1232
1382
|
const parsed = await deleteScriptApiRoute.parse(req, res, pathSegments, queryParams);
|
|
1233
1383
|
if (!parsed) return true;
|
|
1384
|
+
if (await refuseAgentTokenWithout(req, res, "script.api.delete")) return true;
|
|
1234
1385
|
const endpoint = await getScriptApiById(parsed.params.endpointId);
|
|
1235
1386
|
if (!endpoint || endpoint.scriptId !== parsed.params.id) {
|
|
1236
1387
|
jsonError(res, "Endpoint not found", 404);
|
|
@@ -9,9 +9,14 @@ import { AMP_ESTIMATE_MODELS, ampBillsCacheWrites, resolveAmpModel } from "../ut
|
|
|
9
9
|
|
|
10
10
|
const PER_MILLION = 1_000_000;
|
|
11
11
|
|
|
12
|
-
// Providers whose reported input token counts INCLUDE cache reads
|
|
13
|
-
// (OpenAI-style), so uncached input = max(0, input − cacheRead
|
|
14
|
-
// verified inclusive (its own SDK contract, see
|
|
12
|
+
// Providers whose reported input token counts INCLUDE cache reads and cache
|
|
13
|
+
// writes (OpenAI-style), so uncached input = max(0, input − cacheRead −
|
|
14
|
+
// cacheWrite). Only codex is verified inclusive (its own SDK contract, see
|
|
15
|
+
// codex-adapter.ts). Codex reports cache writes only when it runs on an OpenAI
|
|
16
|
+
// API key, and they are inside input as well: on real gpt-5.6-terra sessions
|
|
17
|
+
// input = cacheRead + cacheWrite + a few dozen tokens (e.g. 385,142 = 341,438 +
|
|
18
|
+
// 43,674 + 30), so subtracting only the reads billed every written token twice,
|
|
19
|
+
// at the `input` rate and again at `cache_write`. Everyone
|
|
15
20
|
// else reports input DISJOINT from cache reads and is billed as-is:
|
|
16
21
|
// claude/claude-managed/pi per Anthropic semantics, opencode verified against
|
|
17
22
|
// prod events 2026-08-06 (53/53 finalized messages show input < cacheRead —
|
|
@@ -83,7 +88,7 @@ async function priceModel(
|
|
|
83
88
|
|
|
84
89
|
const cacheReadRate = (await lookupRate(provider, lookupModel, "cached_input", atEpochMs)) ?? 0;
|
|
85
90
|
const uncachedInputTokens = INCLUSIVE_INPUT_PROVIDERS.has(provider)
|
|
86
|
-
? Math.max(0, usage.inputTokens - usage.cacheReadTokens)
|
|
91
|
+
? Math.max(0, usage.inputTokens - usage.cacheReadTokens - usage.cacheWriteTokens)
|
|
87
92
|
: usage.inputTokens;
|
|
88
93
|
|
|
89
94
|
let cacheWriteCostUnits = 0;
|