@desplega.ai/agent-swarm 2.13.4 → 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-zrk9k0n7.js → acp-targets-23exz4z4.js} +10 -10
- package/dist/{actions-acqqj9jn.js → actions-zcr25x27.js} +61 -40
- package/dist/{agent-fs-provision-zmaykqnd.js → agent-fs-provision-7fa9e12e.js} +4 -4
- package/dist/{amp-adapter-a7ts8tmw.js → amp-adapter-s7ytmv6b.js} +3 -3
- package/dist/{anthropic-messages-88b7s3n9.js → anthropic-messages-vdd1zmha.js} +10 -10
- package/dist/{app-tmwa442h.js → app-5d3sz1hy.js} +7 -7
- package/dist/{approval-notifications-6psaaaye.js → approval-notifications-7qgkzkzx.js} +8 -8
- package/dist/{assistant-564v6emv.js → assistant-p2yvhc3j.js} +37 -32
- package/dist/{boot-args-schema-n099e0f2.js → boot-args-schema-ry6cb0p7.js} +1 -1
- package/dist/{boot-reembed-epvg4fp9.js → boot-reembed-2hkm3vz2.js} +1 -1
- package/dist/{boot-reembed-chx66qfk.js → boot-reembed-c9643ms3.js} +1 -1
- package/dist/{boot-scrub-sweep-dhkfp0a7.js → boot-scrub-sweep-3ycxr51t.js} +2 -2
- package/dist/{boot-seeds-m74fc07r.js → boot-seeds-2hzvvzg0.js} +4 -4
- package/dist/{boxd-451q55ys.js → boxd-9py3x0jb.js} +2 -2
- package/dist/{claude-adapter-hw63yj3j.js → claude-adapter-dnkww93e.js} +9 -9
- package/dist/{claude-managed-adapter-z5s7fx6p.js → claude-managed-adapter-yk0cr5x6.js} +4 -4
- package/dist/{claude-managed-setup-wee1762m.js → claude-managed-setup-4byxpp47.js} +5 -5
- package/dist/{claude-sdk-session-cktyqkpk.js → claude-sdk-session-4wf3dbvs.js} +13163 -12195
- package/dist/{cli-5rxsb3wq.js → cli-096aftq6.js} +12 -7
- package/dist/{cli-5rgm8p39.js → cli-0e914dp9.js} +3 -3
- package/dist/{cli-bzcwwebm.js → cli-0h6m6z5g.js} +1 -1
- package/dist/{cli-cah298e5.js → cli-0k7ppk9k.js} +231 -124
- package/dist/{cli-ja450998.js → cli-1nfabrt4.js} +8 -8
- package/dist/{cli-jzerrzgc.js → cli-2414h5r9.js} +8 -8
- package/dist/{cli-b768ek79.js → cli-24wervhz.js} +38 -0
- package/dist/{cli-93n305hm.js → cli-2ayk9gn8.js} +2 -2
- package/dist/{cli-kr0jpw9c.js → cli-2ckwgs7q.js} +1 -1
- package/dist/{cli-d5pc8ep0.js → cli-2savn6mm.js} +11 -100
- package/dist/{cli-jbrc98qb.js → cli-2zjxake1.js} +4 -4
- package/dist/{cli-4q2c8rxw.js → cli-37p61fcg.js} +15 -9
- package/dist/{cli-2vp0z049.js → cli-39t9d248.js} +1 -1
- package/dist/{cli-sa02jsqt.js → cli-3mhdmcd4.js} +1 -1
- package/dist/{cli-x2cem5vy.js → cli-3wsabyt0.js} +2 -2
- package/dist/{cli-dqgnbnxs.js → cli-466jjrwe.js} +16 -2
- package/dist/{cli-zhwjdhjr.js → cli-6ajyhxh7.js} +2 -2
- package/dist/{cli-3bxrrh53.js → cli-6yy4fepf.js} +4 -4
- package/dist/{cli-hhtbandk.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-m1sns1da.js → cli-7w1fs01q.js} +2 -2
- package/dist/{cli-xwsm6xkr.js → cli-84wxwt3z.js} +1 -1
- package/dist/{cli-qzz6tz8s.js → cli-84xn7bgz.js} +1 -1
- package/dist/{cli-49aq3cyn.js → cli-879txsac.js} +5 -5
- package/dist/{cli-bv4vvnmg.js → cli-8vbxjzk0.js} +3 -3
- package/dist/{cli-7by7vp6m.js → cli-91amj3md.js} +3 -3
- package/dist/{cli-60dwk8tx.js → cli-930zbczq.js} +3 -3
- package/dist/{cli-7g3fg4gf.js → cli-9fwznq4p.js} +10 -10
- package/dist/{cli-4pbwg7sn.js → cli-9j1t3kf6.js} +2 -2
- package/dist/{cli-tzw1jr2t.js → cli-9j47sgzy.js} +2 -2
- package/dist/{cli-0fgvnb0x.js → cli-ad00h1st.js} +7 -7
- package/dist/{cli-kj84fqxz.js → cli-adzmmcvf.js} +19 -7
- package/dist/{cli-3tzmh38q.js → cli-ayxxkk3p.js} +68 -25
- package/dist/{cli-4vynxtrb.js → cli-bqfx72e6.js} +10 -3
- package/dist/{cli-8cas2xvp.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-jg5txpm6.js → cli-dy754erz.js} +83 -1
- package/dist/{cli-tsc3pdfd.js → cli-edxfzgah.js} +4 -4
- package/dist/{cli-hyqksecw.js → cli-ejnhs815.js} +15 -15
- package/dist/{cli-k0nebh10.js → cli-enavhq6r.js} +1 -1
- package/dist/{cli-ea7nz50q.js → cli-f2rwt43y.js} +14 -14
- package/dist/{cli-zjdhrzm0.js → cli-f9g96z28.js} +8 -8
- package/dist/{cli-rmgvwcmy.js → cli-fww016hh.js} +534 -70
- package/dist/{cli-rv3y60bt.js → cli-g6a696c0.js} +4 -4
- package/dist/{cli-z1vam71h.js → cli-gc6b94tj.js} +2 -2
- package/dist/{cli-p436yrzp.js → cli-gcyws2bp.js} +2 -2
- package/dist/{cli-srktrbby.js → cli-hzhv7yac.js} +1 -1
- package/dist/{cli-0p76my9q.js → cli-jcnc5ret.js} +44 -32
- package/dist/{cli-tr19nyn9.js → cli-jgq9xptq.js} +7 -7
- package/dist/{cli-pz1dp12c.js → cli-jwnac23b.js} +1 -1
- package/dist/{cli-904wk98s.js → cli-kc7vd07m.js} +917 -350
- package/dist/{cli-t0jmkcah.js → cli-kg63yp1r.js} +14 -14
- package/dist/{cli-ts5yv7dn.js → cli-krk8y8c7.js} +835 -157
- package/dist/{cli-jyhbvdga.js → cli-m0ea8ggd.js} +8 -10
- package/dist/{cli-944w9wb4.js → cli-md4tn21h.js} +20 -15
- package/dist/{cli-zexwhj3f.js → cli-mv8ft7b0.js} +10 -9
- package/dist/{cli-phdzn699.js → cli-mw1tmn3x.js} +217 -27
- package/dist/{cli-5ashycw3.js → cli-njvpngc6.js} +3 -3
- package/dist/{cli-9ah37a8a.js → cli-phe2vcw5.js} +10 -7
- package/dist/{cli-eds5xnsz.js → cli-phmy14hb.js} +2 -2
- package/dist/{cli-n1kjs58m.js → cli-pq0kv31y.js} +5 -5
- package/dist/{cli-pz1nq5xm.js → cli-q457ga28.js} +6 -6
- package/dist/{cli-s33bzmk0.js → cli-q5n3deaf.js} +1 -1
- package/dist/{cli-4fpa0zns.js → cli-qkbevqer.js} +3 -3
- package/dist/{cli-29h5239w.js → cli-qrwjk4xy.js} +5 -5
- package/dist/{cli-kezzteka.js → cli-r04ve9xw.js} +1 -1
- package/dist/{cli-3xqad83h.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-fkpnx3vf.js → cli-rs1rzwp4.js} +3 -2
- package/dist/{cli-h9d3sdnc.js → cli-rzbsh6bw.js} +1 -1
- package/dist/{cli-94gx6ze9.js → cli-s4pccby1.js} +1 -1
- package/dist/{cli-cq4am6vg.js → cli-shyhb4t5.js} +10 -10
- package/dist/{cli-gtj12v95.js → cli-srq69pn1.js} +1 -1
- package/dist/{cli-azj9t1f9.js → cli-tc165vrb.js} +48 -5
- package/dist/{cli-gse7bp3z.js → cli-v4z5v3jd.js} +300 -81
- package/dist/{cli-p3knvk62.js → cli-vxmmttmt.js} +132 -53
- package/dist/{cli-404am6f3.js → cli-w4bvtxet.js} +7 -7
- package/dist/{cli-gkv0r2hq.js → cli-wd7b5hgc.js} +71 -9
- package/dist/{cli-akm6y2a8.js → cli-wvbaq052.js} +1 -1
- package/dist/{cli-ywy8yz6t.js → cli-wvgg7r4j.js} +2 -2
- package/dist/{cli-ka48vpev.js → cli-wym6rxgt.js} +165 -6
- package/dist/{cli-nc4pbwmp.js → cli-yd7e590v.js} +12 -12
- package/dist/{cli-3zrwrnz7.js → cli-yjb3cddd.js} +1 -1
- package/dist/{cli-7gbff32z.js → cli-z8t4485r.js} +2 -2
- package/dist/{cli-hdhpdrka.js → cli-ze1ndjs4.js} +4 -6
- package/dist/{cli-50wa8k4h.js → cli-zy9bb22b.js} +1 -2
- package/dist/cli.js +28 -28
- package/dist/{codex-adapter-2fs2c0n6.js → codex-adapter-eq61radw.js} +8 -8
- package/dist/{codex-hook-jxjv6dy5.js → codex-hook-8nmepvz6.js} +3 -3
- package/dist/{codex-login-ktfg1cxk.js → codex-login-vbd9707w.js} +1 -1
- package/dist/{codex-session-runner-r55tmx4c.js → codex-session-runner-rfx355h4.js} +9 -9
- package/dist/{commands-0mxdy9x8.js → commands-d1z0sx62.js} +3 -3
- package/dist/{controller-g3vkfhr4.js → controller-9hz6d8x3.js} +4 -4
- package/dist/{controllers-connect-4wdmncqt.js → controllers-connect-tz07d2xr.js} +24 -25
- package/dist/core-dynsv289.js +41 -0
- package/dist/{cursor-adapter-t9qb96q2.js → cursor-adapter-ef22ze3j.js} +2 -2
- package/dist/{db-487vvyv9.js → db-gd81d68c.js} +3 -3
- package/dist/{db-76p7w3gr.js → db-vrckks6q.js} +4 -2
- package/dist/{devin-adapter-3bp6rape.js → devin-adapter-kdt6a2bh.js} +1 -1
- package/dist/{dispatcher-64rp6w67.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-dc8f6ctq.js → e2b-05kn3kpq.js} +16 -5
- package/dist/{e2b-3ykbe805.js → e2b-dm9r8hpy.js} +3 -3
- package/dist/{easter-egg-3d-jrrwyf55.js → easter-egg-3d-sg21j15g.js} +1 -1
- package/dist/{embedding-space-001hhhpk.js → embedding-space-zsdw37bb.js} +13 -23
- package/dist/{embeddings-esj19cnw.js → embeddings-p4e3e1m6.js} +1 -1
- package/dist/{event-bus-7gbsr0g4.js → event-bus-tvf2grf4.js} +1 -1
- package/dist/{execute-301hkxqg.js → execute-nztd0af0.js} +1 -1
- package/dist/{external-channel-w10e2j05.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-tbrj7vhq.js → heartbeat-vfb1gy84.js} +24 -25
- package/dist/{hook-tx917rqw.js → hook-ctz0xmp3.js} +11 -11
- package/dist/{hook-3am1sq68.js → hook-eh52p7yd.js} +6 -6
- package/dist/{http-3rmemtqy.js → http-zregegrx.js} +902 -198
- package/dist/{index-s7xtvc0f.js → index-5kx15d19.js} +1 -1
- package/dist/index-7w8p6em0.js +41 -0
- package/dist/index-evay0xyk.js +17 -0
- package/dist/{index-2jw11t8s.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-gfnq66t1.js → index-x9qf8dg7.js} +294 -29
- package/dist/index-y3s0xp2v.js +43 -0
- package/dist/{k8s-36gfn847.js → k8s-ejkk0aw7.js} +2 -2
- package/dist/{keepalive-9px3t7qj.js → keepalive-zdqay870.js} +4 -5
- package/dist/lead-6cscw8a5.js +82 -0
- package/dist/{maintenance-vwqjwst6.js → maintenance-t5ndg11m.js} +1 -1
- package/dist/{node-2wfcey7d.js → node-0as4n1ef.js} +3 -3
- package/dist/{node-zd6shky9.js → node-dhxbt01p.js} +3 -3
- package/dist/{node-z67yjre7.js → node-jkdd5w7m.js} +290 -70
- package/dist/{node-hjn5n1yp.js → node-t0ct2zpw.js} +3 -5
- package/dist/{oauth-refresh-sweep-yqry3wn4.js → oauth-refresh-sweep-y9zyd7t6.js} +3 -4
- package/dist/{object-webhooks-8s1wtths.js → object-webhooks-mkca91s0.js} +7 -7
- package/dist/{onboard-hb8czx0p.js → onboard-ss995244.js} +11 -9
- package/dist/{opencode-adapter-djd6m6dk.js → opencode-adapter-mwpz0278.js} +8 -8
- package/dist/{otel-impl-2ymwyczz.js → otel-impl-6n6vva3x.js} +2 -2
- package/dist/{pending-nxavtvx7.js → pending-2sxh1t6j.js} +22 -23
- package/dist/{pi-mono-adapter-d2cpmcy4.js → pi-mono-adapter-sfb7zy43.js} +13 -13
- package/dist/{pricing-refresh-1yz8jkqv.js → pricing-refresh-h79bg4cf.js} +2 -2
- package/dist/{rbac-roles-7s6m31xw.js → rbac-roles-ckq0czp4.js} +2 -2
- package/dist/{rbac-roles-dbpx0x9v.js → rbac-roles-jg2e260w.js} +3 -3
- package/dist/{render-v2-7y20rjrn.js → render-v2-ymbshmn0.js} +7 -7
- package/dist/{resume-wz546x47.js → resume-jdhnt4jk.js} +10 -10
- package/dist/{runtime-cb5bd9tz.js → runtime-y28jhhnf.js} +1 -1
- package/dist/{session-access-4vcft8kq.js → session-access-k4ta5hvp.js} +5 -5
- package/dist/{session-source-backfill-57b50tpw.js → session-source-backfill-528j4s8j.js} +3 -3
- package/dist/{setup-e1tevjyj.js → setup-d6pj82fr.js} +15 -6
- package/dist/thread-buffer-9w6x5zec.js +40 -0
- package/dist/{tree-visibility-07wf1nct.js → tree-visibility-kjxv3nxk.js} +2 -2
- package/dist/{user-merge-jobs-n20qpv6s.js → user-merge-jobs-rabbncf6.js} +3 -3
- package/dist/{virtual-modules-6fxmn1yv.js → virtual-modules-22k51txd.js} +3 -3
- package/dist/{work-objects-eg7y48pe.js → work-objects-xtjbar3r.js} +26 -30
- package/dist/{worker-follow-up-jnvnnf2b.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 +633 -25
- 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/apps/sync.ts +20 -5
- package/src/azure-devops/boards-sync.ts +1 -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 +38 -1
- package/src/be/db/task-idempotency.ts +63 -0
- package/src/be/db/tasks/read.ts +27 -1
- package/src/be/db/tasks/write.ts +51 -14
- package/src/be/db/users/avatar.ts +12 -0
- package/src/be/db/workflow-idempotency.ts +6 -1
- package/src/be/db/workflows/read.ts +79 -0
- package/src/be/db.ts +129 -152
- 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/344_user_avatar.sql +4 -0
- package/src/be/migrations/345_task_status_kind.sql +6 -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/primitives/object-embed.ts +2 -2
- package/src/be/primitives/objects.ts +2 -2
- package/src/be/repo-checked-update.ts +58 -5
- package/src/be/requester-timezone.ts +10 -0
- package/src/be/runtime-pools/supervisor.ts +1 -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 +33 -8
- 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 +91 -7
- package/src/be/users.ts +33 -12
- package/src/bitbucket/handlers.ts +1 -1
- package/src/comb/review-batch.ts +16 -5
- package/src/commands/context-preamble.ts +237 -0
- package/src/commands/credential-outcome-report.ts +96 -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 +72 -10
- package/src/commands/setup.tsx +17 -3
- package/src/event-waits/github.ts +39 -6
- package/src/event-waits/index.ts +4 -2
- package/src/event-waits/types.ts +10 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/github/app.ts +177 -13
- package/src/github/handlers.ts +7 -2
- package/src/github/pull-request-state.ts +100 -11
- package/src/gitlab/handlers.ts +2 -2
- package/src/heartbeat/heartbeat.ts +6 -1
- package/src/hooks/hook.ts +8 -2
- package/src/hooks/native-tool-hooks.ts +4 -2
- package/src/http/api-keys.ts +26 -0
- package/src/http/apps.ts +82 -42
- package/src/http/asset-key-write.ts +45 -0
- package/src/http/assets.ts +4 -3
- package/src/http/comb.ts +21 -5
- package/src/http/config.ts +8 -4
- package/src/http/github-token.ts +27 -6
- 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/pages.ts +4 -10
- package/src/http/repos.ts +27 -11
- package/src/http/request-principal.ts +27 -1
- package/src/http/schedules.ts +42 -14
- 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/sessions.ts +7 -2
- package/src/http/skills.ts +70 -0
- package/src/http/status.ts +2 -0
- package/src/http/tasks.ts +115 -19
- package/src/http/trackers/jira.ts +18 -3
- package/src/http/trackers/linear.ts +3 -0
- package/src/http/users.ts +5 -0
- package/src/http/webhooks.ts +19 -1
- package/src/http/workflows.ts +5 -10
- package/src/integrations/chat-sdk/commands.ts +3 -1
- package/src/jira/sync.ts +1 -1
- package/src/kv-limits.ts +2 -0
- package/src/kv-reserved-namespaces.ts +25 -2
- package/src/linear/sync.ts +5 -3
- package/src/prompts/session-templates.ts +50 -0
- package/src/prompts/session-turns.ts +30 -0
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +5 -0
- package/src/providers/claude-managed-adapter.ts +14 -0
- package/src/providers/claude-sdk-session.ts +19 -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/deferred-task-waits.ts +74 -13
- 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 +12 -2
- package/src/scripts-runtime/types/stdlib.d.ts +27 -1
- package/src/scripts-runtime/types/swarm-extension.d.ts +20 -2
- package/src/scripts-runtime/types/swarm-sdk.d.ts +27 -1
- package/src/slack/actions.ts +25 -1
- 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 +403 -17
- 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/api-drain-worker-e2e.test.ts +0 -2
- package/src/tests/approval-auto-cancellation-migration.test.ts +8 -19
- package/src/tests/approval-card-resolution.test.ts +2 -17
- package/src/tests/approval-requests-notifications.test.ts +41 -27
- package/src/tests/approval-requests.test.ts +137 -369
- package/src/tests/apps-script-types.test.ts +63 -16
- package/src/tests/apps-sort-order.test.ts +87 -0
- package/src/tests/apps-sync-engine.test.ts +5 -3
- package/src/tests/apps-table-filters-migration.test.ts +44 -25
- package/src/tests/bedrock-model-groups.test.ts +4 -0
- package/src/tests/bitbucket-handlers.test.ts +2 -0
- package/src/tests/channel-activity.test.ts +9 -0
- package/src/tests/chat-sdk-commands.test.ts +1 -0
- package/src/tests/chatgpt-subscription-model-groups.test.ts +4 -0
- package/src/tests/claude-adapter.test.ts +35 -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-adapter.test.ts +3 -92
- package/src/tests/codex-gpt6-release.test.ts +4 -9
- package/src/tests/codex-oauth-credential-info.test.ts +35 -18
- package/src/tests/codex-oauth.test.ts +0 -6
- package/src/tests/codex-pool.test.ts +5 -214
- package/src/tests/codex-rate-limit-parse.test.ts +0 -7
- package/src/tests/codex-swarm-events.test.ts +11 -54
- package/src/tests/comb-review-batch.test.ts +17 -4
- package/src/tests/comb-status.test.ts +1 -0
- package/src/tests/db-client-busy-retry.test.ts +49 -16
- 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 +24 -1
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/e2b-dispatch.test.ts +13 -1
- package/src/tests/e2e-shards.test.ts +9 -9
- package/src/tests/enabled-tools.test.ts +0 -2
- package/src/tests/entrypoint-mcp-config.test.ts +642 -0
- package/src/tests/fixtures/base-prompt-baseline.json +6 -6
- 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/github-app-worker-auth-helper.test.ts +147 -1
- package/src/tests/gitlab-handlers.test.ts +2 -0
- package/src/tests/heartbeat-jev-gate.test.ts +9 -241
- package/src/tests/heartbeat-reroute-decision.test.ts +2 -0
- package/src/tests/heartbeat-supersede-resume.test.ts +2 -0
- package/src/tests/heartbeat.test.ts +1 -0
- 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/key-usage-selection.test.ts +302 -0
- package/src/tests/memory-e2e.test.ts +34 -103
- package/src/tests/memory-key-paths.test.ts +5 -0
- package/src/tests/memory-rater-llm.test.ts +33 -149
- package/src/tests/memory-store.test.ts +24 -125
- package/src/tests/memory.test.ts +31 -100
- package/src/tests/merge-gate-detect-changes.test.ts +108 -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/otel-service-name.test.ts +0 -9
- package/src/tests/otel-session-cost-metrics.test.ts +1 -38
- package/src/tests/pool-session-logs.test.ts +8 -42
- package/src/tests/pre-push-affected-tests.test.ts +106 -0
- package/src/tests/prompt-template-session.test.ts +3 -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-api-drain.test.ts +2 -17
- package/src/tests/runner-context-preamble.test.ts +202 -0
- package/src/tests/runner-repo-clone-args.test.ts +116 -0
- package/src/tests/runner-terminal-window-report.test.ts +132 -0
- package/src/tests/runtime-supervisor-failures.test.ts +1 -0
- package/src/tests/sandboxed-process.test.ts +26 -21
- package/src/tests/schedule-http-triage-tools.test.ts +12 -9
- package/src/tests/scheduled-tasks.test.ts +14 -51
- 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/script-executor-conformance.test.ts +4 -48
- package/src/tests/script-executor-quickjs-pool.test.ts +9 -7
- package/src/tests/script-native-startup.test.ts +21 -25
- package/src/tests/scripts-namespaces.test.ts +3 -1
- package/src/tests/secret-rules.test.ts +4 -2
- 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-logs.test.ts +1 -260
- 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 +14 -152
- 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/task-cascade-fail.test.ts +1 -0
- package/src/tests/task-supersede-resume.test.ts +1 -0
- package/src/tests/test-proc.ts +5 -2
- package/src/tests/ui-spec-script-actions-config.test.ts +7 -3
- package/src/tests/window-stream-reporter.test.ts +122 -0
- package/src/tests/workflow-agent-task-retry.test.ts +1 -3
- package/src/tests/workflow-cascade-cancel.test.ts +1 -0
- package/src/tests/workflow-retry-v2.test.ts +34 -43
- package/src/tests/workflow-retry-validation.test.ts +8 -48
- package/src/tests/workflow-triggers-v2.test.ts +35 -11
- package/src/tests/worktree-reaper.test.ts +2 -2
- package/src/tools/app-patch.ts +6 -2
- package/src/tools/app-upsert.ts +8 -4
- package/src/tools/cancel-task.ts +2 -2
- package/src/tools/defer-task.ts +24 -79
- package/src/tools/get-task-details.ts +8 -4
- package/src/tools/get-tasks.ts +13 -2
- 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/manage-user.ts +9 -0
- 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/store-progress.ts +5 -3
- 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 +101 -2
- package/src/utils/constants.ts +32 -0
- package/src/utils/credentials.ts +42 -5
- package/src/utils/deferral-time.ts +61 -0
- package/src/utils/error-tracker.ts +6 -0
- package/src/utils/key-usage.ts +114 -0
- package/src/utils/request-auth-context.ts +15 -16
- package/src/utils/sandboxed-process.ts +1 -0
- 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/resume.ts +5 -2
- 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 +6 -2
- package/templates/skills/apps/content.md +6 -2
- package/templates/skills/boards-and-sheets/content.md +4 -2
- package/templates/skills/code-quality/content.md +4 -4
- package/templates/skills/pages/content.md +7 -0
- 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 +8 -0
- package/templates/skills/swarm-scripts/SKILL.md +45 -0
- package/templates/skills/swarm-scripts/content.md +45 -0
- package/dist/acp-adapter-mr4temec.js +0 -17
- package/dist/cli-1vmhnncj.js +0 -173
- package/dist/cli-kj0hyr43.js +0 -51
- package/dist/cli-ysv0k1we.js +0 -459
- package/dist/core-gsvj5f3z.js +0 -42
- package/dist/dsh-adapter-8abzqk5c.js +0 -9
- package/dist/fx-adapter-4sjrbdne.js +0 -20
- package/dist/grok-adapter-3a0ezfee.js +0 -20
- package/dist/handlers-ef3k11hb.js +0 -41
- package/dist/index-aetfyx6p.js +0 -13
- package/dist/index-e6bq0exk.js +0 -42
- package/dist/index-hf2k1vge.js +0 -39
- package/dist/index-taxmejj3.js +0 -44
- package/dist/lead-5vt6f174.js +0 -83
- package/dist/thread-buffer-686pa1p1.js +0 -42
- package/dist/worker-4vp616ms.js +0 -83
- package/src/tests/apps-table-selection-migration.test.ts +0 -95
- package/src/tests/extensions-example-heartbeat-remediate.test.ts +0 -69
- package/src/tests/extensions-example-rewrite-and-suppress.test.ts +0 -70
package/src/http/mcp-oauth.ts
CHANGED
|
@@ -34,6 +34,7 @@ import {
|
|
|
34
34
|
} from "../oauth/mcp-wrapper";
|
|
35
35
|
import { McpAuthMethodSchema } from "../types";
|
|
36
36
|
import { getAppUrl, getPublicMcpBaseUrl } from "../utils/constants";
|
|
37
|
+
import { refuseAgentTokenWithout } from "./request-principal";
|
|
37
38
|
import { route } from "./route-def";
|
|
38
39
|
import { jsonError } from "./utils";
|
|
39
40
|
|
|
@@ -186,6 +187,15 @@ async function discoverForMcp(resourceUrl: string): Promise<DiscoveryResult | nu
|
|
|
186
187
|
if (!issuer) return null;
|
|
187
188
|
|
|
188
189
|
const as = await discoverAuthorizationServerMetadata(issuer);
|
|
190
|
+
// The browser is sent to authorization_endpoint and the API posts to the others.
|
|
191
|
+
for (const endpoint of [
|
|
192
|
+
as.authorization_endpoint,
|
|
193
|
+
as.token_endpoint,
|
|
194
|
+
as.registration_endpoint,
|
|
195
|
+
as.revocation_endpoint,
|
|
196
|
+
]) {
|
|
197
|
+
if (endpoint) assertUrlSafe(endpoint, mcpOAuthSsrfOptions());
|
|
198
|
+
}
|
|
189
199
|
|
|
190
200
|
return {
|
|
191
201
|
resourceUrl: prmd.resource ?? resourceUrl,
|
|
@@ -334,6 +344,7 @@ const refreshRoute = route({
|
|
|
334
344
|
tags: ["MCP OAuth"],
|
|
335
345
|
auth: { apiKey: true },
|
|
336
346
|
params: z.object({ mcpServerId: z.string() }),
|
|
347
|
+
rbac: { permission: "mcp-oauth.manage" },
|
|
337
348
|
body: z
|
|
338
349
|
.object({
|
|
339
350
|
userId: z.string().optional(),
|
|
@@ -356,6 +367,7 @@ const disconnectRoute = route({
|
|
|
356
367
|
tags: ["MCP OAuth"],
|
|
357
368
|
auth: { apiKey: true },
|
|
358
369
|
params: z.object({ mcpServerId: z.string() }),
|
|
370
|
+
rbac: { permission: "mcp-oauth.manage" },
|
|
359
371
|
query: z.object({ userId: z.string().optional() }),
|
|
360
372
|
responses: {
|
|
361
373
|
200: { description: "Token revoked/deleted", schema: OkResponseSchema },
|
|
@@ -371,6 +383,7 @@ const manualClientRoute = route({
|
|
|
371
383
|
tags: ["MCP OAuth"],
|
|
372
384
|
auth: { apiKey: true },
|
|
373
385
|
params: z.object({ mcpServerId: z.string() }),
|
|
386
|
+
rbac: { permission: "mcp-oauth.manage" },
|
|
374
387
|
body: z.object({
|
|
375
388
|
clientId: z.string().min(1),
|
|
376
389
|
clientSecret: z.string().optional(),
|
|
@@ -918,6 +931,7 @@ export async function handleMcpOAuth(
|
|
|
918
931
|
if (refreshRoute.match(req.method, pathSegments)) {
|
|
919
932
|
const parsed = await refreshRoute.parse(req, res, pathSegments, queryParams);
|
|
920
933
|
if (!parsed) return true;
|
|
934
|
+
if (await refuseAgentTokenWithout(req, res, "mcp-oauth.manage")) return true;
|
|
921
935
|
|
|
922
936
|
const userId = parsed.body?.userId ?? null;
|
|
923
937
|
const existing = await getMcpOAuthToken(parsed.params.mcpServerId, userId);
|
|
@@ -965,6 +979,7 @@ export async function handleMcpOAuth(
|
|
|
965
979
|
if (disconnectRoute.match(req.method, pathSegments)) {
|
|
966
980
|
const parsed = await disconnectRoute.parse(req, res, pathSegments, queryParams);
|
|
967
981
|
if (!parsed) return true;
|
|
982
|
+
if (await refuseAgentTokenWithout(req, res, "mcp-oauth.manage")) return true;
|
|
968
983
|
|
|
969
984
|
const userId = parsed.query.userId ?? null;
|
|
970
985
|
const token = await getMcpOAuthToken(parsed.params.mcpServerId, userId);
|
|
@@ -1002,6 +1017,7 @@ export async function handleMcpOAuth(
|
|
|
1002
1017
|
if (manualClientRoute.match(req.method, pathSegments)) {
|
|
1003
1018
|
const parsed = await manualClientRoute.parse(req, res, pathSegments, queryParams);
|
|
1004
1019
|
if (!parsed) return true;
|
|
1020
|
+
if (await refuseAgentTokenWithout(req, res, "mcp-oauth.manage")) return true;
|
|
1005
1021
|
|
|
1006
1022
|
const server = await getMcpOrError(res, parsed.params.mcpServerId);
|
|
1007
1023
|
if (!server) return true;
|
package/src/http/mcp-servers.ts
CHANGED
|
@@ -17,6 +17,7 @@ import { updateMcpServerChecked } from "../be/mcp-server-checked-update";
|
|
|
17
17
|
import { updateTouchesStdioExecution } from "../be/mcp-server-stdio-gate";
|
|
18
18
|
import { enqueueAdmissionRow } from "../be/rbac-audit";
|
|
19
19
|
import { getUserGrant } from "../be/rbac-roles";
|
|
20
|
+
import { isApiOnlyConfigKey, isInternalConfigKey } from "../be/swarm-config-guard";
|
|
20
21
|
import { ensureMcpToken } from "../oauth/ensure-mcp-token";
|
|
21
22
|
import { assertUrlSafe, publicEndpointSsrfOptions } from "../oauth/mcp-wrapper";
|
|
22
23
|
import { isCodexOAuthConfigKey } from "../providers/codex-oauth/env-keys";
|
|
@@ -29,7 +30,7 @@ import {
|
|
|
29
30
|
} from "../rbac";
|
|
30
31
|
import { AgentMcpServerSchema, McpServerSchema, McpServerWithInstallInfoSchema } from "../types";
|
|
31
32
|
import { getRequestAuth } from "../utils/request-auth-context";
|
|
32
|
-
import { agentFirstPrincipal, authUserId } from "./request-principal";
|
|
33
|
+
import { agentFirstPrincipal, authUserId, refuseAgentTokenWithout } from "./request-principal";
|
|
33
34
|
import { route } from "./route-def";
|
|
34
35
|
import { jsonError } from "./utils";
|
|
35
36
|
|
|
@@ -223,7 +224,11 @@ const getAgentMcpServersRoute = route({
|
|
|
223
224
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
224
225
|
|
|
225
226
|
async function canResolveMcpSecretsForHttpUser(req: IncomingMessage): Promise<boolean> {
|
|
226
|
-
const
|
|
227
|
+
const auth = getRequestAuth(req);
|
|
228
|
+
// Task tokens are ACP harness credentials and read no config secrets (as on
|
|
229
|
+
// /api/config/resolved). The worker resolves installed servers with its own key.
|
|
230
|
+
if (auth?.kind === "agent" && auth.tokenKind === "task") return false;
|
|
231
|
+
const userId = authUserId(auth);
|
|
227
232
|
if (!userId) return true;
|
|
228
233
|
if (!isRbacEnabled()) return true;
|
|
229
234
|
|
|
@@ -320,7 +325,14 @@ export async function handleMcpServers(
|
|
|
320
325
|
return true;
|
|
321
326
|
}
|
|
322
327
|
|
|
323
|
-
|
|
328
|
+
// API-only and internal rows never leave the API, and Codex OAuth rows carry
|
|
329
|
+
// the refresh token: none of them resolve into an env var or a header.
|
|
330
|
+
const configs = (await getResolvedConfig(parsed.params.id)).filter(
|
|
331
|
+
(c) =>
|
|
332
|
+
!isApiOnlyConfigKey(c.key) &&
|
|
333
|
+
!isInternalConfigKey(c.key) &&
|
|
334
|
+
!isCodexOAuthConfigKey(c.key),
|
|
335
|
+
);
|
|
324
336
|
const configMap = new Map(configs.map((c) => [c.key, c.value]));
|
|
325
337
|
|
|
326
338
|
const serversWithSecrets = await Promise.all(
|
|
@@ -441,6 +453,15 @@ export async function handleMcpServers(
|
|
|
441
453
|
jsonError(res, "MCP server not found", 404);
|
|
442
454
|
return true;
|
|
443
455
|
}
|
|
456
|
+
if (
|
|
457
|
+
parsed.body.agentId !== singleHeader(req, "x-agent-id") &&
|
|
458
|
+
(await refuseAgentTokenWithout(req, res, "mcp-server.install.any", {
|
|
459
|
+
kind: "agent",
|
|
460
|
+
agentId: parsed.body.agentId,
|
|
461
|
+
}))
|
|
462
|
+
) {
|
|
463
|
+
return true;
|
|
464
|
+
}
|
|
444
465
|
|
|
445
466
|
try {
|
|
446
467
|
const agentMcpServer = await installMcpServer(parsed.body.agentId, parsed.params.id);
|
|
@@ -455,6 +476,15 @@ export async function handleMcpServers(
|
|
|
455
476
|
if (uninstallMcpServerRoute.match(req.method, pathSegments)) {
|
|
456
477
|
const parsed = await uninstallMcpServerRoute.parse(req, res, pathSegments, queryParams);
|
|
457
478
|
if (!parsed) return true;
|
|
479
|
+
if (
|
|
480
|
+
parsed.params.agentId !== singleHeader(req, "x-agent-id") &&
|
|
481
|
+
(await refuseAgentTokenWithout(req, res, "mcp-server.uninstall.any", {
|
|
482
|
+
kind: "agent",
|
|
483
|
+
agentId: parsed.params.agentId,
|
|
484
|
+
}))
|
|
485
|
+
) {
|
|
486
|
+
return true;
|
|
487
|
+
}
|
|
458
488
|
|
|
459
489
|
const removed = await uninstallMcpServer(parsed.params.agentId, parsed.params.id);
|
|
460
490
|
uninstallMcpServerRoute.respond(res, 200, { success: removed });
|
|
@@ -611,6 +641,16 @@ export async function handleMcpServers(
|
|
|
611
641
|
if (deleteMcpServerRoute.match(req.method, pathSegments)) {
|
|
612
642
|
const parsed = await deleteMcpServerRoute.parse(req, res, pathSegments, queryParams);
|
|
613
643
|
if (!parsed) return true;
|
|
644
|
+
const existing = await getMcpServerById(parsed.params.id);
|
|
645
|
+
if (
|
|
646
|
+
existing &&
|
|
647
|
+
(await refuseAgentTokenWithout(req, res, "mcp-server.delete.any", {
|
|
648
|
+
kind: "owned",
|
|
649
|
+
ownerAgentId: existing.ownerAgentId,
|
|
650
|
+
}))
|
|
651
|
+
) {
|
|
652
|
+
return true;
|
|
653
|
+
}
|
|
614
654
|
|
|
615
655
|
const result = await deleteMcpServer(parsed.params.id);
|
|
616
656
|
if (!result.deleted) {
|
package/src/http/memory.ts
CHANGED
|
@@ -47,7 +47,7 @@ import { can, type RbacPrincipal } from "../rbac";
|
|
|
47
47
|
import { AgentMemorySchema, AgentMemoryScopeSchema, AgentMemorySourceSchema } from "../types";
|
|
48
48
|
import { getRequestAuth } from "../utils/request-auth-context";
|
|
49
49
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
50
|
-
import { agentFirstPrincipal, rejectGuest } from "./request-principal";
|
|
50
|
+
import { agentFirstPrincipal, rejectGuest, requestPrincipal } from "./request-principal";
|
|
51
51
|
import { bodyTask, route } from "./route-def";
|
|
52
52
|
import { jsonError, parseQueryParams } from "./utils";
|
|
53
53
|
|
|
@@ -831,6 +831,22 @@ export async function handleMemory(
|
|
|
831
831
|
contextKey,
|
|
832
832
|
} = parsed.body;
|
|
833
833
|
const memoryAgentId = agentId ?? (scope === "agent" ? myAgentId : undefined);
|
|
834
|
+
// An agent-bound token writes its own memory. Another agent's needs a lead.
|
|
835
|
+
const auth = getRequestAuth(req);
|
|
836
|
+
if (
|
|
837
|
+
auth?.kind === "agent" &&
|
|
838
|
+
memoryAgentId !== undefined &&
|
|
839
|
+
memoryAgentId !== auth.agentId &&
|
|
840
|
+
!can({
|
|
841
|
+
principal: await ingestPrincipal(req, myAgentId),
|
|
842
|
+
verb: "memory.edit.any",
|
|
843
|
+
resource: { kind: "owned", ownerAgentId: memoryAgentId },
|
|
844
|
+
source: "http",
|
|
845
|
+
}).allow
|
|
846
|
+
) {
|
|
847
|
+
jsonError(res, "An agent token can index memory only for its own agent", 403);
|
|
848
|
+
return true;
|
|
849
|
+
}
|
|
834
850
|
|
|
835
851
|
if (source === "session_summary" && sourceTaskId) {
|
|
836
852
|
const sourceTask = await getTaskById(sourceTaskId);
|
|
@@ -1370,6 +1386,17 @@ export async function handleMemory(
|
|
|
1370
1386
|
if (reEmbedMemory.match(req.method, pathSegments)) {
|
|
1371
1387
|
const parsed = await reEmbedMemory.parse(req, res, pathSegments, new URLSearchParams());
|
|
1372
1388
|
if (!parsed) return true;
|
|
1389
|
+
// Operator-first: the shared key stays the operator even with X-Agent-ID.
|
|
1390
|
+
// An agent session token must belong to a lead.
|
|
1391
|
+
const reembedDecision = can({
|
|
1392
|
+
principal: await requestPrincipal(req, myAgentId, { unauthenticatedFallback: "operator" }),
|
|
1393
|
+
verb: "memory.reembed",
|
|
1394
|
+
source: "http",
|
|
1395
|
+
});
|
|
1396
|
+
if (!reembedDecision.allow) {
|
|
1397
|
+
jsonError(res, `Forbidden: ${reembedDecision.reason}`, 403);
|
|
1398
|
+
return true;
|
|
1399
|
+
}
|
|
1373
1400
|
|
|
1374
1401
|
const { agentId, batchSize } = parsed.body;
|
|
1375
1402
|
const store = getMemoryStore();
|
package/src/http/metrics.ts
CHANGED
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
type MetricWidget,
|
|
25
25
|
MetricWidgetSchema,
|
|
26
26
|
} from "../types";
|
|
27
|
+
import { scrubObject } from "../utils/secret-scrubber";
|
|
27
28
|
import { assertSelectOnlyQuery, executeReadOnlyQuery } from "./db-query";
|
|
28
29
|
import { route } from "./route-def";
|
|
29
30
|
import { jsonError } from "./utils";
|
|
@@ -87,7 +88,9 @@ function resolveVariableOptions(metric: Metric) {
|
|
|
87
88
|
}
|
|
88
89
|
const options = resolveVariableOptionValues(variable);
|
|
89
90
|
optionsByKey[variable.key] = options;
|
|
90
|
-
|
|
91
|
+
// Options are query output, like widget rows: the response gets a scrubbed copy.
|
|
92
|
+
// `optionsByKey` keeps the raw values for validation and parameter binding.
|
|
93
|
+
return { ...variable, options: scrubObject(options) };
|
|
91
94
|
});
|
|
92
95
|
return { variables, optionsByKey };
|
|
93
96
|
}
|
|
@@ -162,8 +165,11 @@ function runMetricWidget(widget: MetricWidget, variables: Record<string, MetricP
|
|
|
162
165
|
widget,
|
|
163
166
|
result: {
|
|
164
167
|
...result,
|
|
165
|
-
|
|
166
|
-
|
|
168
|
+
// Rows can hold secrets pasted into free text: scrub them, as /api/db-query does.
|
|
169
|
+
rows: scrubObject(
|
|
170
|
+
result.rows.map((row) =>
|
|
171
|
+
Object.fromEntries(result.columns.map((column, index) => [column, row[index]])),
|
|
172
|
+
),
|
|
167
173
|
),
|
|
168
174
|
truncated: result.total > result.rows.length,
|
|
169
175
|
maxRows,
|
|
@@ -180,7 +186,8 @@ function runMetric(metric: Metric, providedVariables: Record<string, unknown> =
|
|
|
180
186
|
...metric,
|
|
181
187
|
definition: { ...metric.definition, variables: resolved.variables },
|
|
182
188
|
},
|
|
183
|
-
|
|
189
|
+
// A default can be the first option of an options query, so scrub the echo too.
|
|
190
|
+
variables: scrubObject(variables),
|
|
184
191
|
widgets,
|
|
185
192
|
// Kept as the first widget result for older callers during the PR cycle.
|
|
186
193
|
result: widgets[0]?.result,
|
package/src/http/onboarding.ts
CHANGED
|
@@ -26,7 +26,7 @@ import { assertUrlSafe, publicEndpointSsrfOptions } from "../oauth/mcp-wrapper";
|
|
|
26
26
|
import { ProviderNameSchema } from "../types";
|
|
27
27
|
import { isCombEnabled } from "../utils/constants";
|
|
28
28
|
import { splitCredentialPool } from "../utils/credentials";
|
|
29
|
-
import { isPrivateAddress } from "../utils/egress-guard";
|
|
29
|
+
import { createSsrfGuardedFetch, EgressDeniedError, isPrivateAddress } from "../utils/egress-guard";
|
|
30
30
|
import { getOpenRouterAttributionHeaders } from "../utils/openrouter-base-url";
|
|
31
31
|
import { ensureConfigAdmin } from "./config";
|
|
32
32
|
import {
|
|
@@ -383,6 +383,8 @@ async function handleMemoryProbe(body: OnboardingMemoryRequest): Promise<Onboard
|
|
|
383
383
|
timeout: 15_000,
|
|
384
384
|
maxRetries: 0,
|
|
385
385
|
fetchOptions: { redirect: "manual" },
|
|
386
|
+
// The guard resolves the hostname and refuses a private address.
|
|
387
|
+
fetch: configuredEndpoint ? undefined : createSsrfGuardedFetch(publicEndpointSsrfOptions()),
|
|
386
388
|
});
|
|
387
389
|
const response = await client.embeddings.create({
|
|
388
390
|
model,
|
|
@@ -420,6 +422,15 @@ async function handleMemoryProbe(body: OnboardingMemoryRequest): Promise<Onboard
|
|
|
420
422
|
);
|
|
421
423
|
return { ok: true, dimensions, latencyMs };
|
|
422
424
|
} catch (error) {
|
|
425
|
+
if (error instanceof Error && error.cause instanceof EgressDeniedError) {
|
|
426
|
+
// Same answer as the URL check above: the step state stays as is.
|
|
427
|
+
return {
|
|
428
|
+
ok: false,
|
|
429
|
+
latencyMs: 0,
|
|
430
|
+
error: "The endpoint URL is not allowed.",
|
|
431
|
+
errorClass: "network",
|
|
432
|
+
};
|
|
433
|
+
}
|
|
423
434
|
const errorClass = classifyMemoryError(error);
|
|
424
435
|
const latencyMs = Math.max(0, Math.round(performance.now() - started));
|
|
425
436
|
const message = memoryErrorMessage(errorClass, memoryErrorStatus(error));
|
package/src/http/pages.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
3
3
|
import { z } from "zod";
|
|
4
|
-
import { AssetKeyAuthorizationError
|
|
5
|
-
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
4
|
+
import { AssetKeyAuthorizationError } from "../be/asset-key-auth";
|
|
6
5
|
import {
|
|
7
6
|
countAllPages,
|
|
8
7
|
countPagesByAgent,
|
|
@@ -22,6 +21,7 @@ import {
|
|
|
22
21
|
import { getPageEditCounter } from "../be/db/page-versions";
|
|
23
22
|
import { snapshotPage } from "../pages/version";
|
|
24
23
|
import { resolveTemplate } from "../prompts/resolver";
|
|
24
|
+
import { authorizeHttpAssetKeyWrite } from "./asset-key-write";
|
|
25
25
|
// Side-effect import: registers `task.page.feedback`.
|
|
26
26
|
import "../prompts/session-templates";
|
|
27
27
|
import { can } from "../rbac";
|
|
@@ -633,10 +633,7 @@ export async function handlePages(
|
|
|
633
633
|
|
|
634
634
|
try {
|
|
635
635
|
const key = parsed.body.key
|
|
636
|
-
? await
|
|
637
|
-
parsed.body.key,
|
|
638
|
-
await resolveHttpRequesterUserId(req, myAgentId),
|
|
639
|
-
)
|
|
636
|
+
? await authorizeHttpAssetKeyWrite(req, myAgentId, parsed.body.key)
|
|
640
637
|
: undefined;
|
|
641
638
|
const page = await createPage({
|
|
642
639
|
key,
|
|
@@ -880,10 +877,7 @@ export async function handlePages(
|
|
|
880
877
|
let key: string | undefined;
|
|
881
878
|
if (parsed.body.key !== undefined) {
|
|
882
879
|
try {
|
|
883
|
-
key = await
|
|
884
|
-
parsed.body.key,
|
|
885
|
-
await resolveHttpRequesterUserId(req, myAgentId),
|
|
886
|
-
);
|
|
880
|
+
key = await authorizeHttpAssetKeyWrite(req, myAgentId, parsed.body.key);
|
|
887
881
|
} catch (error) {
|
|
888
882
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
889
883
|
jsonError(res, error.message, error.statusCode);
|
package/src/http/repos.ts
CHANGED
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { createSwarmRepo, deleteSwarmRepo, getSwarmRepoById, getSwarmRepos } from "../be/db";
|
|
4
|
-
import { updateSwarmRepoChecked } from "../be/repo-checked-update";
|
|
4
|
+
import { execConfigRefusal, updateSwarmRepoChecked } from "../be/repo-checked-update";
|
|
5
5
|
import { changesMergePolicy } from "../be/repo-merge-policy";
|
|
6
6
|
import { can } from "../rbac";
|
|
7
7
|
import { emitIntegrationConnected } from "../telemetry";
|
|
8
8
|
import { RepoGuidelinesInputSchema, RepoHooksSchema, SwarmRepoSchema } from "../types";
|
|
9
|
-
import {
|
|
9
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
10
|
+
import { agentFirstPrincipal, refuseAgentTokenWithout } from "./request-principal";
|
|
10
11
|
import { route } from "./route-def";
|
|
11
12
|
import { json, jsonError } from "./utils";
|
|
12
13
|
|
|
13
14
|
// ─── Route Definitions ───────────────────────────────────────────────────────
|
|
14
15
|
|
|
16
|
+
/** Workers pass `url`, `clonePath` and `defaultBranch` to git as arguments, so none may read as an option. */
|
|
17
|
+
const notOptionLike = (schema: z.ZodString, field: string) =>
|
|
18
|
+
schema.refine((value) => !value.startsWith("-"), `${field} must not start with "-"`);
|
|
19
|
+
|
|
15
20
|
const getRepo = route({
|
|
16
21
|
method: "get",
|
|
17
22
|
path: "/api/repos/{id}",
|
|
@@ -50,10 +55,10 @@ const createRepo = route({
|
|
|
50
55
|
summary: "Create a new repo",
|
|
51
56
|
tags: ["Repos"],
|
|
52
57
|
body: z.object({
|
|
53
|
-
url: z.string().min(1),
|
|
58
|
+
url: notOptionLike(z.string().min(1), "url"),
|
|
54
59
|
name: z.string().min(1),
|
|
55
|
-
clonePath: z.string().optional(),
|
|
56
|
-
defaultBranch: z.string().optional(),
|
|
60
|
+
clonePath: notOptionLike(z.string(), "clonePath").optional(),
|
|
61
|
+
defaultBranch: notOptionLike(z.string(), "defaultBranch").optional(),
|
|
57
62
|
autoClone: z.boolean().optional(),
|
|
58
63
|
hooks: RepoHooksSchema.optional(),
|
|
59
64
|
guidelines: RepoGuidelinesInputSchema.nullable().optional(),
|
|
@@ -63,7 +68,7 @@ const createRepo = route({
|
|
|
63
68
|
400: { description: "Validation error", schema: z.object({ error: z.string() }) },
|
|
64
69
|
403: {
|
|
65
70
|
description:
|
|
66
|
-
"Only the lead, the operator or a user can turn allowMerge on
|
|
71
|
+
"Only the lead, the operator or a user can turn allowMerge on, set a mergePolicy or enable hooks",
|
|
67
72
|
schema: z.object({ error: z.string() }),
|
|
68
73
|
},
|
|
69
74
|
409: { description: "Duplicate repo", schema: z.object({ error: z.string() }) },
|
|
@@ -79,10 +84,10 @@ const updateRepo = route({
|
|
|
79
84
|
tags: ["Repos"],
|
|
80
85
|
params: z.object({ id: z.string().uuid() }),
|
|
81
86
|
body: z.object({
|
|
82
|
-
url: z.string().optional(),
|
|
87
|
+
url: notOptionLike(z.string(), "url").optional(),
|
|
83
88
|
name: z.string().optional(),
|
|
84
|
-
clonePath: z.string().optional(),
|
|
85
|
-
defaultBranch: z.string().optional(),
|
|
89
|
+
clonePath: notOptionLike(z.string(), "clonePath").optional(),
|
|
90
|
+
defaultBranch: notOptionLike(z.string(), "defaultBranch").optional(),
|
|
86
91
|
autoClone: z.boolean().optional(),
|
|
87
92
|
hooks: RepoHooksSchema.nullable().optional(),
|
|
88
93
|
guidelines: RepoGuidelinesInputSchema.nullable().optional(),
|
|
@@ -90,7 +95,8 @@ const updateRepo = route({
|
|
|
90
95
|
responses: {
|
|
91
96
|
200: { description: "Repo updated", schema: SwarmRepoSchema },
|
|
92
97
|
403: {
|
|
93
|
-
description:
|
|
98
|
+
description:
|
|
99
|
+
"Only the lead, the operator or a user can change allowMerge, mergePolicy, url, clonePath or hooks",
|
|
94
100
|
schema: z.object({ error: z.string() }),
|
|
95
101
|
},
|
|
96
102
|
404: { description: "Repo not found", schema: z.object({ error: z.string() }) },
|
|
@@ -110,6 +116,7 @@ const deleteRepo = route({
|
|
|
110
116
|
200: { description: "Repo deleted", schema: z.object({ success: z.boolean() }) },
|
|
111
117
|
404: { description: "Repo not found", schema: z.object({ error: z.string() }) },
|
|
112
118
|
},
|
|
119
|
+
rbac: { permission: "repo.delete" },
|
|
113
120
|
});
|
|
114
121
|
|
|
115
122
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
@@ -168,6 +175,13 @@ export async function handleRepos(
|
|
|
168
175
|
return true;
|
|
169
176
|
}
|
|
170
177
|
}
|
|
178
|
+
// A non-lead agent token may create a repo, but not one with hooks enabled: an explicit
|
|
179
|
+
// `hooks: { enabled: true }` is refused and an omitted `hooks` stores it disabled.
|
|
180
|
+
const execRefusal = await execConfigRefusal(getRequestAuth(req), "http");
|
|
181
|
+
if (execRefusal && parsed.body.hooks?.enabled === true) {
|
|
182
|
+
jsonError(res, execRefusal, 403);
|
|
183
|
+
return true;
|
|
184
|
+
}
|
|
171
185
|
try {
|
|
172
186
|
const repo = await createSwarmRepo({
|
|
173
187
|
url: parsed.body.url,
|
|
@@ -175,7 +189,7 @@ export async function handleRepos(
|
|
|
175
189
|
clonePath: parsed.body.clonePath,
|
|
176
190
|
defaultBranch: parsed.body.defaultBranch,
|
|
177
191
|
autoClone: parsed.body.autoClone,
|
|
178
|
-
hooks: parsed.body.hooks,
|
|
192
|
+
hooks: parsed.body.hooks ?? (execRefusal ? { enabled: false } : undefined),
|
|
179
193
|
guidelines: parsed.body.guidelines,
|
|
180
194
|
});
|
|
181
195
|
try {
|
|
@@ -213,6 +227,7 @@ export async function handleRepos(
|
|
|
213
227
|
guidelines: parsed.body.guidelines,
|
|
214
228
|
},
|
|
215
229
|
() => allowMergeRefusal(req, myAgentId),
|
|
230
|
+
() => execConfigRefusal(getRequestAuth(req), "http"),
|
|
216
231
|
);
|
|
217
232
|
if (result.kind === "refused") {
|
|
218
233
|
jsonError(res, result.refusal, 403);
|
|
@@ -237,6 +252,7 @@ export async function handleRepos(
|
|
|
237
252
|
if (deleteRepo.match(req.method, pathSegments)) {
|
|
238
253
|
const parsed = await deleteRepo.parse(req, res, pathSegments, queryParams);
|
|
239
254
|
if (!parsed) return true;
|
|
255
|
+
if (await refuseAgentTokenWithout(req, res, "repo.delete")) return true;
|
|
240
256
|
const deleted = await deleteSwarmRepo(parsed.params.id);
|
|
241
257
|
if (!deleted) {
|
|
242
258
|
jsonError(res, "Repo not found", 404);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { getAgentById } from "../be/db";
|
|
3
|
-
import type
|
|
3
|
+
import { can, type PermissionVerb, type RbacPrincipal, type RbacResource } from "../rbac";
|
|
4
4
|
import {
|
|
5
5
|
authUser,
|
|
6
6
|
authUserId,
|
|
@@ -168,3 +168,29 @@ export function rejectGuest(req: IncomingMessage, res: ServerResponse): boolean
|
|
|
168
168
|
jsonError(res, "Forbidden", 403);
|
|
169
169
|
return true;
|
|
170
170
|
}
|
|
171
|
+
|
|
172
|
+
/**
|
|
173
|
+
* Refuse an agent-bound session token (`aseph_`) whose agent may not do `verb`
|
|
174
|
+
* on `resource`. Only that credential is checked here: the shared API key,
|
|
175
|
+
* user tokens and page sessions keep the route's other checks, so a worker on
|
|
176
|
+
* the shared key behaves as before. Writes a 403 and returns true on refusal.
|
|
177
|
+
*/
|
|
178
|
+
export async function refuseAgentTokenWithout(
|
|
179
|
+
req: IncomingMessage,
|
|
180
|
+
res: ServerResponse,
|
|
181
|
+
verb: PermissionVerb,
|
|
182
|
+
resource: RbacResource = { kind: "none" },
|
|
183
|
+
): Promise<boolean> {
|
|
184
|
+
const auth = getRequestAuth(req);
|
|
185
|
+
if (auth?.kind !== "agent") return false;
|
|
186
|
+
const agent = await getAgentById(auth.agentId);
|
|
187
|
+
const decision = can({
|
|
188
|
+
principal: { kind: "agent", agentId: auth.agentId, isLead: agent?.isLead === true },
|
|
189
|
+
verb,
|
|
190
|
+
resource,
|
|
191
|
+
source: "http",
|
|
192
|
+
});
|
|
193
|
+
if (decision.allow) return false;
|
|
194
|
+
jsonError(res, `Forbidden: ${decision.reason}`, 403);
|
|
195
|
+
return true;
|
|
196
|
+
}
|
package/src/http/schedules.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { CronExpressionParser } from "cron-parser";
|
|
3
3
|
import { z } from "zod";
|
|
4
|
-
import { AssetKeyAuthorizationError
|
|
4
|
+
import { AssetKeyAuthorizationError } from "../be/asset-key-auth";
|
|
5
5
|
import { resolveHttpAuditUserId, resolveHttpRequesterUserId } from "../be/audit-user";
|
|
6
6
|
import {
|
|
7
7
|
createScheduledTask,
|
|
@@ -39,6 +39,8 @@ import {
|
|
|
39
39
|
ScheduledTaskTargetTypeSchema,
|
|
40
40
|
splitLegacyModelAlias,
|
|
41
41
|
} from "../types";
|
|
42
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
43
|
+
import { authorizeHttpAssetKeyWrite } from "./asset-key-write";
|
|
42
44
|
import { resolveHttpFavoriteOwner } from "./favorite-owner";
|
|
43
45
|
import { agentFirstPrincipal } from "./request-principal";
|
|
44
46
|
import { route } from "./route-def";
|
|
@@ -439,7 +441,9 @@ export async function handleSchedules(
|
|
|
439
441
|
const trustedUserId = await resolveHttpRequesterUserId(req, myAgentId);
|
|
440
442
|
let key: string | undefined;
|
|
441
443
|
try {
|
|
442
|
-
key = body.key
|
|
444
|
+
key = body.key
|
|
445
|
+
? await authorizeHttpAssetKeyWrite(req, myAgentId, body.key, trustedUserId)
|
|
446
|
+
: undefined;
|
|
443
447
|
} catch (error) {
|
|
444
448
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
445
449
|
jsonError(res, error.message, error.statusCode);
|
|
@@ -515,6 +519,25 @@ export async function handleSchedules(
|
|
|
515
519
|
return true;
|
|
516
520
|
}
|
|
517
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
|
+
|
|
518
541
|
if (!schedule.enabled) {
|
|
519
542
|
jsonError(res, "Schedule is disabled", 400);
|
|
520
543
|
return true;
|
|
@@ -577,10 +600,7 @@ export async function handleSchedules(
|
|
|
577
600
|
const body = parsed.body as Record<string, unknown>;
|
|
578
601
|
if (parsed.body.key !== undefined) {
|
|
579
602
|
try {
|
|
580
|
-
body.key = await
|
|
581
|
-
parsed.body.key,
|
|
582
|
-
await resolveHttpRequesterUserId(req, myAgentId),
|
|
583
|
-
);
|
|
603
|
+
body.key = await authorizeHttpAssetKeyWrite(req, myAgentId, parsed.body.key);
|
|
584
604
|
} catch (error) {
|
|
585
605
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
586
606
|
jsonError(res, error.message, error.statusCode);
|
|
@@ -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;
|