@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/be/mcp-proxy.ts
CHANGED
|
@@ -4,7 +4,12 @@ import { ensureMcpToken } from "@/oauth/ensure-mcp-token";
|
|
|
4
4
|
import { assertUrlSafe, publicEndpointSsrfOptions } from "@/oauth/mcp-wrapper";
|
|
5
5
|
import type { McpServer } from "@/types";
|
|
6
6
|
import { createSsrfGuardedFetch } from "@/utils/egress-guard";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
createValueScrubber,
|
|
9
|
+
registerVolatileSecret,
|
|
10
|
+
scrubSecrets,
|
|
11
|
+
type ValueScrubber,
|
|
12
|
+
} from "@/utils/secret-scrubber";
|
|
8
13
|
|
|
9
14
|
const MCP_PROXY_TIMEOUT_MS = 30_000;
|
|
10
15
|
|
|
@@ -23,9 +28,12 @@ function parseHeadersJson(value: string | null): Record<string, string> {
|
|
|
23
28
|
}
|
|
24
29
|
}
|
|
25
30
|
|
|
31
|
+
type SecretEntry = { value: string; name: string };
|
|
32
|
+
|
|
26
33
|
async function resolveHeaderConfigKeys(
|
|
27
34
|
headerConfigKeys: string | null,
|
|
28
35
|
context: { agentId?: string; repoId?: string },
|
|
36
|
+
secrets: SecretEntry[],
|
|
29
37
|
): Promise<Record<string, string>> {
|
|
30
38
|
if (!headerConfigKeys) return {};
|
|
31
39
|
|
|
@@ -38,6 +46,7 @@ async function resolveHeaderConfigKeys(
|
|
|
38
46
|
|
|
39
47
|
const configs = await getResolvedConfig(context.agentId, context.repoId);
|
|
40
48
|
const configMap = new Map(configs.map((config) => [config.key, config.value]));
|
|
49
|
+
const secretKeys = new Set(configs.filter((config) => config.isSecret).map((c) => c.key));
|
|
41
50
|
const resolved: Record<string, string> = {};
|
|
42
51
|
|
|
43
52
|
if (Array.isArray(parsed)) {
|
|
@@ -46,6 +55,7 @@ async function resolveHeaderConfigKeys(
|
|
|
46
55
|
const value = configMap.get(item);
|
|
47
56
|
if (value === undefined) continue;
|
|
48
57
|
registerVolatileSecret(value, `mcp-header:${item}`);
|
|
58
|
+
if (secretKeys.has(item)) secrets.push({ value, name: `mcp-header:${item}` });
|
|
49
59
|
resolved[item] = value;
|
|
50
60
|
}
|
|
51
61
|
return resolved;
|
|
@@ -57,6 +67,7 @@ async function resolveHeaderConfigKeys(
|
|
|
57
67
|
const value = configMap.get(configKey);
|
|
58
68
|
if (value === undefined) continue;
|
|
59
69
|
registerVolatileSecret(value, `mcp-header:${configKey}`);
|
|
70
|
+
if (secretKeys.has(configKey)) secrets.push({ value, name: `mcp-header:${configKey}` });
|
|
60
71
|
resolved[headerName] = value;
|
|
61
72
|
}
|
|
62
73
|
return resolved;
|
|
@@ -65,10 +76,11 @@ async function resolveHeaderConfigKeys(
|
|
|
65
76
|
async function resolveMcpHeaders(
|
|
66
77
|
server: McpServer,
|
|
67
78
|
context: { agentId?: string; repoId?: string },
|
|
79
|
+
secrets: SecretEntry[],
|
|
68
80
|
): Promise<Record<string, string>> {
|
|
69
81
|
const headers = {
|
|
70
82
|
...parseHeadersJson(server.headers),
|
|
71
|
-
...(await resolveHeaderConfigKeys(server.headerConfigKeys, context)),
|
|
83
|
+
...(await resolveHeaderConfigKeys(server.headerConfigKeys, context, secrets)),
|
|
72
84
|
};
|
|
73
85
|
|
|
74
86
|
if (server.authMethod !== "oauth") return headers;
|
|
@@ -82,6 +94,7 @@ async function resolveMcpHeaders(
|
|
|
82
94
|
}
|
|
83
95
|
|
|
84
96
|
registerVolatileSecret(token.accessToken, `mcp-oauth:${server.id}`);
|
|
97
|
+
secrets.push({ value: token.accessToken, name: `mcp-oauth:${server.id}` });
|
|
85
98
|
const rawType = token.tokenType || "Bearer";
|
|
86
99
|
const prefix = rawType.toLowerCase() === "bearer" ? "Bearer" : rawType;
|
|
87
100
|
headers.Authorization = `${prefix} ${token.accessToken}`;
|
|
@@ -91,7 +104,7 @@ async function resolveMcpHeaders(
|
|
|
91
104
|
async function createMcpServerClient(
|
|
92
105
|
serverId: string,
|
|
93
106
|
context: { agentId?: string; repoId?: string; timeoutMs?: number } = {},
|
|
94
|
-
): Promise<McpHttpClient> {
|
|
107
|
+
): Promise<{ client: McpHttpClient; scrubber: ValueScrubber }> {
|
|
95
108
|
const server = await getMcpServerById(serverId);
|
|
96
109
|
if (!server) throw new Error("MCP server not found");
|
|
97
110
|
if (!server.isEnabled) throw new Error("MCP server is disabled");
|
|
@@ -115,17 +128,36 @@ async function createMcpServerClient(
|
|
|
115
128
|
fetch: createSsrfGuardedFetch(publicEndpointSsrfOptions()),
|
|
116
129
|
});
|
|
117
130
|
client.useRawUrl = true;
|
|
118
|
-
|
|
119
|
-
|
|
131
|
+
const secrets: SecretEntry[] = [];
|
|
132
|
+
client.customHeaders = await resolveMcpHeaders(server, context, secrets);
|
|
133
|
+
return { client, scrubber: createValueScrubber(secrets) };
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* The external server receives the resolved secret headers and may echo them.
|
|
138
|
+
* Redact those exact values (any length) from what it returns or throws. A result
|
|
139
|
+
* is otherwise returned as the tool produced it: a pattern scrub would damage
|
|
140
|
+
* legitimate data such as signed URLs or file contents. Errors also get the
|
|
141
|
+
* pattern scrub, because they are logged.
|
|
142
|
+
*/
|
|
143
|
+
async function withScrubbedResponse<T>(scrubber: ValueScrubber, run: () => Promise<T>): Promise<T> {
|
|
144
|
+
try {
|
|
145
|
+
return scrubber.object(await run());
|
|
146
|
+
} catch (err) {
|
|
147
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
148
|
+
throw new Error(scrubSecrets(scrubber.text(message)));
|
|
149
|
+
}
|
|
120
150
|
}
|
|
121
151
|
|
|
122
152
|
export async function listMcpServerTools(
|
|
123
153
|
serverId: string,
|
|
124
154
|
context: { agentId?: string; repoId?: string; timeoutMs?: number } = {},
|
|
125
155
|
): Promise<McpTool[]> {
|
|
126
|
-
const client = await createMcpServerClient(serverId, context);
|
|
127
|
-
|
|
128
|
-
|
|
156
|
+
const { client, scrubber } = await createMcpServerClient(serverId, context);
|
|
157
|
+
return withScrubbedResponse(scrubber, async () => {
|
|
158
|
+
await client.initialize();
|
|
159
|
+
return client.listTools();
|
|
160
|
+
});
|
|
129
161
|
}
|
|
130
162
|
|
|
131
163
|
export async function callMcpServerTool(
|
|
@@ -134,7 +166,9 @@ export async function callMcpServerTool(
|
|
|
134
166
|
args: Record<string, unknown>,
|
|
135
167
|
context: { agentId?: string; repoId?: string; timeoutMs?: number } = {},
|
|
136
168
|
): Promise<McpToolCallEnvelope> {
|
|
137
|
-
const client = await createMcpServerClient(serverId, context);
|
|
138
|
-
|
|
139
|
-
|
|
169
|
+
const { client, scrubber } = await createMcpServerClient(serverId, context);
|
|
170
|
+
return withScrubbedResponse(scrubber, async () => {
|
|
171
|
+
await client.initialize();
|
|
172
|
+
return client.callToolRaw(tool, args);
|
|
173
|
+
});
|
|
140
174
|
}
|
|
@@ -47,7 +47,12 @@
|
|
|
47
47
|
import { createHash } from "node:crypto";
|
|
48
48
|
import { getDbClient } from "@/be/db";
|
|
49
49
|
import { assertUrlSafe, publicEndpointSsrfOptions } from "@/oauth/mcp-wrapper";
|
|
50
|
-
import {
|
|
50
|
+
import {
|
|
51
|
+
embeddingEndpoint,
|
|
52
|
+
getEmbeddingProvider,
|
|
53
|
+
getMemoryStore,
|
|
54
|
+
setDeploymentEnvReader,
|
|
55
|
+
} from "./index";
|
|
51
56
|
import type { EmbeddingProvider } from "./types";
|
|
52
57
|
|
|
53
58
|
export const EMBEDDING_SPACE_KEY = "embedding-space";
|
|
@@ -92,29 +97,14 @@ export type EmbeddingSpaceOptions = {
|
|
|
92
97
|
afterBatch?: (info: { table: "memory" | "scripts"; ids: string[] }) => void | Promise<void>;
|
|
93
98
|
};
|
|
94
99
|
|
|
95
|
-
|
|
96
|
-
* Reads a key's deployment environment value, without stored config. Set by
|
|
97
|
-
* the HTTP server at boot (http/core owns the env injection). Unset, no URL
|
|
98
|
-
* counts as operator config, so every one gets the SSRF check.
|
|
99
|
-
*/
|
|
100
|
-
let readDeploymentEnv: (key: string) => string | undefined = () => undefined;
|
|
101
|
-
|
|
102
|
-
export function setDeploymentEnvReader(read: (key: string) => string | undefined): void {
|
|
103
|
-
readDeploymentEnv = read;
|
|
104
|
-
}
|
|
100
|
+
export { setDeploymentEnvReader };
|
|
105
101
|
|
|
106
102
|
/** Checks the URL the provider sends to, in the SDK's precedence order. */
|
|
107
103
|
function endpointAllowed(): boolean {
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
: process.env.OPENAI_BASE_URL
|
|
111
|
-
? "OPENAI_BASE_URL"
|
|
112
|
-
: null;
|
|
113
|
-
if (!key) return true;
|
|
114
|
-
const baseUrl = process.env[key] ?? "";
|
|
115
|
-
if (baseUrl === readDeploymentEnv(key)) return true;
|
|
104
|
+
const endpoint = embeddingEndpoint();
|
|
105
|
+
if (!endpoint || endpoint.fromDeployment) return true;
|
|
116
106
|
try {
|
|
117
|
-
assertUrlSafe(baseUrl, publicEndpointSsrfOptions());
|
|
107
|
+
assertUrlSafe(endpoint.baseUrl, publicEndpointSsrfOptions());
|
|
118
108
|
return true;
|
|
119
109
|
} catch {
|
|
120
110
|
return false;
|
package/src/be/memory/index.ts
CHANGED
|
@@ -32,3 +32,38 @@ export function getMemoryStore(): MemoryStore {
|
|
|
32
32
|
}
|
|
33
33
|
return memoryStore;
|
|
34
34
|
}
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Reads a key's deployment environment value, without stored config. Set by
|
|
38
|
+
* each server entry (HTTP and stdio) at boot (http/core owns the env injection). Unset, no URL
|
|
39
|
+
* counts as operator config, so every one gets the SSRF check.
|
|
40
|
+
*/
|
|
41
|
+
let readDeploymentEnv: (key: string) => string | undefined = () => undefined;
|
|
42
|
+
|
|
43
|
+
export function setDeploymentEnvReader(read: (key: string) => string | undefined): void {
|
|
44
|
+
readDeploymentEnv = read;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* The base URL the embedding client sends to, in the SDK's precedence order,
|
|
49
|
+
* and whether it is the deployment environment's own value. Null when neither
|
|
50
|
+
* key is set (the SDK default, OpenAI). A provider passes the
|
|
51
|
+
* EMBEDDING_API_BASE_URL value it captured (null for none), so the check covers
|
|
52
|
+
* the URL its client uses even when a config reload changed the env since.
|
|
53
|
+
*/
|
|
54
|
+
export function embeddingEndpoint(
|
|
55
|
+
embeddingBaseUrl: string | null = process.env.EMBEDDING_API_BASE_URL || null,
|
|
56
|
+
): { baseUrl: string; fromDeployment: boolean } | null {
|
|
57
|
+
if (embeddingBaseUrl) {
|
|
58
|
+
return {
|
|
59
|
+
baseUrl: embeddingBaseUrl,
|
|
60
|
+
fromDeployment: embeddingBaseUrl === readDeploymentEnv("EMBEDDING_API_BASE_URL"),
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
const openAiBaseUrl = process.env.OPENAI_BASE_URL;
|
|
64
|
+
if (!openAiBaseUrl) return null;
|
|
65
|
+
return {
|
|
66
|
+
baseUrl: openAiBaseUrl,
|
|
67
|
+
fromDeployment: openAiBaseUrl === readDeploymentEnv("OPENAI_BASE_URL"),
|
|
68
|
+
};
|
|
69
|
+
}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import OpenAI from "openai";
|
|
2
|
+
import { publicEndpointSsrfOptions } from "../../../oauth/mcp-wrapper";
|
|
2
3
|
import { selectCredential } from "../../../utils/credentials";
|
|
4
|
+
import { createSsrfGuardedFetch } from "../../../utils/egress-guard";
|
|
3
5
|
import { getOpenRouterAttributionHeaders } from "../../../utils/openrouter-base-url";
|
|
4
6
|
import { DEFAULT_EMBEDDING_MODEL, EMBEDDING_DIMENSIONS } from "../constants";
|
|
5
7
|
import { noteEmbeddingFailure, noteEmbeddingSuccess } from "../embedding-recovery";
|
|
8
|
+
import { embeddingEndpoint } from "../index";
|
|
6
9
|
import type { EmbeddingInputKind, EmbeddingProvider, EmbeddingSpace, EmbedOptions } from "../types";
|
|
7
10
|
|
|
8
11
|
// text-embedding-3-* reject any input over 8,192 tokens with a 400, and one
|
|
@@ -140,11 +143,18 @@ export class OpenAIEmbeddingProvider implements EmbeddingProvider {
|
|
|
140
143
|
if (!this.apiKey) return null;
|
|
141
144
|
if (!this.client) {
|
|
142
145
|
const baseURL = this.baseURL;
|
|
146
|
+
// A base URL stored through config must reach a public address. The
|
|
147
|
+
// deployment environment's own value may be private (bundled TEI).
|
|
148
|
+
const endpoint = embeddingEndpoint(baseURL ?? null);
|
|
143
149
|
this.client = new OpenAI({
|
|
144
150
|
baseURL,
|
|
145
151
|
apiKey: this.apiKey,
|
|
146
152
|
// Only an openrouter.ai base URL gets attribution; OpenAI and gateways get none.
|
|
147
153
|
defaultHeaders: getOpenRouterAttributionHeaders(baseURL ?? ""),
|
|
154
|
+
fetch:
|
|
155
|
+
endpoint && !endpoint.fromDeployment
|
|
156
|
+
? createSsrfGuardedFetch(publicEndpointSsrfOptions())
|
|
157
|
+
: undefined,
|
|
148
158
|
});
|
|
149
159
|
}
|
|
150
160
|
return this.client;
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
-- Adds a JSON-in-TEXT `avatar` column to `users`, the same shape as
|
|
2
|
+
-- `agents.avatar` (migration 119): a lucide glyph, an https image link, or an
|
|
3
|
+
-- agent-fs image. NULL means "no custom avatar"; the UI falls back to initials.
|
|
4
|
+
ALTER TABLE users ADD COLUMN avatar TEXT;
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
-- Why a task reached its terminal status (e.g. failed + agent vs failed + error).
|
|
2
|
+
-- Refines `status` and never replaces it. NULL means unknown: rows finished
|
|
3
|
+
-- before this column existed are not backfilled. No CHECK constraint: the
|
|
4
|
+
-- valid kinds per status live in TASK_STATUS_KINDS (src/types.ts), so a new
|
|
5
|
+
-- kind needs no migration.
|
|
6
|
+
ALTER TABLE agent_tasks ADD COLUMN statusKind TEXT;
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
-- The wake-up ceiling `defer-task` booked (its schedule's nextRunAt, which the
|
|
2
|
+
-- scheduler clears once it fires), kept on the task so renderers can show
|
|
3
|
+
-- "resumes 04:00" in their own timezone. NULL on rows deferred before this.
|
|
4
|
+
ALTER TABLE agent_tasks ADD COLUMN deferredUntil TEXT;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
ALTER TABLE session_tokens ADD COLUMN objectChain TEXT;
|
|
2
|
+
ALTER TABLE session_tokens ADD COLUMN depth INTEGER NOT NULL DEFAULT 0;
|
|
3
|
+
|
|
4
|
+
ALTER TABLE script_runs ADD COLUMN objectScriptId TEXT;
|
|
5
|
+
ALTER TABLE script_runs ADD COLUMN objectId TEXT;
|
|
6
|
+
ALTER TABLE script_runs ADD COLUMN objectMethod TEXT;
|
|
7
|
+
|
|
8
|
+
CREATE INDEX IF NOT EXISTS idx_script_runs_object
|
|
9
|
+
ON script_runs(objectScriptId, objectId) WHERE objectId IS NOT NULL;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
-- A Lead follow-up outcome card can merge into the previous card of the same
|
|
2
|
+
-- agent in the thread: the renderer edits that card (the "host") and adds the
|
|
3
|
+
-- follow-up's answer under it, so the thread gets one message, not two.
|
|
4
|
+
--
|
|
5
|
+
-- The follow-up keeps its own outcome row, so every per-task check (settled,
|
|
6
|
+
-- relay delivered, thread closure) works without change. That row has no
|
|
7
|
+
-- Slack message of its own: its ts is the placeholder "merged:<id>" (the
|
|
8
|
+
-- (channel_id, ts) index stays unique), its permalink is the host's, and this
|
|
9
|
+
-- column points at the host row.
|
|
10
|
+
ALTER TABLE slack_messages ADD COLUMN merged_into_id TEXT
|
|
11
|
+
REFERENCES slack_messages(id) ON DELETE SET NULL;
|
|
12
|
+
|
|
13
|
+
CREATE INDEX idx_slack_messages_merged_into
|
|
14
|
+
ON slack_messages(merged_into_id) WHERE merged_into_id IS NOT NULL;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
-- Idempotency-Key records for POST /api/tasks.
|
|
2
|
+
--
|
|
3
|
+
-- One row is one task the server created under a client key. It commits in the
|
|
4
|
+
-- same transaction as the task, so a retry after a lost response finds it and
|
|
5
|
+
-- gets that task back instead of creating a second one (the Sessions composer
|
|
6
|
+
-- retries a failed follow-up with the key it first sent).
|
|
7
|
+
--
|
|
8
|
+
-- The scope is (principal, keyHash): the caller's stable identity (never the
|
|
9
|
+
-- bearer value) and a SHA-256 of the client key. requestFingerprint is a
|
|
10
|
+
-- SHA-256 of the canonical request; a different request under the same key is
|
|
11
|
+
-- a conflict. A replay answers with the task as it is now, read by taskId.
|
|
12
|
+
--
|
|
13
|
+
-- No FK to agent_tasks: a row outlives a deleted task, and the key stays taken.
|
|
14
|
+
|
|
15
|
+
CREATE TABLE IF NOT EXISTS task_idempotency_keys (
|
|
16
|
+
id TEXT PRIMARY KEY,
|
|
17
|
+
principal TEXT NOT NULL,
|
|
18
|
+
keyHash TEXT NOT NULL,
|
|
19
|
+
requestFingerprint TEXT NOT NULL,
|
|
20
|
+
taskId TEXT NOT NULL,
|
|
21
|
+
createdAt TEXT NOT NULL,
|
|
22
|
+
created_by TEXT,
|
|
23
|
+
updated_by TEXT
|
|
24
|
+
);
|
|
25
|
+
|
|
26
|
+
CREATE UNIQUE INDEX IF NOT EXISTS idx_task_idempotency_keys_scope
|
|
27
|
+
ON task_idempotency_keys(principal, keyHash);
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
-- Apps list: an app can be starred (`app`, item id = the app id), like pages,
|
|
2
|
+
-- workflows and schedules. SQLite cannot change a CHECK in place, so rebuild
|
|
3
|
+
-- the table with the 337 shape plus the new item type. Every row is copied unchanged.
|
|
4
|
+
PRAGMA defer_foreign_keys = ON;
|
|
5
|
+
|
|
6
|
+
CREATE TABLE user_favorites_new (
|
|
7
|
+
id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))),
|
|
8
|
+
favoriteScope TEXT NOT NULL,
|
|
9
|
+
userId TEXT REFERENCES users(id) ON DELETE CASCADE,
|
|
10
|
+
itemType TEXT NOT NULL CHECK (itemType IN ('page','workflow','schedule','agent-fs-path','key','session','hidden-key','app')),
|
|
11
|
+
itemId TEXT NOT NULL,
|
|
12
|
+
createdAt TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
13
|
+
lastUpdatedAt TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
14
|
+
created_by TEXT,
|
|
15
|
+
updated_by TEXT,
|
|
16
|
+
UNIQUE (favoriteScope, itemType, itemId)
|
|
17
|
+
);
|
|
18
|
+
|
|
19
|
+
INSERT INTO user_favorites_new (
|
|
20
|
+
id, favoriteScope, userId, itemType, itemId,
|
|
21
|
+
createdAt, lastUpdatedAt, created_by, updated_by
|
|
22
|
+
)
|
|
23
|
+
SELECT
|
|
24
|
+
id, favoriteScope, userId, itemType, itemId,
|
|
25
|
+
createdAt, lastUpdatedAt, created_by, updated_by
|
|
26
|
+
FROM user_favorites;
|
|
27
|
+
|
|
28
|
+
DROP TABLE user_favorites;
|
|
29
|
+
ALTER TABLE user_favorites_new RENAME TO user_favorites;
|
|
30
|
+
|
|
31
|
+
CREATE INDEX idx_user_favorites_scope_type
|
|
32
|
+
ON user_favorites(favoriteScope, itemType);
|
|
33
|
+
CREATE INDEX idx_user_favorites_user_type
|
|
34
|
+
ON user_favorites(userId, itemType);
|
|
35
|
+
CREATE INDEX idx_user_favorites_item
|
|
36
|
+
ON user_favorites(itemType, itemId);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FilesError } from "@/fs/provider";
|
|
2
|
-
import {
|
|
2
|
+
import { buildAgentFsFileLink } from "@/utils/constants";
|
|
3
3
|
import { agentFsClientFor } from "../agent-fs-identity";
|
|
4
4
|
import { getDbClient, getSwarmConfigs } from "../db";
|
|
5
5
|
import { parseScene } from "./boards/elements";
|
|
@@ -73,7 +73,7 @@ async function open(id: string) {
|
|
|
73
73
|
return { row, owner: row.ownerAgentId, provider: client.provider, scope };
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
const withLink = (row: Row): PrimitiveObject => ({ ...row, link:
|
|
76
|
+
const withLink = (row: Row): PrimitiveObject => ({ ...row, link: buildAgentFsFileLink(row) });
|
|
77
77
|
|
|
78
78
|
/** agent-fs keeps this drive's rows fresh through `file.changed` (object-webhooks.ts). */
|
|
79
79
|
async function driveWatched(orgId: string, driveId: string): Promise<boolean> {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type FileScope, FilesError, normalizeStoredKey } from "@/fs/provider";
|
|
2
|
-
import {
|
|
2
|
+
import { buildAgentFsFileLink } from "@/utils/constants";
|
|
3
3
|
import { scrubSecrets } from "@/utils/secret-scrubber";
|
|
4
4
|
import { agentFsClientFor } from "../agent-fs-identity";
|
|
5
5
|
import { getDbClient } from "../db";
|
|
@@ -107,7 +107,7 @@ const REINDEX_LIMITS: ReindexLimits = {
|
|
|
107
107
|
// shortcut: in-process only; two API replicas can still reindex one drive at once (each pass is safe, just duplicated work).
|
|
108
108
|
const reindexing = new Set<string>();
|
|
109
109
|
|
|
110
|
-
const withLink = (row: ObjectRow): PrimitiveObject => ({ ...row, link:
|
|
110
|
+
const withLink = (row: ObjectRow): PrimitiveObject => ({ ...row, link: buildAgentFsFileLink(row) });
|
|
111
111
|
|
|
112
112
|
export async function clientFor(agentId: string | undefined) {
|
|
113
113
|
const client = agentId ? await agentFsClientFor(agentId) : undefined;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { can } from "@/rbac";
|
|
1
2
|
import type { SwarmRepo } from "@/types";
|
|
2
|
-
import {
|
|
3
|
+
import type { HttpRequestAuth } from "@/utils/request-auth-context";
|
|
4
|
+
import { getAgentById, getDbClient, getSwarmRepoById, updateSwarmRepo } from "./db";
|
|
3
5
|
import { changesMergePolicy } from "./repo-merge-policy";
|
|
4
6
|
|
|
5
7
|
export type CheckedRepoUpdate<Refusal> =
|
|
@@ -7,28 +9,79 @@ export type CheckedRepoUpdate<Refusal> =
|
|
|
7
9
|
| { kind: "not-found" }
|
|
8
10
|
| { kind: "refused"; refusal: Refusal };
|
|
9
11
|
|
|
12
|
+
type RepoUpdates = Parameters<typeof updateSwarmRepo>[1];
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* True when `updates` changes the fields a worker acts on before any model step: the `url` it
|
|
16
|
+
* clones, the `clonePath` it clones into, or whether it runs the hook install there. A resend of
|
|
17
|
+
* the stored value is not a change.
|
|
18
|
+
*/
|
|
19
|
+
function changesExecConfig(existing: SwarmRepo, updates: RepoUpdates): boolean {
|
|
20
|
+
return (
|
|
21
|
+
(updates.url !== undefined && updates.url !== existing.url) ||
|
|
22
|
+
(updates.clonePath !== undefined && updates.clonePath !== existing.clonePath) ||
|
|
23
|
+
(updates.hooks !== undefined &&
|
|
24
|
+
(updates.hooks?.enabled === true) !== (existing.hooks?.enabled === true))
|
|
25
|
+
);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* The refusal text when the request authenticated with an agent session token (task, runtime or
|
|
30
|
+
* agent-bound) whose agent may not do `repo.exec-config.write`, else null. The shared API key,
|
|
31
|
+
* user tokens and dashboard sessions are not checked here, so a worker on the shared key behaves
|
|
32
|
+
* as before.
|
|
33
|
+
*/
|
|
34
|
+
export async function execConfigRefusal(
|
|
35
|
+
auth: HttpRequestAuth | null,
|
|
36
|
+
source: "http" | "mcp",
|
|
37
|
+
): Promise<string | null> {
|
|
38
|
+
// A page session carries its viewer's identity, but the page's code is agent-authored and
|
|
39
|
+
// the page proxy forwards any /api/* route (same rule as human-only config keys).
|
|
40
|
+
if (auth?.page) {
|
|
41
|
+
return "Forbidden: a page session cannot change a repo's url, clonePath or hooks.";
|
|
42
|
+
}
|
|
43
|
+
if (auth?.kind !== "agent") return null;
|
|
44
|
+
const agent = await getAgentById(auth.agentId);
|
|
45
|
+
const decision = can({
|
|
46
|
+
principal: { kind: "agent", agentId: auth.agentId, isLead: agent?.isLead === true },
|
|
47
|
+
verb: "repo.exec-config.write",
|
|
48
|
+
resource: { kind: "none" },
|
|
49
|
+
source,
|
|
50
|
+
});
|
|
51
|
+
if (decision.allow) return null;
|
|
52
|
+
return `Forbidden: ${decision.reason}. Only the lead, the operator or a user can change a repo's url, clonePath or hooks.`;
|
|
53
|
+
}
|
|
54
|
+
|
|
10
55
|
/**
|
|
11
56
|
* Applies a repo update whose merge-policy change (`allowMerge` or `mergePolicy`) the caller must be authorized for. The
|
|
12
57
|
* guidelines `authorize` compares against, the decision and the write share one BEGIN IMMEDIATE
|
|
13
58
|
* transaction, so a stale edit cannot overwrite a merge-policy change that committed after the
|
|
14
59
|
* caller's read: the later writer waits, then decides against the committed value.
|
|
15
60
|
*
|
|
16
|
-
* `authorize` runs only when the update changes the merge policy.
|
|
17
|
-
*
|
|
61
|
+
* `authorize` runs only when the update changes the merge policy. `authorizeExecConfig` runs only
|
|
62
|
+
* when the update changes `url`, `clonePath` or `hooks`. Each returns a refusal to stop the
|
|
63
|
+
* update, or null to allow it. They run inside the transaction: read only what they need through
|
|
18
64
|
* the usual helpers (they join the transaction) and do no slow I/O.
|
|
19
65
|
*/
|
|
20
66
|
export async function updateSwarmRepoChecked<Refusal>(
|
|
21
67
|
id: string,
|
|
22
|
-
updates:
|
|
68
|
+
updates: RepoUpdates,
|
|
23
69
|
authorize: (existing: SwarmRepo) => Promise<Refusal | null> | Refusal | null,
|
|
70
|
+
authorizeExecConfig: (existing: SwarmRepo) => Promise<Refusal | null> | Refusal | null,
|
|
24
71
|
): Promise<CheckedRepoUpdate<Refusal>> {
|
|
25
72
|
return await getDbClient().transaction(async (): Promise<CheckedRepoUpdate<Refusal>> => {
|
|
26
|
-
|
|
73
|
+
const touchesExecConfig =
|
|
74
|
+
updates.url !== undefined || updates.clonePath !== undefined || updates.hooks !== undefined;
|
|
75
|
+
if (updates.guidelines !== undefined || touchesExecConfig) {
|
|
27
76
|
const existing = await getSwarmRepoById(id);
|
|
28
77
|
if (existing && changesMergePolicy(existing.guidelines, updates.guidelines)) {
|
|
29
78
|
const refusal = await authorize(existing);
|
|
30
79
|
if (refusal !== null) return { kind: "refused", refusal };
|
|
31
80
|
}
|
|
81
|
+
if (existing && changesExecConfig(existing, updates)) {
|
|
82
|
+
const refusal = await authorizeExecConfig(existing);
|
|
83
|
+
if (refusal !== null) return { kind: "refused", refusal };
|
|
84
|
+
}
|
|
32
85
|
}
|
|
33
86
|
|
|
34
87
|
const repo = await updateSwarmRepo(id, updates);
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { isValidTimezone } from "../utils/deferral-time";
|
|
2
|
+
import { getUserById } from "./db";
|
|
3
|
+
|
|
4
|
+
/** Resolve the requester's clock at render time so profile edits apply to existing tasks. */
|
|
5
|
+
export async function resolveRequesterTimezone(requestedByUserId?: string, fallback?: string) {
|
|
6
|
+
const user = requestedByUserId ? await getUserById(requestedByUserId) : null;
|
|
7
|
+
const timezone = user?.timezone;
|
|
8
|
+
if (isValidTimezone(timezone)) return { tz: timezone, isFallback: false };
|
|
9
|
+
return { tz: isValidTimezone(fallback) ? fallback : "UTC", isFallback: true };
|
|
10
|
+
}
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
type CredentialBinding,
|
|
15
15
|
placeholderForConfigKey,
|
|
16
16
|
} from "@/scripts-runtime/credential-broker";
|
|
17
|
+
import { createSsrfGuardedFetch } from "@/utils/egress-guard";
|
|
17
18
|
import { refreshSecretScrubberCache } from "@/utils/secret-scrubber";
|
|
18
19
|
import { listMcpServerTools } from "./mcp-proxy";
|
|
19
20
|
import { assertPostgresDsn } from "./sql-connections";
|
|
@@ -1510,7 +1511,10 @@ export async function fetchOpenapiSpec(
|
|
|
1510
1511
|
Accept: "application/json, application/yaml;q=0.9, text/yaml;q=0.8, */*;q=0.5",
|
|
1511
1512
|
});
|
|
1512
1513
|
if (opts.etag) headers.set("If-None-Match", opts.etag);
|
|
1513
|
-
|
|
1514
|
+
// Guarded: each hop resolves the name and connects only to a checked address.
|
|
1515
|
+
const fetchImpl =
|
|
1516
|
+
openapiSpecFetchForTesting ??
|
|
1517
|
+
createSsrfGuardedFetch(openapiSpecUrlOptions(), Bun.fetch as typeof fetch);
|
|
1514
1518
|
let response: Response | null = null;
|
|
1515
1519
|
for (let hop = 0; hop <= 5; hop += 1) {
|
|
1516
1520
|
response = await fetchImpl(parsed, {
|
|
@@ -14,7 +14,34 @@ import { resolveAgentFsIdentity } from "./agent-fs-identity";
|
|
|
14
14
|
import { getResolvedConfig } from "./db";
|
|
15
15
|
import { resolveOAuthBindingToken } from "./oauth-credential-bindings";
|
|
16
16
|
import { listRelationalCredentialBindings } from "./script-connections";
|
|
17
|
-
import { isApiOnlyConfigKey, isInternalConfigKey } from "./swarm-config-guard";
|
|
17
|
+
import { isApiOnlyConfigKey, isInternalConfigKey, isReservedConfigKey } from "./swarm-config-guard";
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Binding keys that may also resolve from the API process env when no config
|
|
21
|
+
* row holds them. Only the documented default GitHub binding. Every other
|
|
22
|
+
* binding resolves from swarm_config rows alone.
|
|
23
|
+
*/
|
|
24
|
+
const ENV_FALLBACK_CONFIG_KEYS = new Set(["GITHUB_TOKEN"]);
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* The value a config binding substitutes. Reserved, API-only and internal keys
|
|
28
|
+
* never resolve, from config or from the env.
|
|
29
|
+
*/
|
|
30
|
+
function resolveBindingConfigValue(
|
|
31
|
+
configMap: Map<string, string>,
|
|
32
|
+
configKey: string,
|
|
33
|
+
): string | undefined {
|
|
34
|
+
if (
|
|
35
|
+
isReservedConfigKey(configKey) ||
|
|
36
|
+
isApiOnlyConfigKey(configKey) ||
|
|
37
|
+
isInternalConfigKey(configKey)
|
|
38
|
+
) {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
const value = configMap.get(configKey);
|
|
42
|
+
if (value !== undefined) return value;
|
|
43
|
+
return ENV_FALLBACK_CONFIG_KEYS.has(configKey) ? process.env[configKey] : undefined;
|
|
44
|
+
}
|
|
18
45
|
|
|
19
46
|
// Relational-only credential binding store. The legacy SCRIPT_CREDENTIAL_BINDINGS
|
|
20
47
|
// swarm-config JSON blob is retired (migrated to relational rows at boot), so
|
|
@@ -103,7 +130,7 @@ export async function buildScriptCredentialBindingsWithFailures(input: {
|
|
|
103
130
|
const configMap = new Map(resolvedConfigs.map((config) => [config.key, config.value]));
|
|
104
131
|
const broker = new CredentialBroker(
|
|
105
132
|
new RelationalCredentialBindingStore(),
|
|
106
|
-
(configKey) => configMap
|
|
133
|
+
(configKey) => resolveBindingConfigValue(configMap, configKey),
|
|
107
134
|
defaultCredentialBindings(),
|
|
108
135
|
(oauthAuthorizationId) => resolveOAuthBindingToken(oauthAuthorizationId),
|
|
109
136
|
);
|