@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/api-keys.ts
CHANGED
|
@@ -25,6 +25,7 @@ import {
|
|
|
25
25
|
MAX_SPEND_CAP_HOLD_MS,
|
|
26
26
|
type RateLimitWindowTelemetry,
|
|
27
27
|
} from "../utils/error-tracker";
|
|
28
|
+
import { CREDENTIAL_SELECTION_STRATEGIES, credentialSelectionStrategy } from "../utils/key-usage";
|
|
28
29
|
import {
|
|
29
30
|
activeModelBlocks,
|
|
30
31
|
isModelScopedWindow,
|
|
@@ -422,6 +423,27 @@ const getAvailable = route({
|
|
|
422
423
|
* `authFence` on `clear-rate-limit`: failures recorded after it survive the clear.
|
|
423
424
|
*/
|
|
424
425
|
authFailureFence: z.number().int(),
|
|
426
|
+
/**
|
|
427
|
+
* Usage per pool position: max utilization (fraction, can exceed 1) of the key's
|
|
428
|
+
* live `five_hour` and `seven_day` windows; 0 when unobserved or reset. Under the
|
|
429
|
+
* `usage` strategy the worker picks the lowest among `availableIndices`.
|
|
430
|
+
*/
|
|
431
|
+
keyUsage: z.array(z.number()),
|
|
432
|
+
/**
|
|
433
|
+
* Pace delta per pool position: used minus the elapsed share of the window, the max
|
|
434
|
+
* over the live `five_hour`, `seven_day` and (with `model`) that family's weekly
|
|
435
|
+
* window; 0 when none is live. Under the `pace` strategy the worker picks the lowest
|
|
436
|
+
* (most under even use) among `availableIndices`. It never excludes a key.
|
|
437
|
+
*/
|
|
438
|
+
keyPace: z.array(z.number()),
|
|
439
|
+
/** How the worker ranks keys: `CREDENTIAL_SELECTION_STRATEGY` (default `usage`). */
|
|
440
|
+
selectionStrategy: z.enum(CREDENTIAL_SELECTION_STRATEGIES),
|
|
441
|
+
/**
|
|
442
|
+
* Running sessions per pool position: `in_progress` tasks whose credential is this
|
|
443
|
+
* key type and the position's key suffix. The worker picks the fewest among the
|
|
444
|
+
* keys within 0.10 of the lowest ranking score. It never excludes a key.
|
|
445
|
+
*/
|
|
446
|
+
activeSessions: z.array(z.number().int().min(0)),
|
|
425
447
|
}),
|
|
426
448
|
},
|
|
427
449
|
400: { description: "Validation error" },
|
|
@@ -912,6 +934,10 @@ export async function handleApiKeys(
|
|
|
912
934
|
spendCappedIndices: result.spendCappedIndices,
|
|
913
935
|
totalKeys,
|
|
914
936
|
authFailureFence: result.authFailureFence,
|
|
937
|
+
keyUsage: result.keyUsage,
|
|
938
|
+
keyPace: result.keyPace,
|
|
939
|
+
selectionStrategy: credentialSelectionStrategy(process.env.CREDENTIAL_SELECTION_STRATEGY),
|
|
940
|
+
activeSessions: result.activeSessions,
|
|
915
941
|
...(model !== undefined
|
|
916
942
|
? {
|
|
917
943
|
modelBlockedIndices: result.modelBlockedIndices,
|
package/src/http/apps.ts
CHANGED
|
@@ -38,6 +38,7 @@ import {
|
|
|
38
38
|
migrateAppSchema,
|
|
39
39
|
withAppDefinitionLock,
|
|
40
40
|
} from "../apps/schema-migrate";
|
|
41
|
+
import { appWriteTypesWarnings } from "../apps/script-types";
|
|
41
42
|
import {
|
|
42
43
|
appDefinitionNeedsRepair,
|
|
43
44
|
createApp,
|
|
@@ -62,7 +63,13 @@ import {
|
|
|
62
63
|
rollbackApp,
|
|
63
64
|
snapshotApp,
|
|
64
65
|
} from "../apps/version";
|
|
65
|
-
import {
|
|
66
|
+
import {
|
|
67
|
+
getAgentById,
|
|
68
|
+
getAppVersion,
|
|
69
|
+
getAppVersions,
|
|
70
|
+
getTaskById,
|
|
71
|
+
withFavoriteFlags,
|
|
72
|
+
} from "../be/db";
|
|
66
73
|
import type { RbacResource } from "../rbac";
|
|
67
74
|
import { can } from "../rbac";
|
|
68
75
|
import { APP_SESSION_KEY_PATTERN, appSessionContextKey } from "../tasks/context-key";
|
|
@@ -145,6 +152,8 @@ const AppSummarySchema = z.object({
|
|
|
145
152
|
icon: AppIconSchema.optional(),
|
|
146
153
|
createdAt: z.string(),
|
|
147
154
|
updatedAt: z.string(),
|
|
155
|
+
/** Whether the caller starred the app (an `app` favorite). */
|
|
156
|
+
favorite: z.boolean(),
|
|
148
157
|
});
|
|
149
158
|
|
|
150
159
|
/**
|
|
@@ -234,7 +243,9 @@ const AppUserConfigSchema = z.record(AppNameSchema, AppUserConfigFieldSchema);
|
|
|
234
243
|
const compatWarningsSchema = z
|
|
235
244
|
.array(z.string())
|
|
236
245
|
.optional()
|
|
237
|
-
.describe(
|
|
246
|
+
.describe(
|
|
247
|
+
"Advisory findings: quickjs-executor compatibility of the app's scripts, and whether the app lost its generated script types to the type budget.",
|
|
248
|
+
);
|
|
238
249
|
const appWriteResponseSchema = z.object({
|
|
239
250
|
app: AppRecordSchema,
|
|
240
251
|
migration: AppMigrationReportSchema,
|
|
@@ -1000,19 +1011,12 @@ function filtersFromQuery(
|
|
|
1000
1011
|
return { filters, issues };
|
|
1001
1012
|
}
|
|
1002
1013
|
|
|
1003
|
-
function compareValues(
|
|
1004
|
-
left: unknown,
|
|
1005
|
-
right: unknown,
|
|
1006
|
-
direction: "asc" | "desc",
|
|
1007
|
-
dateValues = false,
|
|
1008
|
-
): number {
|
|
1014
|
+
function compareValues(left: unknown, right: unknown, direction: "asc" | "desc"): number {
|
|
1009
1015
|
if (left === right) return 0;
|
|
1010
1016
|
if (left === undefined || left === null) return 1;
|
|
1011
1017
|
if (right === undefined || right === null) return -1;
|
|
1012
1018
|
let result: number;
|
|
1013
|
-
if (
|
|
1014
|
-
result = Date.parse(left) - Date.parse(right);
|
|
1015
|
-
} else if (typeof left === "number" && typeof right === "number") {
|
|
1019
|
+
if (typeof left === "number" && typeof right === "number") {
|
|
1016
1020
|
result = left - right;
|
|
1017
1021
|
} else if (typeof left === "boolean" && typeof right === "boolean") {
|
|
1018
1022
|
result = Number(left) - Number(right);
|
|
@@ -1026,6 +1030,30 @@ function rowValue(row: AppRow, column: string): unknown {
|
|
|
1026
1030
|
return Object.hasOwn(row, column) ? row[column] : undefined;
|
|
1027
1031
|
}
|
|
1028
1032
|
|
|
1033
|
+
// Sorts like compareValues but parses each date string once, not twice per
|
|
1034
|
+
// comparison: Date.parse inside the comparator froze the event loop for seconds
|
|
1035
|
+
// on large tables. Order is identical (nulls last, NaN compares as a tie).
|
|
1036
|
+
export function sortRowsByColumn(
|
|
1037
|
+
rows: AppRow[],
|
|
1038
|
+
column: string,
|
|
1039
|
+
dir: "asc" | "desc",
|
|
1040
|
+
dateValues: boolean,
|
|
1041
|
+
): AppRow[] {
|
|
1042
|
+
const keyed = rows.map((row) => {
|
|
1043
|
+
const value = rowValue(row, column);
|
|
1044
|
+
return { row, value, ts: dateValues && typeof value === "string" ? Date.parse(value) : 0 };
|
|
1045
|
+
});
|
|
1046
|
+
keyed.sort((a, b) => {
|
|
1047
|
+
if (dateValues && typeof a.value === "string" && typeof b.value === "string") {
|
|
1048
|
+
if (a.value === b.value) return 0;
|
|
1049
|
+
const result = a.ts - b.ts;
|
|
1050
|
+
return dir === "asc" ? result : -result;
|
|
1051
|
+
}
|
|
1052
|
+
return compareValues(a.value, b.value, dir);
|
|
1053
|
+
});
|
|
1054
|
+
return keyed.map((k) => k.row);
|
|
1055
|
+
}
|
|
1056
|
+
|
|
1029
1057
|
export function rowMatchesFilters(row: AppRow, filters: RowFilter[]): boolean {
|
|
1030
1058
|
return filters.every((filter) => rowValue(row, filter.column) === filter.value);
|
|
1031
1059
|
}
|
|
@@ -1043,17 +1071,13 @@ export function applyQuery(
|
|
|
1043
1071
|
);
|
|
1044
1072
|
const sort = query.sort;
|
|
1045
1073
|
if (sort) {
|
|
1046
|
-
selected =
|
|
1047
|
-
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
model.columns[sort.column]!.kind === "date"),
|
|
1054
|
-
);
|
|
1055
|
-
return result;
|
|
1056
|
-
});
|
|
1074
|
+
selected = sortRowsByColumn(
|
|
1075
|
+
selected,
|
|
1076
|
+
sort.column,
|
|
1077
|
+
sort.dir,
|
|
1078
|
+
SORTABLE_SYSTEM_DATE_COLUMNS.has(sort.column) ||
|
|
1079
|
+
(Object.hasOwn(model.columns, sort.column) && model.columns[sort.column]!.kind === "date"),
|
|
1080
|
+
);
|
|
1057
1081
|
}
|
|
1058
1082
|
return selected.slice(0, query.limit ?? 200);
|
|
1059
1083
|
}
|
|
@@ -1077,7 +1101,7 @@ export async function selectAppRows(
|
|
|
1077
1101
|
if (jsonFilterIssues.length > 0) throw new AppRowValidationError(jsonFilterIssues);
|
|
1078
1102
|
|
|
1079
1103
|
// SQL narrows the scan; the `===` re-check keeps the exact filter semantics.
|
|
1080
|
-
|
|
1104
|
+
let rows = (
|
|
1081
1105
|
await listAppRows(
|
|
1082
1106
|
appId,
|
|
1083
1107
|
modelName,
|
|
@@ -1088,6 +1112,7 @@ export async function selectAppRows(
|
|
|
1088
1112
|
? [{ column: filter.column, value: filter.value }]
|
|
1089
1113
|
: [],
|
|
1090
1114
|
),
|
|
1115
|
+
model.columns,
|
|
1091
1116
|
)
|
|
1092
1117
|
).filter((row) => rowMatchesFilters(row, filters));
|
|
1093
1118
|
|
|
@@ -1108,16 +1133,13 @@ export async function selectAppRows(
|
|
|
1108
1133
|
if (model.columns[column]?.kind === "json") {
|
|
1109
1134
|
throw new AppRowValidationError([{ path: "sort", message: "json columns cannot be sorted" }]);
|
|
1110
1135
|
}
|
|
1111
|
-
rows
|
|
1112
|
-
|
|
1113
|
-
|
|
1114
|
-
|
|
1115
|
-
|
|
1116
|
-
|
|
1117
|
-
|
|
1118
|
-
);
|
|
1119
|
-
return result;
|
|
1120
|
-
});
|
|
1136
|
+
rows = sortRowsByColumn(
|
|
1137
|
+
rows,
|
|
1138
|
+
column,
|
|
1139
|
+
dir,
|
|
1140
|
+
SORTABLE_SYSTEM_DATE_COLUMNS.has(column) ||
|
|
1141
|
+
(Object.hasOwn(model.columns, column) && model.columns[column]!.kind === "date"),
|
|
1142
|
+
);
|
|
1121
1143
|
}
|
|
1122
1144
|
const total = rows.length;
|
|
1123
1145
|
return { rows: rows.slice(0, limit), total };
|
|
@@ -1153,13 +1175,17 @@ export async function handleApps(
|
|
|
1153
1175
|
invalidDefinition(res, definition.issues);
|
|
1154
1176
|
return true;
|
|
1155
1177
|
}
|
|
1156
|
-
const
|
|
1178
|
+
const app = await createApp({
|
|
1179
|
+
name: parsed.body.name,
|
|
1180
|
+
description: parsed.body.description,
|
|
1181
|
+
definition: definition.definition,
|
|
1182
|
+
});
|
|
1183
|
+
const warnings = [
|
|
1184
|
+
...(await scriptCompatWarnings(definition.definition)),
|
|
1185
|
+
...(await appWriteTypesWarnings(app.id)),
|
|
1186
|
+
];
|
|
1157
1187
|
createAppRoute.respond(res, 201, {
|
|
1158
|
-
app
|
|
1159
|
-
name: parsed.body.name,
|
|
1160
|
-
description: parsed.body.description,
|
|
1161
|
-
definition: definition.definition,
|
|
1162
|
-
}),
|
|
1188
|
+
app,
|
|
1163
1189
|
...(warnings.length > 0 ? { warnings } : {}),
|
|
1164
1190
|
});
|
|
1165
1191
|
return true;
|
|
@@ -1168,8 +1194,12 @@ export async function handleApps(
|
|
|
1168
1194
|
if (listAppsRoute.match(req.method, pathSegments)) {
|
|
1169
1195
|
const parsed = await listAppsRoute.parse(req, res, pathSegments, queryParams);
|
|
1170
1196
|
if (!parsed) return true;
|
|
1197
|
+
const favoriteScope = (await resolveHttpFavoriteOwner(req, myAgentId))?.scope;
|
|
1171
1198
|
listAppsRoute.respond(res, 200, {
|
|
1172
|
-
apps: await
|
|
1199
|
+
apps: await withFavoriteFlags(
|
|
1200
|
+
await listApps({ q: parsed.query.q, limit: parsed.query.limit }),
|
|
1201
|
+
{ favoriteScope, itemType: "app" },
|
|
1202
|
+
),
|
|
1173
1203
|
});
|
|
1174
1204
|
return true;
|
|
1175
1205
|
}
|
|
@@ -1619,7 +1649,12 @@ export async function handleApps(
|
|
|
1619
1649
|
return true;
|
|
1620
1650
|
}
|
|
1621
1651
|
const warnings =
|
|
1622
|
-
writtenDefinition === undefined
|
|
1652
|
+
writtenDefinition === undefined
|
|
1653
|
+
? []
|
|
1654
|
+
: [
|
|
1655
|
+
...(await scriptCompatWarnings(writtenDefinition)),
|
|
1656
|
+
...(await appWriteTypesWarnings(parsed.params.id)),
|
|
1657
|
+
];
|
|
1623
1658
|
patchAppRoute.respond(res, 200, {
|
|
1624
1659
|
app,
|
|
1625
1660
|
migration,
|
|
@@ -1711,7 +1746,12 @@ export async function handleApps(
|
|
|
1711
1746
|
return true;
|
|
1712
1747
|
}
|
|
1713
1748
|
const warnings =
|
|
1714
|
-
writtenDefinition === undefined
|
|
1749
|
+
writtenDefinition === undefined
|
|
1750
|
+
? []
|
|
1751
|
+
: [
|
|
1752
|
+
...(await scriptCompatWarnings(writtenDefinition)),
|
|
1753
|
+
...(await appWriteTypesWarnings(parsed.params.id)),
|
|
1754
|
+
];
|
|
1715
1755
|
updateAppRoute.respond(res, 200, {
|
|
1716
1756
|
app,
|
|
1717
1757
|
migration,
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { IncomingMessage } from "node:http";
|
|
2
|
+
import { authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
3
|
+
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
4
|
+
import { findUserById } from "../be/users";
|
|
5
|
+
import { getRequestAuth, isOperatorAuth } from "../utils/request-auth-context";
|
|
6
|
+
import { dashboardUserIdHeader } from "./favorite-owner";
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* The active user an operator-key dashboard request names in `X-Swarm-User-Id`.
|
|
10
|
+
* The operator key is fully trusted, so the header needs no further proof (same
|
|
11
|
+
* rule as favorites and session access). Agents, page sessions, user tokens and
|
|
12
|
+
* unauthenticated callers never pick a user.
|
|
13
|
+
*/
|
|
14
|
+
export async function resolveDashboardUserId(
|
|
15
|
+
req: IncomingMessage,
|
|
16
|
+
callerAgentId: string | undefined,
|
|
17
|
+
): Promise<string | null> {
|
|
18
|
+
const auth = getRequestAuth(req);
|
|
19
|
+
if (!isOperatorAuth(auth) || auth.page || callerAgentId || req.headers["x-agent-id"]) return null;
|
|
20
|
+
const picked = dashboardUserIdHeader(req);
|
|
21
|
+
const user = picked ? await findUserById(picked) : null;
|
|
22
|
+
return user?.status === "active" ? user.id : null;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* {@link authorizeAssetKeyWrite} for an HTTP request. The trusted user is the
|
|
27
|
+
* request's requester (pass `trustedUserId` when already resolved), else the
|
|
28
|
+
* dashboard's picked user, so an operator-key dashboard can write to its own
|
|
29
|
+
* user's `personal/<user>/` keys and no one else's.
|
|
30
|
+
*/
|
|
31
|
+
export async function authorizeHttpAssetKeyWrite(
|
|
32
|
+
req: IncomingMessage,
|
|
33
|
+
callerAgentId: string | undefined,
|
|
34
|
+
key: string,
|
|
35
|
+
trustedUserId?: string | null,
|
|
36
|
+
): Promise<string> {
|
|
37
|
+
const requester =
|
|
38
|
+
trustedUserId === undefined
|
|
39
|
+
? await resolveHttpRequesterUserId(req, callerAgentId)
|
|
40
|
+
: trustedUserId;
|
|
41
|
+
return authorizeAssetKeyWrite(
|
|
42
|
+
key,
|
|
43
|
+
requester ?? (await resolveDashboardUserId(req, callerAgentId)),
|
|
44
|
+
);
|
|
45
|
+
}
|
package/src/http/assets.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { getApp } from "../apps/store";
|
|
|
4
4
|
import { normalizeAssetKey } from "../assets/key";
|
|
5
5
|
import { sourceMoveError, sourceOfKey } from "../assets/source-key";
|
|
6
6
|
import { auditAssetKeys } from "../be/asset-key-audit";
|
|
7
|
-
import { AssetKeyAuthorizationError
|
|
7
|
+
import { AssetKeyAuthorizationError } from "../be/asset-key-auth";
|
|
8
8
|
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
9
9
|
import {
|
|
10
10
|
AssetKeyMovesBlockedError,
|
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
AssetKeySchema,
|
|
27
27
|
AssetSummarySchema,
|
|
28
28
|
} from "../types";
|
|
29
|
+
import { authorizeHttpAssetKeyWrite } from "./asset-key-write";
|
|
29
30
|
import { requestPrincipal, requireAuthKind } from "./request-principal";
|
|
30
31
|
import { route } from "./route-def";
|
|
31
32
|
import { canReadSession, hasSessionWrite, SESSION_READ_DENIED } from "./session-access";
|
|
@@ -283,7 +284,7 @@ export async function handleAssets(
|
|
|
283
284
|
try {
|
|
284
285
|
const actor = await resolveHttpRequesterUserId(req, myAgentId);
|
|
285
286
|
const key = parsed.body.key
|
|
286
|
-
? await
|
|
287
|
+
? await authorizeHttpAssetKeyWrite(req, myAgentId, parsed.body.key, actor)
|
|
287
288
|
: undefined;
|
|
288
289
|
const mapping = await upsertAssetKeyMapping({
|
|
289
290
|
providerId: parsed.body.providerId,
|
|
@@ -382,7 +383,7 @@ export async function handleAssets(
|
|
|
382
383
|
|
|
383
384
|
try {
|
|
384
385
|
const actor = await resolveHttpRequesterUserId(req, myAgentId);
|
|
385
|
-
const key = await
|
|
386
|
+
const key = await authorizeHttpAssetKeyWrite(req, myAgentId, parsed.body.key, actor);
|
|
386
387
|
const moved = await moveAssetKey({
|
|
387
388
|
entityType: parsed.params.entityType,
|
|
388
389
|
id: parsed.params.id,
|
package/src/http/comb.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
4
|
+
import { getTaskById } from "../be/db";
|
|
4
5
|
import { getCombConfig } from "../comb/config";
|
|
5
6
|
import {
|
|
6
7
|
REVIEW_BATCH_MAX,
|
|
@@ -11,8 +12,9 @@ import {
|
|
|
11
12
|
import { can } from "../rbac";
|
|
12
13
|
import { TaskCreationBlockedError } from "../tasks/errors";
|
|
13
14
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
14
|
-
import { requestPrincipal } from "./request-principal";
|
|
15
|
-
import { route } from "./route-def";
|
|
15
|
+
import { agentFirstPrincipal, requestPrincipal } from "./request-principal";
|
|
16
|
+
import { bodyTask, route } from "./route-def";
|
|
17
|
+
import { denyParentAttach } from "./session-access";
|
|
16
18
|
import { jsonError } from "./utils";
|
|
17
19
|
|
|
18
20
|
const skippedSchema = z.object({
|
|
@@ -50,11 +52,12 @@ const reviewBatchRoute = route({
|
|
|
50
52
|
method: "post",
|
|
51
53
|
path: "/api/comb/review-batches",
|
|
52
54
|
pattern: ["api", "comb", "review-batches"],
|
|
53
|
-
summary: "Send agent-fs comments to the swarm as one
|
|
55
|
+
summary: "Send agent-fs comments to the swarm as one task",
|
|
54
56
|
description:
|
|
55
|
-
"Comb's 'Send to swarm'. The server reads each comment again from agent-fs with its bootstrap key, skips replies, resolved comments, and comments already sent, and creates
|
|
57
|
+
"Comb's 'Send to swarm'. The server reads each comment again from agent-fs with its bootstrap key, skips replies, resolved comments, and comments already sent, and creates one task. An optional parentTaskId attaches it as a follow-up for the parent’s agent. Without a parent assignee it routes to the lead. Each sent comment gets a `[comb:sent task=<id>]` reply from the swarm service account. A comment is sent at most once. An optional `note` from the sender goes into the task text. When an earlier send lost its reply, the batch posts that reply again (`repaired`). Answers 404 while COMB_ENABLED is off.",
|
|
56
58
|
tags: ["Comb"],
|
|
57
59
|
body: z.object({
|
|
60
|
+
parentTaskId: z.uuid().optional(),
|
|
58
61
|
orgId: z.string().min(1),
|
|
59
62
|
driveId: z.string().min(1),
|
|
60
63
|
// agent-fs comment ids are UUIDs, so a malformed id never costs an agent-fs read.
|
|
@@ -89,6 +92,7 @@ const reviewBatchRoute = route({
|
|
|
89
92
|
schema: batchErrorSchema,
|
|
90
93
|
},
|
|
91
94
|
},
|
|
95
|
+
session: bodyTask("parentTaskId"),
|
|
92
96
|
rbac: { permission: "task.create.own" },
|
|
93
97
|
});
|
|
94
98
|
|
|
@@ -118,8 +122,20 @@ export async function handleComb(
|
|
|
118
122
|
}
|
|
119
123
|
|
|
120
124
|
try {
|
|
125
|
+
const { parentTaskId, ...batch } = parsed.body;
|
|
126
|
+
const parent = parentTaskId ? await getTaskById(parentTaskId) : null;
|
|
127
|
+
if (parentTaskId && !parent) {
|
|
128
|
+
jsonError(res, "Parent task not found", 404);
|
|
129
|
+
return true;
|
|
130
|
+
}
|
|
131
|
+
const sender = parent ? await agentFirstPrincipal(req, myAgentId) : null;
|
|
132
|
+
if (parent && sender && (await denyParentAttach(req, res, myAgentId, parent, sender)))
|
|
133
|
+
return true;
|
|
121
134
|
const result = await sendReviewBatch({
|
|
122
|
-
...
|
|
135
|
+
...batch,
|
|
136
|
+
parent: parent
|
|
137
|
+
? { id: parent.id, agentId: parent.agentId, agentCaller: sender?.kind === "agent" }
|
|
138
|
+
: undefined,
|
|
123
139
|
requestedByUserId: await resolveHttpRequesterUserId(req, myAgentId),
|
|
124
140
|
});
|
|
125
141
|
reviewBatchRoute.respond(res, result.taskId === null ? 200 : 201, result);
|
package/src/http/config.ts
CHANGED
|
@@ -190,8 +190,8 @@ export async function ensureConfigAdmin(
|
|
|
190
190
|
}
|
|
191
191
|
|
|
192
192
|
/**
|
|
193
|
-
* A human-only key (see `isHumanOnlyConfigKey`) needs
|
|
194
|
-
*
|
|
193
|
+
* A human-only key (see `isHumanOnlyConfigKey`) needs a user token or dashboard
|
|
194
|
+
* user session, with admin access when RBAC is enabled. The operator key resolves to the operator,
|
|
195
195
|
* and every worker holds it, so it is refused like an agent or a guest. A
|
|
196
196
|
* page session is refused whoever its viewer is. The operator key can still
|
|
197
197
|
* mint an admin user token; see the limit on `HUMAN_ONLY_CONFIG_KEYS`.
|
|
@@ -311,7 +311,8 @@ const envPresence = route({
|
|
|
311
311
|
}),
|
|
312
312
|
responses: {
|
|
313
313
|
200: {
|
|
314
|
-
description:
|
|
314
|
+
description:
|
|
315
|
+
"Map of key -> boolean. Empty values are normally absent; an explicitly empty WORKFLOW_INPUT_ENV_ALLOWLIST or Slack icon setting counts as present.",
|
|
315
316
|
schema: z.object({ presence: z.record(z.string(), z.boolean()) }),
|
|
316
317
|
},
|
|
317
318
|
400: { description: "Validation error" },
|
|
@@ -501,7 +502,10 @@ export async function handleConfig(
|
|
|
501
502
|
// Organization identity is trimmed by both /status and telemetry.
|
|
502
503
|
// Match that definition without changing presence semantics for secrets.
|
|
503
504
|
const value = key === "SWARM_ORG_NAME" ? process.env[key]?.trim() : process.env[key];
|
|
504
|
-
|
|
505
|
+
// An empty workflow allowlist is an active deny-all setting.
|
|
506
|
+
presence[key] =
|
|
507
|
+
value !== undefined &&
|
|
508
|
+
(key === "WORKFLOW_INPUT_ENV_ALLOWLIST" || isSlackIconConfigKey(key) || value !== "");
|
|
505
509
|
}
|
|
506
510
|
envPresence.respond(res, 200, { presence });
|
|
507
511
|
return true;
|
package/src/http/github-token.ts
CHANGED
|
@@ -12,22 +12,39 @@ const installationTokenRoute = route({
|
|
|
12
12
|
pattern: ["api", "github", "installation-token"],
|
|
13
13
|
summary: "Mint a GitHub App installation token for worker git and gh",
|
|
14
14
|
description:
|
|
15
|
-
"Internal worker endpoint. Returns a short-lived installation token for
|
|
15
|
+
"Internal worker endpoint. Returns a short-lived installation token for worker `git` and `gh`. With a `repo` (`owner/name`) whose owner is listed in the deployment env `GITHUB_APP_REPO_OWNERS`, the API resolves that repository's App installation with the App JWT and mints for it; the repository must also be registered in `swarm_repos` on the configured GitHub host (403 otherwise). Any other call mints for the installation in `GITHUB_APP_INSTALLATION_ID`, so single-installation deployments are unchanged and a caller never picks an installation the operator did not list. Only a registered agent (swarm API key plus X-Agent-ID, or an agent or runtime token) may call it; user, guest and ACP task tokens are refused. 404 when the App is not configured, so workers fall back to `GITHUB_TOKEN`.",
|
|
16
16
|
tags: ["GitHub"],
|
|
17
|
-
body: z
|
|
17
|
+
body: z
|
|
18
|
+
.object({
|
|
19
|
+
repo: z
|
|
20
|
+
.string()
|
|
21
|
+
.max(200)
|
|
22
|
+
.regex(
|
|
23
|
+
/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/,
|
|
24
|
+
"repo must be `owner/name` (letters, digits, dot, dash, underscore)",
|
|
25
|
+
)
|
|
26
|
+
.optional(),
|
|
27
|
+
})
|
|
28
|
+
.optional(),
|
|
18
29
|
responses: {
|
|
19
30
|
200: {
|
|
20
31
|
description: "Installation token and its expiry (ISO 8601)",
|
|
21
32
|
schema: z.object({ token: z.string(), expiresAt: z.string() }),
|
|
22
33
|
},
|
|
23
|
-
403: {
|
|
34
|
+
403: {
|
|
35
|
+
description:
|
|
36
|
+
"Caller is not a registered agent, or the repo of a listed owner is not registered in the swarm",
|
|
37
|
+
},
|
|
24
38
|
404: { description: "GitHub App worker auth is not configured" },
|
|
25
|
-
502: {
|
|
39
|
+
502: {
|
|
40
|
+
description:
|
|
41
|
+
"GitHub refused or failed to mint the token, or the repo has no App installation",
|
|
42
|
+
},
|
|
26
43
|
},
|
|
27
44
|
auth: { apiKey: true, agentId: true },
|
|
28
45
|
rbac: {
|
|
29
46
|
ungated:
|
|
30
|
-
"the handler admits only registered agent principals and mints for
|
|
47
|
+
"the handler admits only registered agent principals and mints only for the fixed installation or the installation of a registered repo whose owner the deployment env lists",
|
|
31
48
|
},
|
|
32
49
|
});
|
|
33
50
|
|
|
@@ -51,11 +68,15 @@ export async function handleGitHubToken(
|
|
|
51
68
|
jsonError(res, "Only a registered agent may mint a GitHub installation token", 403);
|
|
52
69
|
return true;
|
|
53
70
|
}
|
|
54
|
-
const result = await getWorkerInstallationToken();
|
|
71
|
+
const result = await getWorkerInstallationToken(parsed.body?.repo);
|
|
55
72
|
if (result.status === "unconfigured") {
|
|
56
73
|
jsonError(res, "GitHub App worker auth is not configured", 404);
|
|
57
74
|
return true;
|
|
58
75
|
}
|
|
76
|
+
if (result.status === "forbidden") {
|
|
77
|
+
jsonError(res, "The repo is not registered in the swarm", 403);
|
|
78
|
+
return true;
|
|
79
|
+
}
|
|
59
80
|
if (result.status === "error") {
|
|
60
81
|
jsonError(res, "GitHub did not mint an installation token", 502);
|
|
61
82
|
return true;
|
package/src/http/heartbeat.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { checkHeartbeatChecklist, runHeartbeatSweep } from "../heartbeat/heartbeat";
|
|
4
|
+
import { refuseAgentTokenWithout } from "./request-principal";
|
|
4
5
|
import { route } from "./route-def";
|
|
5
6
|
import { json } from "./utils";
|
|
6
7
|
|
|
@@ -24,6 +25,7 @@ const triggerSweep = route({
|
|
|
24
25
|
401: { description: "Unauthorized" },
|
|
25
26
|
},
|
|
26
27
|
auth: { apiKey: true },
|
|
28
|
+
rbac: { permission: "heartbeat.trigger" },
|
|
27
29
|
});
|
|
28
30
|
|
|
29
31
|
const triggerChecklist = route({
|
|
@@ -40,6 +42,7 @@ const triggerChecklist = route({
|
|
|
40
42
|
401: { description: "Unauthorized" },
|
|
41
43
|
},
|
|
42
44
|
auth: { apiKey: true },
|
|
45
|
+
rbac: { permission: "heartbeat.trigger" },
|
|
43
46
|
});
|
|
44
47
|
|
|
45
48
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
@@ -52,6 +55,7 @@ export async function handleHeartbeat(
|
|
|
52
55
|
if (triggerSweep.match(req.method, pathSegments)) {
|
|
53
56
|
const parsed = await triggerSweep.parse(req, res, pathSegments, new URLSearchParams());
|
|
54
57
|
if (!parsed) return true;
|
|
58
|
+
if (await refuseAgentTokenWithout(req, res, "heartbeat.trigger")) return true;
|
|
55
59
|
|
|
56
60
|
try {
|
|
57
61
|
await runHeartbeatSweep();
|
|
@@ -66,6 +70,7 @@ export async function handleHeartbeat(
|
|
|
66
70
|
if (triggerChecklist.match(req.method, pathSegments)) {
|
|
67
71
|
const parsed = await triggerChecklist.parse(req, res, pathSegments, new URLSearchParams());
|
|
68
72
|
if (!parsed) return true;
|
|
73
|
+
if (await refuseAgentTokenWithout(req, res, "heartbeat.trigger")) return true;
|
|
69
74
|
|
|
70
75
|
try {
|
|
71
76
|
await checkHeartbeatChecklist();
|
package/src/http/index.ts
CHANGED
|
@@ -22,6 +22,7 @@ import { startEventLoopLagProbe, stopEventLoopLagProbe, withLoopPath } from "../
|
|
|
22
22
|
import { startHumanFreeDrain, stopHumanFreeDrain } from "../be/human-free-drain";
|
|
23
23
|
import { initMcpEventsDispatcher } from "../be/mcp-events/dispatcher";
|
|
24
24
|
import { startMcpOverflowSweep, stopMcpOverflowSweep } from "../be/mcp-overflow-sweep";
|
|
25
|
+
import { setDeploymentEnvReader } from "../be/memory";
|
|
25
26
|
import {
|
|
26
27
|
enqueueAuditRow,
|
|
27
28
|
flushAuditBuffer,
|
|
@@ -72,7 +73,11 @@ import { startTelemetryTicker } from "../telemetry-snapshot";
|
|
|
72
73
|
import { API_DRAINING_HEADER } from "../utils/api-drain";
|
|
73
74
|
import { getApiKey } from "../utils/api-key";
|
|
74
75
|
import { ensure, initialize } from "../utils/business-use";
|
|
75
|
-
import {
|
|
76
|
+
import {
|
|
77
|
+
getConfiguredAppUrls,
|
|
78
|
+
getScriptApiBaseUrl,
|
|
79
|
+
setApiLoopbackBaseUrl,
|
|
80
|
+
} from "../utils/constants";
|
|
76
81
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
77
82
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
78
83
|
import { initWorkflows } from "../workflows";
|
|
@@ -687,6 +692,9 @@ try {
|
|
|
687
692
|
throw err;
|
|
688
693
|
}
|
|
689
694
|
warnIfCorsAllowsAnyOrigin();
|
|
695
|
+
// Before any embed: the provider exempts only the deployment env's base URL
|
|
696
|
+
// from the SSRF check, and it fixes that choice when it builds its client.
|
|
697
|
+
setDeploymentEnvReader(getDeploymentEnvValue);
|
|
690
698
|
|
|
691
699
|
// Register every stored secret (config secrets of all scopes, OAuth and MCP
|
|
692
700
|
// OAuth credentials, script API tokens) with the scrubber before listen, so
|
|
@@ -808,6 +816,7 @@ httpServer
|
|
|
808
816
|
const boundAddress = httpServer.address();
|
|
809
817
|
if (boundAddress && typeof boundAddress === "object") {
|
|
810
818
|
setExtensionLoopbackBaseUrl(`http://127.0.0.1:${boundAddress.port}`);
|
|
819
|
+
setApiLoopbackBaseUrl(`http://127.0.0.1:${boundAddress.port}`);
|
|
811
820
|
}
|
|
812
821
|
console.log(`MCP HTTP server running on http://localhost:${port}/mcp`);
|
|
813
822
|
|
|
@@ -921,7 +930,7 @@ httpServer
|
|
|
921
930
|
await initWorkflows();
|
|
922
931
|
|
|
923
932
|
// Reconcile durable script workflow subprocesses
|
|
924
|
-
await startScriptRunSupervisor(
|
|
933
|
+
await startScriptRunSupervisor(getScriptApiBaseUrl());
|
|
925
934
|
|
|
926
935
|
// Start scheduler (if enabled). The interval is read post-hydration, like
|
|
927
936
|
// heartbeat below, and parsed so an unusable value keeps the 10s default (#3169).
|
|
@@ -992,10 +1001,7 @@ httpServer
|
|
|
992
1001
|
// prefix) changed, then embed rows with a missing or wrong-length vector.
|
|
993
1002
|
// Non-blocking, idempotent, resumable. See src/be/memory/embedding-space.ts.
|
|
994
1003
|
import("../be/memory/embedding-space")
|
|
995
|
-
.then(({ runEmbeddingMaintenance
|
|
996
|
-
setDeploymentEnvReader(getDeploymentEnvValue);
|
|
997
|
-
return runEmbeddingMaintenance({ backfill: true });
|
|
998
|
-
})
|
|
1004
|
+
.then(({ runEmbeddingMaintenance }) => runEmbeddingMaintenance({ backfill: true }))
|
|
999
1005
|
.catch((err) => {
|
|
1000
1006
|
console.error("[embedding-space] startup maintenance failed (non-fatal):", err);
|
|
1001
1007
|
});
|
package/src/http/kv.ts
CHANGED
|
@@ -11,12 +11,14 @@ import {
|
|
|
11
11
|
listKv,
|
|
12
12
|
upsertKv,
|
|
13
13
|
} from "../be/db";
|
|
14
|
+
import { MAX_KV_BODY_BYTES } from "../kv-limits";
|
|
14
15
|
import { mcpOverflowAuthError } from "../kv-overflow";
|
|
15
16
|
import {
|
|
16
17
|
privateNamespaceError,
|
|
17
18
|
requiresLeadToWrite,
|
|
18
19
|
reservedNamespaceError,
|
|
19
20
|
reservedRoomKeyError,
|
|
21
|
+
scrubReservedRead,
|
|
20
22
|
} from "../kv-reserved-namespaces";
|
|
21
23
|
import { hasKvViewArgs, resolveKvView } from "../kv-view";
|
|
22
24
|
import { can } from "../rbac";
|
|
@@ -46,10 +48,6 @@ import { BODY_TOO_LARGE, enforceContentLengthCap, jsonError } from "./utils";
|
|
|
46
48
|
* and overrides anything in the URL/body so pages can't escape their namespace.
|
|
47
49
|
*/
|
|
48
50
|
|
|
49
|
-
// 2 MiB cap on PUT bodies. Pre-flighted via Content-Length; the parsed JSON
|
|
50
|
-
// body itself is enforced too (`value` size ≤ MAX_KV_BODY_BYTES after stringify).
|
|
51
|
-
const MAX_KV_BODY_BYTES = 2 * 1024 * 1024;
|
|
52
|
-
|
|
53
51
|
// `limit` upper bound on list endpoints. Anything higher gets clamped silently
|
|
54
52
|
// — callers should paginate via offset.
|
|
55
53
|
const MAX_KV_LIST_LIMIT = 1000;
|
|
@@ -693,6 +691,7 @@ async function sendGet(
|
|
|
693
691
|
jsonError(res, "not found", 404);
|
|
694
692
|
return true;
|
|
695
693
|
}
|
|
694
|
+
entry.value = scrubReservedRead(namespace, entry.value);
|
|
696
695
|
if (hasKvViewArgs(query)) {
|
|
697
696
|
const view = resolveKvView(entry.value, query);
|
|
698
697
|
if (!view.ok) {
|
|
@@ -791,7 +790,10 @@ async function sendList(
|
|
|
791
790
|
const limit = Math.min(query.limit ?? 100, MAX_KV_LIST_LIMIT);
|
|
792
791
|
const offset = query.offset ?? 0;
|
|
793
792
|
const prefix = query.prefix && query.prefix.length > 0 ? query.prefix : undefined;
|
|
794
|
-
const entries = await listKv(namespace, { prefix, limit, offset })
|
|
793
|
+
const entries = (await listKv(namespace, { prefix, limit, offset })).map((entry) => ({
|
|
794
|
+
...entry,
|
|
795
|
+
value: scrubReservedRead(namespace, entry.value),
|
|
796
|
+
}));
|
|
795
797
|
const total = await countKv(namespace, { prefix });
|
|
796
798
|
respond(res, 200, { entries, total, namespace });
|
|
797
799
|
return true;
|