@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
package/src/be/users.ts
CHANGED
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
import { createHash, randomUUID } from "node:crypto";
|
|
23
23
|
import { scheduleOrgDomainRecompute } from "../telemetry-identity";
|
|
24
24
|
import type { User } from "../types";
|
|
25
|
+
import type { ScriptRunProvenance } from "../utils/request-auth-context";
|
|
25
26
|
import { registerVolatileSecret, unregisterVolatileSecret } from "../utils/secret-scrubber";
|
|
26
27
|
import { closeSessionTokenConnections } from "../utils/session-token-connections";
|
|
27
28
|
import { randomChars } from "../utils/short-id";
|
|
@@ -412,6 +413,14 @@ export async function findOrCreateUserByEmail(
|
|
|
412
413
|
return { user: created, created: true };
|
|
413
414
|
}
|
|
414
415
|
|
|
416
|
+
/** A profile lookup can finish after a manual edit. Test the stored value in the write. */
|
|
417
|
+
export async function fillMissingUserTimezone(id: string, timezone: string): Promise<void> {
|
|
418
|
+
await getDbClient().run(
|
|
419
|
+
"UPDATE users SET timezone = ?, lastUpdatedAt = ? WHERE id = ? AND (timezone IS NULL OR timezone = '')",
|
|
420
|
+
[timezone, new Date().toISOString(), id],
|
|
421
|
+
);
|
|
422
|
+
}
|
|
423
|
+
|
|
415
424
|
// ---------------------------------------------------------------------------
|
|
416
425
|
// Identity link/unlink
|
|
417
426
|
// ---------------------------------------------------------------------------
|
|
@@ -746,7 +755,7 @@ export async function mintRuntimeToken(
|
|
|
746
755
|
export async function mintScriptRunToken(
|
|
747
756
|
agentId: string,
|
|
748
757
|
ttlMs: number,
|
|
749
|
-
provenance:
|
|
758
|
+
provenance: ScriptRunProvenance = {},
|
|
750
759
|
): Promise<{ tokenId: string; plaintext: string }> {
|
|
751
760
|
const token = await insertSessionToken(
|
|
752
761
|
agentId,
|
|
@@ -761,10 +770,21 @@ export async function mintScriptRunToken(
|
|
|
761
770
|
);
|
|
762
771
|
// Recorded before the plaintext leaves this function, so no request can
|
|
763
772
|
// present the token without its provenance.
|
|
764
|
-
if (
|
|
773
|
+
if (
|
|
774
|
+
provenance.sourceStepId ||
|
|
775
|
+
provenance.sourceScriptRunId ||
|
|
776
|
+
provenance.objectChain !== undefined ||
|
|
777
|
+
provenance.depth !== undefined
|
|
778
|
+
) {
|
|
765
779
|
await getDbClient().run(
|
|
766
|
-
"UPDATE session_tokens SET sourceStepId = ?, sourceScriptRunId = ? WHERE id = ?",
|
|
767
|
-
[
|
|
780
|
+
"UPDATE session_tokens SET sourceStepId = ?, sourceScriptRunId = ?, objectChain = ?, depth = ? WHERE id = ?",
|
|
781
|
+
[
|
|
782
|
+
provenance.sourceStepId ?? null,
|
|
783
|
+
provenance.sourceScriptRunId ?? null,
|
|
784
|
+
provenance.objectChain === undefined ? null : JSON.stringify(provenance.objectChain),
|
|
785
|
+
provenance.depth ?? 0,
|
|
786
|
+
token.tokenId,
|
|
787
|
+
],
|
|
768
788
|
);
|
|
769
789
|
}
|
|
770
790
|
return token;
|
|
@@ -1046,7 +1066,7 @@ export async function resolveSessionToken(
|
|
|
1046
1066
|
options: { touch?: boolean } = {},
|
|
1047
1067
|
): Promise<
|
|
1048
1068
|
| { kind: "controller"; controllerId: string; tokenId: string; expiresAt: string }
|
|
1049
|
-
| {
|
|
1069
|
+
| ({
|
|
1050
1070
|
kind: "agent";
|
|
1051
1071
|
tokenId: string;
|
|
1052
1072
|
tokenKind: SessionTokenKind;
|
|
@@ -1054,9 +1074,7 @@ export async function resolveSessionToken(
|
|
|
1054
1074
|
taskId: string | null;
|
|
1055
1075
|
runtimeId: string | null;
|
|
1056
1076
|
expiresAt: string;
|
|
1057
|
-
|
|
1058
|
-
sourceScriptRunId?: string | null;
|
|
1059
|
-
}
|
|
1077
|
+
} & ScriptRunProvenance)
|
|
1060
1078
|
| null
|
|
1061
1079
|
> {
|
|
1062
1080
|
if (!plaintext.startsWith(SESSION_TOKEN_PREFIX)) return null;
|
|
@@ -1074,9 +1092,11 @@ export async function resolveSessionToken(
|
|
|
1074
1092
|
revokedAt: string | null;
|
|
1075
1093
|
sourceStepId: string | null;
|
|
1076
1094
|
sourceScriptRunId: string | null;
|
|
1095
|
+
objectChain: string | null;
|
|
1096
|
+
depth: number;
|
|
1077
1097
|
}>(
|
|
1078
1098
|
`SELECT s.id, s.agentId, s.taskId, s.runtimeId, s.controllerId, s.expiresAt, s.revokedAt,
|
|
1079
|
-
s.sourceStepId, s.sourceScriptRunId, c.placement FROM session_tokens s LEFT JOIN runtime_controllers c ON c.id = s.controllerId
|
|
1099
|
+
s.sourceStepId, s.sourceScriptRunId, s.objectChain, s.depth, c.placement FROM session_tokens s LEFT JOIN runtime_controllers c ON c.id = s.controllerId
|
|
1080
1100
|
WHERE s.tokenHash = ?`,
|
|
1081
1101
|
[hash],
|
|
1082
1102
|
);
|
|
@@ -1113,9 +1133,10 @@ export async function resolveSessionToken(
|
|
|
1113
1133
|
taskId: row.taskId,
|
|
1114
1134
|
runtimeId: row.runtimeId,
|
|
1115
1135
|
expiresAt: row.expiresAt,
|
|
1116
|
-
...(row.sourceStepId
|
|
1117
|
-
|
|
1118
|
-
|
|
1136
|
+
...(row.sourceStepId ? { sourceStepId: row.sourceStepId } : {}),
|
|
1137
|
+
...(row.sourceScriptRunId ? { sourceScriptRunId: row.sourceScriptRunId } : {}),
|
|
1138
|
+
...(row.objectChain !== null ? { objectChain: JSON.parse(row.objectChain) as string[] } : {}),
|
|
1139
|
+
depth: row.depth,
|
|
1119
1140
|
};
|
|
1120
1141
|
}
|
|
1121
1142
|
|
package/src/comb/review-batch.ts
CHANGED
|
@@ -61,6 +61,7 @@ export interface RepairedComment {
|
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
export interface ReviewBatchInput {
|
|
64
|
+
parent?: { id: string; agentId?: string | null; agentCaller: boolean };
|
|
64
65
|
orgId: string;
|
|
65
66
|
driveId: string;
|
|
66
67
|
commentIds: string[];
|
|
@@ -200,14 +201,18 @@ export async function sendReviewBatch(
|
|
|
200
201
|
...repairs.map((repair) => alreadySent(repair.id, repair.taskId)),
|
|
201
202
|
]);
|
|
202
203
|
}
|
|
203
|
-
const
|
|
204
|
+
const parent = input.parent;
|
|
205
|
+
const lead = parent?.agentId ? null : await getLeadAgent();
|
|
204
206
|
leadState = !lead ? "none" : lead.status === "offline" ? "offline" : "online";
|
|
205
207
|
const task = await createTask(
|
|
206
208
|
text,
|
|
207
209
|
{
|
|
208
|
-
agentId: lead?.id
|
|
209
|
-
|
|
210
|
-
|
|
210
|
+
agentId: parent?.agentId || lead?.id || "",
|
|
211
|
+
parentTaskId: parent?.id,
|
|
212
|
+
inheritParentOutputSchema: parent?.agentCaller,
|
|
213
|
+
routingAffinity: parent && !parent.agentCaller ? { capabilities: [] } : undefined,
|
|
214
|
+
routingReason: parent?.agentId ? "continuity" : lead ? "skill" : undefined,
|
|
215
|
+
routingSource: parent?.agentId || lead ? "engine_default" : undefined,
|
|
211
216
|
source: "comb",
|
|
212
217
|
taskType: "comb-review",
|
|
213
218
|
tags: ["comb"],
|
|
@@ -254,7 +259,13 @@ export async function sendReviewBatch(
|
|
|
254
259
|
}
|
|
255
260
|
return taskId === null
|
|
256
261
|
? { taskId, sent: wonIds, skipped, repaired }
|
|
257
|
-
: {
|
|
262
|
+
: {
|
|
263
|
+
taskId,
|
|
264
|
+
sent: wonIds,
|
|
265
|
+
skipped,
|
|
266
|
+
repaired,
|
|
267
|
+
lead: input.parent?.agentId ? undefined : leadState,
|
|
268
|
+
};
|
|
258
269
|
}
|
|
259
270
|
|
|
260
271
|
/** `items.map(fn)` with at most `limit` calls in flight. Results keep the input order. */
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
* resumes (see swarm memory sigterm-143-resumed-session-context-saturation-2026-05-13).
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
|
+
import { renderSessionTurnsPreamble } from "../prompts/session-turns";
|
|
14
15
|
import type { TaskAttachment } from "../types";
|
|
15
16
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
16
17
|
import { isSteeringEnabled } from "../utils/steering-enabled";
|
|
@@ -68,6 +69,9 @@ export interface TaskContextForPreamble {
|
|
|
68
69
|
status?: string;
|
|
69
70
|
taskType?: string;
|
|
70
71
|
parentTaskId?: string;
|
|
72
|
+
agentId?: string;
|
|
73
|
+
/** Set by `GET /api/tasks/{id}`: the assignee is a lead agent. */
|
|
74
|
+
isLeadTask?: boolean;
|
|
71
75
|
attachments?: Array<{
|
|
72
76
|
kind: string;
|
|
73
77
|
name: string;
|
|
@@ -102,6 +106,8 @@ export async function fetchTaskContextForPreamble(
|
|
|
102
106
|
status: data.status,
|
|
103
107
|
taskType: data.taskType,
|
|
104
108
|
parentTaskId: data.parentTaskId,
|
|
109
|
+
agentId: data.agentId,
|
|
110
|
+
isLeadTask: data.isLeadTask,
|
|
105
111
|
attachments: data.attachments,
|
|
106
112
|
};
|
|
107
113
|
} catch {
|
|
@@ -215,6 +221,237 @@ export async function buildContextPreamble(
|
|
|
215
221
|
return preamble;
|
|
216
222
|
}
|
|
217
223
|
|
|
224
|
+
// ─── Sessions Follow-up Preamble ──────────────────────────────────────────────
|
|
225
|
+
|
|
226
|
+
/** Most recent Lead turns the Sessions follow-up preamble shows (the "last N"). */
|
|
227
|
+
export const SESSION_TURNS_MAX_TURNS = 6;
|
|
228
|
+
/**
|
|
229
|
+
* Token budget for the Sessions follow-up preamble: 3× the regular preamble,
|
|
230
|
+
* since it carries the session's original ask plus up to six turns.
|
|
231
|
+
* shortcut: a constant, not an env var; add one (with the configuration
|
|
232
|
+
* catalog entry) if operators need to tune it.
|
|
233
|
+
*/
|
|
234
|
+
export const SESSION_TURNS_MAX_TOKENS = 6000;
|
|
235
|
+
export const SESSION_TURNS_MAX_CHARS = SESSION_TURNS_MAX_TOKENS * 4;
|
|
236
|
+
/** Ancestors walked one by one to find the last Lead turns (delegated and review tasks sit between them). */
|
|
237
|
+
export const SESSION_TURNS_MAX_HOPS = 30;
|
|
238
|
+
/** Lineage reads made to reach the session root past that walk; each read climbs 50 ancestors. */
|
|
239
|
+
const SESSION_ROOT_MAX_READS = 10;
|
|
240
|
+
/** Skipped turn ids the elision marker names before it only counts the rest. */
|
|
241
|
+
const SESSION_ELIDED_MAX_IDS = 8;
|
|
242
|
+
/** Chars kept of each turn's ask (~400 tokens). */
|
|
243
|
+
const SESSION_TURN_ASK_CHARS = 1600;
|
|
244
|
+
/** Chars kept of each turn's answer (~1000 tokens); the newest turn keeps twice this. */
|
|
245
|
+
const SESSION_TURN_ANSWER_CHARS = 4000;
|
|
246
|
+
const SESSION_TURN_MAX_ARTIFACTS = 5;
|
|
247
|
+
/** Room the template's own text takes, kept out of the turns' share of the budget. */
|
|
248
|
+
const SESSION_TURNS_FRAME_CHARS = 1600;
|
|
249
|
+
|
|
250
|
+
function clip(text: string, max: number, taskId: string): string {
|
|
251
|
+
return text.length > max
|
|
252
|
+
? `${text.slice(0, max)} [cut; full text via \`get-task-details\` taskId \`${taskId}\`]`
|
|
253
|
+
: text;
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
function formatSessionTurn(turn: TaskContextForPreamble, heading: string, newest: boolean): string {
|
|
257
|
+
const lines = [
|
|
258
|
+
`### ${heading} (task \`${turn.id}\`, ${turn.status ?? "unknown"})`,
|
|
259
|
+
`**Asked:** ${clip(scrubSecrets(turn.task.trim()), SESSION_TURN_ASK_CHARS, turn.id)}`,
|
|
260
|
+
];
|
|
261
|
+
const answer = (turn.output || turn.progress)?.trim();
|
|
262
|
+
const answerCap = newest ? SESSION_TURN_ANSWER_CHARS * 2 : SESSION_TURN_ANSWER_CHARS;
|
|
263
|
+
const answerLabel = turn.isLeadTask === false ? "Answer" : "You answered";
|
|
264
|
+
lines.push(
|
|
265
|
+
answer
|
|
266
|
+
? `**${answerLabel}:** ${clip(scrubSecrets(answer), answerCap, turn.id)}`
|
|
267
|
+
: `**${answerLabel}:** (nothing recorded)`,
|
|
268
|
+
);
|
|
269
|
+
const atts = turn.attachments?.filter((a) => a.name && (a.url || a.path || a.pageId)) ?? [];
|
|
270
|
+
for (const att of atts.slice(0, SESSION_TURN_MAX_ARTIFACTS)) {
|
|
271
|
+
lines.push(` - Artifact **${att.name}**: \`${formatAttachmentPointer(att)}\``);
|
|
272
|
+
}
|
|
273
|
+
return lines.join("\n");
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
interface LineageRow {
|
|
277
|
+
id: string;
|
|
278
|
+
agentId?: string | null;
|
|
279
|
+
parentTaskId?: string | null;
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
/**
|
|
283
|
+
* The ancestors of `fromId`, newest first, up to the session root, read with
|
|
284
|
+
* `GET /api/tasks/{id}/lineage` (the API climbs 50 ancestors per read, so a
|
|
285
|
+
* long chain costs a few reads, not one per task). Null when a read fails.
|
|
286
|
+
*/
|
|
287
|
+
async function fetchAncestorsToRoot(
|
|
288
|
+
apiUrl: string,
|
|
289
|
+
apiKey: string,
|
|
290
|
+
fromId: string,
|
|
291
|
+
): Promise<LineageRow[] | null> {
|
|
292
|
+
const headers: Record<string, string> = {};
|
|
293
|
+
if (apiKey) headers.Authorization = `Bearer ${apiKey}`;
|
|
294
|
+
const ancestors: LineageRow[] = [];
|
|
295
|
+
let id = fromId;
|
|
296
|
+
for (let read = 0; read < SESSION_ROOT_MAX_READS; read++) {
|
|
297
|
+
let data: { rootTaskId?: string; tasks?: LineageRow[] };
|
|
298
|
+
try {
|
|
299
|
+
const response = await fetch(`${apiUrl}/api/tasks/${id}/lineage?maxNodes=1&maxDepth=1`, {
|
|
300
|
+
headers,
|
|
301
|
+
});
|
|
302
|
+
if (!response.ok) return null;
|
|
303
|
+
data = (await response.json()) as typeof data;
|
|
304
|
+
} catch {
|
|
305
|
+
return null;
|
|
306
|
+
}
|
|
307
|
+
const byId = new Map((data.tasks ?? []).map((row) => [row.id, row]));
|
|
308
|
+
let row = byId.get(id);
|
|
309
|
+
while (row?.parentTaskId && byId.has(row.parentTaskId)) {
|
|
310
|
+
row = byId.get(row.parentTaskId);
|
|
311
|
+
if (row) ancestors.push(row);
|
|
312
|
+
}
|
|
313
|
+
// No parent left (the root), a deleted parent, or no progress: stop.
|
|
314
|
+
if (!row?.parentTaskId || row.id === id || data.rootTaskId === id) return ancestors;
|
|
315
|
+
id = row.id;
|
|
316
|
+
}
|
|
317
|
+
return ancestors;
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
function formatElisionMarker(elidedNewestFirst: string[], rootId: string | undefined): string {
|
|
321
|
+
if (elidedNewestFirst.length === 0) return "";
|
|
322
|
+
const named = elidedNewestFirst.slice(0, SESSION_ELIDED_MAX_IDS).map((id) => `\`${id}\``);
|
|
323
|
+
const more = elidedNewestFirst.length - named.length;
|
|
324
|
+
const turns = elidedNewestFirst.length === 1 ? "turn" : "turns";
|
|
325
|
+
return `### … ${elidedNewestFirst.length} earlier ${turns} skipped\n${rootId ? `Between the original ask (task \`${rootId}\`) and the turns below.` : "Before the turns below."} Skipped turn tasks, newest first: ${named.join(", ")}${more > 0 ? `, and ${more} more` : ""}.`;
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
/**
|
|
329
|
+
* Build the Lead's preamble for a Sessions follow-up as a sandwich:
|
|
330
|
+
*
|
|
331
|
+
* 1. The session's original ask: the lineage root, whatever its type, found
|
|
332
|
+
* past the turn walk through the lineage endpoint. Never dropped.
|
|
333
|
+
* 2. An elision marker counting and naming the Lead turns skipped between
|
|
334
|
+
* the root and the turns shown.
|
|
335
|
+
* 3. The last SESSION_TURNS_MAX_TURNS Lead turns, oldest first, each with
|
|
336
|
+
* its ask and answer. Delegated worker tasks are not turns: the Lead's
|
|
337
|
+
* review of them is a turn of its own.
|
|
338
|
+
*
|
|
339
|
+
* The root is shown once: when it is also one of the last turns, it moves to
|
|
340
|
+
* the top block. To fit SESSION_TURNS_MAX_TOKENS, the oldest of the last
|
|
341
|
+
* turns drop first (into the elision marker); the root and the newest turn
|
|
342
|
+
* always stay, clipped per field.
|
|
343
|
+
*
|
|
344
|
+
* Returns null when the path holds no Lead turn or the template is switched
|
|
345
|
+
* off; the caller then falls back to `buildContextPreamble`.
|
|
346
|
+
*/
|
|
347
|
+
export async function buildSessionTurnsPreamble(
|
|
348
|
+
apiUrl: string,
|
|
349
|
+
apiKey: string,
|
|
350
|
+
parentTaskId: string,
|
|
351
|
+
): Promise<string | null> {
|
|
352
|
+
const path: TaskContextForPreamble[] = [];
|
|
353
|
+
const turnsNewestFirst: TaskContextForPreamble[] = [];
|
|
354
|
+
const seen = new Set<string>();
|
|
355
|
+
let currentId: string | undefined = parentTaskId;
|
|
356
|
+
while (
|
|
357
|
+
currentId &&
|
|
358
|
+
!seen.has(currentId) &&
|
|
359
|
+
path.length < SESSION_TURNS_MAX_HOPS &&
|
|
360
|
+
turnsNewestFirst.length < SESSION_TURNS_MAX_TURNS
|
|
361
|
+
) {
|
|
362
|
+
seen.add(currentId);
|
|
363
|
+
const ctx = await fetchTaskContextForPreamble(apiUrl, apiKey, currentId);
|
|
364
|
+
if (!ctx) break;
|
|
365
|
+
path.push(ctx);
|
|
366
|
+
if (ctx.isLeadTask) turnsNewestFirst.push(ctx);
|
|
367
|
+
currentId = ctx.parentTaskId;
|
|
368
|
+
}
|
|
369
|
+
if (turnsNewestFirst.length === 0) return null;
|
|
370
|
+
|
|
371
|
+
// The rest of the chain, from the oldest walked task up to the session root.
|
|
372
|
+
const top = path[path.length - 1]!;
|
|
373
|
+
const rest = top.parentTaskId ? ((await fetchAncestorsToRoot(apiUrl, apiKey, top.id)) ?? []) : [];
|
|
374
|
+
const rootRow = rest[rest.length - 1];
|
|
375
|
+
let root: TaskContextForPreamble | null = top.parentTaskId ? null : top;
|
|
376
|
+
if (rootRow) {
|
|
377
|
+
root = seen.has(rootRow.id)
|
|
378
|
+
? (path.find((t) => t.id === rootRow.id) ?? null)
|
|
379
|
+
: await fetchTaskContextForPreamble(apiUrl, apiKey, rootRow.id);
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
// Lead turns past the walk. Lineage rows carry no isLeadTask, so a task
|
|
383
|
+
// assigned to an agent that owns a walked Lead turn counts as one.
|
|
384
|
+
const leadAgents = new Set(turnsNewestFirst.map((t) => t.agentId).filter(Boolean));
|
|
385
|
+
const elided = rest
|
|
386
|
+
.filter((row) => row.id !== root?.id && row.agentId && leadAgents.has(row.agentId))
|
|
387
|
+
.map((row) => row.id);
|
|
388
|
+
|
|
389
|
+
// The root is shown once, on top, unless it is the newest (only) turn.
|
|
390
|
+
const newest = turnsNewestFirst[0]!;
|
|
391
|
+
const rootOnTop = root && root.id !== newest.id ? root : null;
|
|
392
|
+
const candidates = turnsNewestFirst.filter((t) => t.id !== rootOnTop?.id);
|
|
393
|
+
const rootBlock = rootOnTop
|
|
394
|
+
? `${formatSessionTurn(rootOnTop, "Original ask (session root)", false)}\n\n`
|
|
395
|
+
: "";
|
|
396
|
+
|
|
397
|
+
// Newest first, so the budget keeps the turns the message most likely means.
|
|
398
|
+
const budget = SESSION_TURNS_MAX_CHARS - SESSION_TURNS_FRAME_CHARS - rootBlock.length;
|
|
399
|
+
const kept: TaskContextForPreamble[] = [];
|
|
400
|
+
let used = 0;
|
|
401
|
+
for (const turn of candidates) {
|
|
402
|
+
const block = formatSessionTurn(turn, "Turn", kept.length === 0);
|
|
403
|
+
if (kept.length > 0 && used + block.length > budget) break;
|
|
404
|
+
kept.push(turn);
|
|
405
|
+
used += block.length;
|
|
406
|
+
}
|
|
407
|
+
// Turns the budget dropped are newer than the ones past the walk.
|
|
408
|
+
const elidedNewestFirst = [...candidates.slice(kept.length).map((t) => t.id), ...elided];
|
|
409
|
+
const elision = formatElisionMarker(elidedNewestFirst, rootOnTop?.id);
|
|
410
|
+
|
|
411
|
+
// Number oldest first now that the kept set is known.
|
|
412
|
+
const turns = kept
|
|
413
|
+
.map((turn, i) => {
|
|
414
|
+
const label = turn.id === root?.id ? "session root" : null;
|
|
415
|
+
const heading = `Turn ${kept.length - i}${label ? `, ${label}` : ""}`;
|
|
416
|
+
return formatSessionTurn(turn, heading, i === 0);
|
|
417
|
+
})
|
|
418
|
+
.reverse()
|
|
419
|
+
.join("\n\n");
|
|
420
|
+
|
|
421
|
+
const parent = path[0];
|
|
422
|
+
const replyTarget =
|
|
423
|
+
parent && !parent.isLeadTask
|
|
424
|
+
? `The new message was sent on task \`${parent.id}\`, a task of another agent: ${parent.task
|
|
425
|
+
.slice(0, 300)
|
|
426
|
+
.replace(/\n/g, " ")}\n\n`
|
|
427
|
+
: "";
|
|
428
|
+
|
|
429
|
+
const rendered = await renderSessionTurnsPreamble({
|
|
430
|
+
turn_count: kept.length,
|
|
431
|
+
turns: `${turns}\n`,
|
|
432
|
+
reply_target: replyTarget,
|
|
433
|
+
root: rootBlock,
|
|
434
|
+
elided: elision ? `${elision}\n\n` : "",
|
|
435
|
+
});
|
|
436
|
+
if (!rendered) return null;
|
|
437
|
+
const preamble = rendered.endsWith("\n") ? rendered : `${rendered}\n`;
|
|
438
|
+
return preamble.length > SESSION_TURNS_MAX_CHARS
|
|
439
|
+
? `${preamble.slice(0, SESSION_TURNS_MAX_CHARS)}\n\n[context preamble truncated to ${SESSION_TURNS_MAX_TOKENS}-token budget]\n\n---\n`
|
|
440
|
+
: preamble;
|
|
441
|
+
}
|
|
442
|
+
|
|
443
|
+
/** The Lead's Sessions follow-up preamble, else the regular one-parent preamble. */
|
|
444
|
+
export async function buildSessionFollowUpPreamble(
|
|
445
|
+
apiUrl: string,
|
|
446
|
+
apiKey: string,
|
|
447
|
+
parentTaskId: string,
|
|
448
|
+
): Promise<string | null> {
|
|
449
|
+
return (
|
|
450
|
+
(await buildSessionTurnsPreamble(apiUrl, apiKey, parentTaskId)) ??
|
|
451
|
+
buildContextPreamble(apiUrl, apiKey, parentTaskId)
|
|
452
|
+
);
|
|
453
|
+
}
|
|
454
|
+
|
|
218
455
|
// ─── Resume Preamble ───────────────────────────────────────────────────────────
|
|
219
456
|
|
|
220
457
|
interface SessionLogForPreamble {
|
package/src/commands/e2b.ts
CHANGED
|
@@ -110,6 +110,14 @@ export type LaunchSpec = {
|
|
|
110
110
|
|
|
111
111
|
/** The byte-identical specs for the legacy `start-api` / `start-worker` paths. */
|
|
112
112
|
const API_SPEC: LaunchSpec = { swarmRole: "api", envScope: "api", metadataSwarmRole: "api" };
|
|
113
|
+
|
|
114
|
+
const API_ONLY_RUNTIME_KEYS = [
|
|
115
|
+
"SECRETS_ENCRYPTION_KEY",
|
|
116
|
+
"SECRETS_ENCRYPTION_KEY_FILE",
|
|
117
|
+
"API_AGENT_FS_API_KEY",
|
|
118
|
+
"SLACK_SIGNING_SECRET",
|
|
119
|
+
"TRANSCRIPTION_API_KEY",
|
|
120
|
+
] as const;
|
|
113
121
|
const WORKER_SPEC: LaunchSpec = {
|
|
114
122
|
swarmRole: "worker",
|
|
115
123
|
envScope: "worker",
|
|
@@ -472,6 +480,12 @@ export async function loadRuntimeEnv(
|
|
|
472
480
|
|
|
473
481
|
delete runtime.E2B_API_KEY;
|
|
474
482
|
delete runtime.E2B_ACCESS_TOKEN;
|
|
483
|
+
if (role !== "api") {
|
|
484
|
+
// Only the API reads these: the config master key and the API-only config
|
|
485
|
+
// keys (API_ONLY_CONFIG_KEYS in src/be/swarm-config-guard.ts). Drop them
|
|
486
|
+
// after every env layer so a lead or worker sandbox never receives them.
|
|
487
|
+
for (const key of API_ONLY_RUNTIME_KEYS) delete runtime[key];
|
|
488
|
+
}
|
|
475
489
|
return runtime;
|
|
476
490
|
}
|
|
477
491
|
|
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
/** Worker boot step; deliberately standalone so both worker images can run it before setup. */
|
|
2
|
+
export interface McpConfigDependencies {
|
|
3
|
+
env: Record<string, string | undefined>;
|
|
4
|
+
fetch: (url: string, init: RequestInit) => Promise<Response>;
|
|
5
|
+
/** Absent file reads as null; any other failure rejects. */
|
|
6
|
+
readTextFile: (path: string) => Promise<string | null>;
|
|
7
|
+
writeTextFile: (path: string, content: string) => Promise<void>;
|
|
8
|
+
log: (message: string) => void;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
const defaults: McpConfigDependencies = {
|
|
12
|
+
env: process.env,
|
|
13
|
+
fetch: (url, init) => fetch(url, init),
|
|
14
|
+
readTextFile: async (path) => {
|
|
15
|
+
const file = Bun.file(path);
|
|
16
|
+
return (await file.exists()) ? file.text() : null;
|
|
17
|
+
},
|
|
18
|
+
writeTextFile: async (path, content) => {
|
|
19
|
+
await Bun.write(path, content);
|
|
20
|
+
},
|
|
21
|
+
log: (message) => console.log(message),
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export interface McpConfigInputs {
|
|
25
|
+
/** Swarm API key, piped on stdin by the shell shim so it never reaches argv. */
|
|
26
|
+
apiKey: string;
|
|
27
|
+
/** Resolved control-plane base URL; the entrypoint keeps it shell-local, so it is an argument. */
|
|
28
|
+
mcpUrl: string;
|
|
29
|
+
homeDir: string;
|
|
30
|
+
workspaceDir: string;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
interface AgentSwarmServer {
|
|
34
|
+
type: "http";
|
|
35
|
+
url: string;
|
|
36
|
+
headers: Record<string, string>;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
interface AgentmailServer {
|
|
40
|
+
command: string;
|
|
41
|
+
args: string[];
|
|
42
|
+
env: Record<string, string>;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
interface McpConfigFile {
|
|
46
|
+
mcpServers: { "agent-swarm": AgentSwarmServer; agentmail?: AgentmailServer };
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** The old `jq -n` base object: swarm HTTP server, optional X-Agent-ID, optional agentmail. */
|
|
50
|
+
function buildMcpConfig(options: {
|
|
51
|
+
mcpUrl: string;
|
|
52
|
+
apiKey: string;
|
|
53
|
+
agentId?: string;
|
|
54
|
+
agentmailApiKey?: string;
|
|
55
|
+
}): McpConfigFile {
|
|
56
|
+
const headers: Record<string, string> = { Authorization: `Bearer ${options.apiKey}` };
|
|
57
|
+
if (options.agentId) headers["X-Agent-ID"] = options.agentId;
|
|
58
|
+
const config: McpConfigFile = {
|
|
59
|
+
mcpServers: {
|
|
60
|
+
"agent-swarm": { type: "http", url: `${options.mcpUrl}/mcp`, headers },
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
if (options.agentmailApiKey) {
|
|
64
|
+
config.mcpServers.agentmail = {
|
|
65
|
+
command: "npx",
|
|
66
|
+
args: ["-y", "agentmail-mcp"],
|
|
67
|
+
env: { AGENTMAIL_API_KEY: options.agentmailApiKey },
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
return config;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** Match the old `jq .servers | length` count: arrays and objects only; anything else fails. */
|
|
74
|
+
function installedServerNames(payload: unknown): string[] {
|
|
75
|
+
if (typeof payload !== "object" || payload === null || Array.isArray(payload)) return [];
|
|
76
|
+
const servers = (payload as { servers?: unknown }).servers;
|
|
77
|
+
if (servers === null || servers === undefined) return [];
|
|
78
|
+
if (typeof servers === "string" || typeof servers === "number") {
|
|
79
|
+
throw new Error("MCP servers payload is not iterable");
|
|
80
|
+
}
|
|
81
|
+
const entries = Array.isArray(servers) ? servers : Object.values(servers);
|
|
82
|
+
return entries.map(serverName);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function serverName(entry: unknown): string {
|
|
86
|
+
if (typeof entry !== "object" || entry === null) {
|
|
87
|
+
throw new Error("MCP server entry is not a JSON object");
|
|
88
|
+
}
|
|
89
|
+
const name = (entry as { name?: unknown }).name;
|
|
90
|
+
// `"mcp__" + null` is `"mcp__"` in jq, so a missing name still yields a pattern.
|
|
91
|
+
if (name === null || name === undefined) return "";
|
|
92
|
+
if (typeof name !== "string") throw new Error("MCP server name is not a string");
|
|
93
|
+
return name;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/** The old `jq --slurpfile` merge: append `mcp__<name>__*` patterns, sort and dedupe. */
|
|
97
|
+
function mergePermissionPatterns(
|
|
98
|
+
settings: unknown,
|
|
99
|
+
serverNames: string[],
|
|
100
|
+
): Record<string, unknown> {
|
|
101
|
+
if (typeof settings !== "object" || Array.isArray(settings)) {
|
|
102
|
+
throw new Error("settings.json is not a JSON object");
|
|
103
|
+
}
|
|
104
|
+
// jq assigns into `null` by creating the object, so a literal null file still
|
|
105
|
+
// ends up with a permissions object.
|
|
106
|
+
const root = (settings ?? {}) as Record<string, unknown>;
|
|
107
|
+
const permissions = root.permissions;
|
|
108
|
+
if (
|
|
109
|
+
permissions !== null &&
|
|
110
|
+
permissions !== undefined &&
|
|
111
|
+
(typeof permissions !== "object" || Array.isArray(permissions))
|
|
112
|
+
) {
|
|
113
|
+
throw new Error("settings.json permissions is not a JSON object");
|
|
114
|
+
}
|
|
115
|
+
const permissionObject = (permissions ?? {}) as Record<string, unknown>;
|
|
116
|
+
const allow = permissionObject.allow;
|
|
117
|
+
if (allow !== null && allow !== undefined && !Array.isArray(allow)) {
|
|
118
|
+
throw new Error("settings.json permissions.allow is not an array");
|
|
119
|
+
}
|
|
120
|
+
const patterns = new Set<unknown>(allow ?? []);
|
|
121
|
+
for (const name of serverNames) patterns.add(`mcp__${name}__*`);
|
|
122
|
+
const merged = [...patterns];
|
|
123
|
+
// jq `unique` sorts. Settings entries are strings, so the default sort matches.
|
|
124
|
+
merged.sort();
|
|
125
|
+
return { ...root, permissions: { ...permissionObject, allow: merged } };
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
async function fetchInstalledServers(
|
|
129
|
+
mcpUrl: string,
|
|
130
|
+
agentId: string,
|
|
131
|
+
apiKey: string,
|
|
132
|
+
probe: McpConfigDependencies["fetch"],
|
|
133
|
+
): Promise<unknown> {
|
|
134
|
+
try {
|
|
135
|
+
// resolveSecrets=false: the entrypoint only needs names; the per-session
|
|
136
|
+
// dispatcher re-fetches the servers with fresh credentials (issue #369).
|
|
137
|
+
const response = await probe(
|
|
138
|
+
`${mcpUrl}/api/agents/${agentId}/mcp-servers?resolveSecrets=false`,
|
|
139
|
+
{ headers: { Authorization: `Bearer ${apiKey}` }, redirect: "manual" },
|
|
140
|
+
);
|
|
141
|
+
// Match `curl -sf`: HTTP errors and empty bodies leave nothing to parse.
|
|
142
|
+
if (!response.ok) return null;
|
|
143
|
+
const body = await response.text();
|
|
144
|
+
return body === "" ? null : JSON.parse(body);
|
|
145
|
+
} catch {
|
|
146
|
+
// Best-effort, like the old `|| true`: the file writes still run.
|
|
147
|
+
return null;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* Write `/workspace/.mcp.json` and register the installed MCP servers' permission
|
|
153
|
+
* patterns in `~/.claude/settings.json`. Resolved credentials are never baked
|
|
154
|
+
* into the project config: the provider dispatcher injects them per session.
|
|
155
|
+
*/
|
|
156
|
+
export async function configureMcpConfig(
|
|
157
|
+
inputs: McpConfigInputs,
|
|
158
|
+
dependencies: Partial<McpConfigDependencies> = {},
|
|
159
|
+
): Promise<boolean> {
|
|
160
|
+
const {
|
|
161
|
+
env,
|
|
162
|
+
fetch: probe,
|
|
163
|
+
readTextFile,
|
|
164
|
+
writeTextFile,
|
|
165
|
+
log,
|
|
166
|
+
} = {
|
|
167
|
+
...defaults,
|
|
168
|
+
...dependencies,
|
|
169
|
+
};
|
|
170
|
+
try {
|
|
171
|
+
// Managed agents read MCP servers from the Anthropic agent definition instead.
|
|
172
|
+
if (env.HARNESS_PROVIDER === "claude-managed") {
|
|
173
|
+
log("Skipping local .mcp.json (claude-managed reads MCP from agent definition)");
|
|
174
|
+
return true;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
log(`Creating MCP config in ${inputs.workspaceDir}...`);
|
|
178
|
+
const mcpUrl = inputs.mcpUrl;
|
|
179
|
+
const agentId = env.AGENT_ID;
|
|
180
|
+
const config = buildMcpConfig({
|
|
181
|
+
mcpUrl,
|
|
182
|
+
apiKey: inputs.apiKey,
|
|
183
|
+
agentId,
|
|
184
|
+
agentmailApiKey: env.AGENTMAIL_API_KEY,
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
let serverNames: string[] = [];
|
|
188
|
+
if (agentId && inputs.apiKey) {
|
|
189
|
+
log("Fetching installed MCP server names (for permission patterns only)...");
|
|
190
|
+
const payload = await fetchInstalledServers(mcpUrl, agentId, inputs.apiKey, probe);
|
|
191
|
+
serverNames = installedServerNames(payload);
|
|
192
|
+
if (serverNames.length > 0) {
|
|
193
|
+
log(
|
|
194
|
+
`Found ${serverNames.length} installed MCP server(s) — will be injected per-session, not baked into .mcp.json`,
|
|
195
|
+
);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
await writeTextFile(`${inputs.workspaceDir}/.mcp.json`, `${JSON.stringify(config, null, 2)}\n`);
|
|
200
|
+
|
|
201
|
+
if (serverNames.length > 0) {
|
|
202
|
+
const settingsPath = `${inputs.homeDir}/.claude/settings.json`;
|
|
203
|
+
const current = await readTextFile(settingsPath);
|
|
204
|
+
if (current !== null) {
|
|
205
|
+
log("Adding MCP server permission patterns to settings.json");
|
|
206
|
+
// jq --slurpfile reads a blank file as an empty array, so `$settings[0]`
|
|
207
|
+
// is null and the merge repairs the file instead of failing.
|
|
208
|
+
const settings = current.trim() === "" ? null : (JSON.parse(current) as unknown);
|
|
209
|
+
const updated = mergePermissionPatterns(settings, serverNames);
|
|
210
|
+
await writeTextFile(settingsPath, `${JSON.stringify(updated, null, 2)}\n`);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
return true;
|
|
214
|
+
} catch (error) {
|
|
215
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
216
|
+
log(`[entrypoint] FATAL: MCP config step failed: ${reason}; exiting.`);
|
|
217
|
+
return false;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
if (import.meta.main) {
|
|
222
|
+
const apiKey = (await Bun.stdin.text()).replace(/\r?\n$/, "");
|
|
223
|
+
process.exitCode = (await configureMcpConfig({
|
|
224
|
+
apiKey,
|
|
225
|
+
mcpUrl: Bun.argv[4] ?? "",
|
|
226
|
+
homeDir: Bun.argv[2] ?? process.env.HOME ?? "/home/worker",
|
|
227
|
+
workspaceDir: Bun.argv[3] ?? "/workspace",
|
|
228
|
+
}))
|
|
229
|
+
? 0
|
|
230
|
+
: 1;
|
|
231
|
+
}
|
|
@@ -11,7 +11,8 @@ const DEFAULT_WORKER_MAX_CONCURRENT_TASKS = 1;
|
|
|
11
11
|
// suppression comments in one place.
|
|
12
12
|
|
|
13
13
|
// Image tag for the API and agent images. Blank or unset resolves to `latest`,
|
|
14
|
-
// which moves on every commit to main
|
|
14
|
+
// which moves on every commit to main. env-generator.ts writes this CLI's
|
|
15
|
+
// release to .env, so a generated install starts pinned.
|
|
15
16
|
// biome-ignore lint/suspicious/noTemplateCurlyInString: Docker Compose env var syntax
|
|
16
17
|
const IMAGE_TAG_EXPRESSION = "${AGENT_SWARM_VERSION:-latest}";
|
|
17
18
|
// Host address for published ports, from AGENT_SWARM_BIND_ADDRESS in .env. Blank
|