@desplega.ai/agent-swarm 2.12.0 → 2.13.1
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-xtj40wd8.js +17 -0
- package/dist/{acp-targets-311gcyvw.js → acp-targets-n7vm5atw.js} +10 -9
- package/dist/{actions-c4chgxp6.js → actions-hq6wp9xv.js} +28 -27
- package/dist/{agent-fs-provision-0b9awm5n.js → agent-fs-provision-y0qc1rdd.js} +4 -4
- package/dist/{amp-adapter-r0veq6x5.js → amp-adapter-1qqs6h91.js} +3 -3
- package/dist/{app-hn5fftf5.js → app-7m4z44rv.js} +10 -8
- package/dist/{approval-notifications-3g6yc8nv.js → approval-notifications-8sr41gjx.js} +11 -10
- package/dist/{assistant-cpjgpjvp.js → assistant-hkczwfv6.js} +29 -28
- package/dist/{boot-args-schema-hce1av1h.js → boot-args-schema-8025snev.js} +1 -1
- package/dist/{boot-reembed-bztbxc4z.js → boot-reembed-15m87nr1.js} +5 -2
- package/dist/{boot-reembed-d7xcym0j.js → boot-reembed-4bbpxjh1.js} +1 -1
- package/dist/{boot-scrub-sweep-mkmm16gk.js → boot-scrub-sweep-eajr97e9.js} +2 -2
- package/dist/{boot-seeds-arrkbe8t.js → boot-seeds-9cwy39jx.js} +4 -4
- package/dist/{boxd-68n75y1s.js → boxd-hr8rsxzq.js} +1 -1
- package/dist/{claude-adapter-ykpyr5p8.js → claude-adapter-g61wa4rt.js} +9 -8
- package/dist/{claude-managed-adapter-ssg6z4bt.js → claude-managed-adapter-znkk0prm.js} +4 -4
- package/dist/{claude-managed-setup-trd59v7b.js → claude-managed-setup-f1wndkr2.js} +7 -7
- package/dist/{claude-sdk-session-yjcze0j1.js → claude-sdk-session-687xzf21.js} +20763 -19380
- package/dist/{cli-ya3kf4gs.js → cli-04103ryh.js} +1 -1
- package/dist/{cli-55tc8cj4.js → cli-0a336ze7.js} +5 -5
- package/dist/{cli-q8tc22bj.js → cli-0fx95c06.js} +5 -5
- package/dist/{cli-mq2fbgva.js → cli-0m77n7ej.js} +3 -3
- package/dist/{cli-7yn42w6m.js → cli-0xwb7zpt.js} +2 -2
- package/dist/{cli-mcymtvwn.js → cli-13t0smbk.js} +1000 -28
- package/dist/{cli-c7j31hq9.js → cli-1b5axkt1.js} +4 -4
- package/dist/{cli-yegz2g06.js → cli-1carhg8g.js} +4 -4
- package/dist/{cli-j5gtytvg.js → cli-1dr5at77.js} +15 -12
- package/dist/cli-2v4xxnx2.js +148 -0
- package/dist/{cli-sv2r3bw8.js → cli-32xndx6b.js} +7 -7
- package/dist/{cli-h70a2mxy.js → cli-3m8vqehw.js} +53 -13
- package/dist/{cli-ercwc8xn.js → cli-3mf04tkh.js} +1 -1
- package/dist/{cli-52nfye5j.js → cli-3zyme1wt.js} +24 -16
- package/dist/{cli-s6zk31gr.js → cli-43dsqhcp.js} +4 -4
- package/dist/{cli-b93d81yg.js → cli-4h90xaet.js} +2 -2
- package/dist/{cli-5tg94mdw.js → cli-4mj5g29m.js} +9 -12
- package/dist/{cli-47hz21se.js → cli-4tbvndmm.js} +4 -5
- package/dist/{cli-r0mz92by.js → cli-50whymxq.js} +2 -2
- package/dist/{cli-js10kdk7.js → cli-5basv0e7.js} +19 -5
- package/dist/{cli-krbcr00p.js → cli-5v6b2am8.js} +59 -5
- package/dist/{cli-en6dmkxd.js → cli-6r1dwegd.js} +3 -3
- package/dist/{cli-9qe5y107.js → cli-7ewre3dm.js} +15 -6
- package/dist/{cli-n3qe7tyr.js → cli-84xtgbn6.js} +35 -2
- package/dist/{cli-xm34qj8m.js → cli-8cmjkbvj.js} +2 -2
- package/dist/{cli-2m6yaq6b.js → cli-8fj8yfmk.js} +1 -1
- package/dist/{cli-nja15knq.js → cli-8rbkw18r.js} +3 -3
- package/dist/{cli-x05p2d05.js → cli-9tevdxyf.js} +1 -1
- package/dist/{cli-hhc47ack.js → cli-9xx36trj.js} +4 -4
- package/dist/{cli-39qm0rtm.js → cli-a8ts6x1n.js} +29 -150
- package/dist/{cli-bp6k9acz.js → cli-aebswqmz.js} +18 -18
- package/dist/{cli-ex1y88j3.js → cli-at67kvnp.js} +1 -1
- package/dist/{cli-q2dywc8h.js → cli-bjmq14k9.js} +4 -4
- package/dist/{cli-v9ya390t.js → cli-byxsctca.js} +12 -12
- package/dist/{cli-bz97ff9n.js → cli-c0tyzt73.js} +152 -12
- package/dist/{cli-fyaq4zdv.js → cli-c8kqmzzf.js} +9 -9
- package/dist/{cli-t75xngj1.js → cli-cd9acnvd.js} +12 -12
- package/dist/{cli-eqq0hwvx.js → cli-cmgdptmx.js} +3 -3
- package/dist/{cli-r14ac1y0.js → cli-cn6fpa1p.js} +1 -1
- package/dist/{cli-0k1a0sde.js → cli-cp0m07wb.js} +10 -10
- package/dist/{cli-3p288654.js → cli-cpkxh68d.js} +2 -2
- package/dist/{cli-fxd1mwtr.js → cli-cqxwjb93.js} +2 -2
- package/dist/{cli-8hp56wat.js → cli-d2epqm0y.js} +1 -1
- package/dist/{cli-73q4g5nx.js → cli-dd57p1gd.js} +21 -21
- package/dist/{cli-5z0g0e8v.js → cli-f8rcvf2x.js} +49 -13
- package/dist/{cli-wvjqaqcp.js → cli-fn8aj7gb.js} +1330 -249
- package/dist/{cli-bpje8n65.js → cli-fp65jdp2.js} +31 -6
- package/dist/{cli-0pp1yjg2.js → cli-gedf48yw.js} +11 -11
- package/dist/{cli-m5qtmrbc.js → cli-gq6qhmrr.js} +2 -2
- package/dist/{cli-5x03v6en.js → cli-grcc2h2g.js} +8 -8
- package/dist/{cli-01tvvtad.js → cli-h03j6je3.js} +4 -4
- package/dist/{cli-mbwmqb5w.js → cli-h0ewec3d.js} +1 -1
- package/dist/{cli-12vek61e.js → cli-h9bejmkf.js} +535 -146
- package/dist/{cli-gfy6hbd9.js → cli-hs3mqswp.js} +18 -11
- package/dist/{cli-tdk7jtka.js → cli-hv3820ez.js} +1 -1
- package/dist/{cli-pqfecppn.js → cli-je587f74.js} +1 -1
- package/dist/{cli-cjqyse9q.js → cli-jhtvt7gn.js} +3 -3
- package/dist/{cli-dkvtfgn4.js → cli-mmw2sjaf.js} +76 -17
- package/dist/{cli-2z2c4k6q.js → cli-mwxez0pz.js} +22 -0
- package/dist/{cli-yfpc6qy9.js → cli-nk8swfpx.js} +47 -16
- package/dist/{cli-eq4kew31.js → cli-p7g7wd9n.js} +26 -13
- package/dist/{cli-bhgrhedp.js → cli-q8aq48v1.js} +1 -1
- package/dist/{cli-dd2k2mcd.js → cli-qn79645p.js} +1 -1
- package/dist/{cli-ma9ys8rt.js → cli-qx1dwrr5.js} +7 -4
- package/dist/{cli-tm60vtax.js → cli-rfejbpe1.js} +1 -1
- package/dist/{cli-agjbj5x0.js → cli-s6fhqbz1.js} +38 -20
- package/dist/{cli-kwr5qv5g.js → cli-sfajkbd7.js} +2 -2
- package/dist/{cli-9y4tgrkf.js → cli-skd2c4ej.js} +2 -1
- package/dist/{cli-e8n0hdzd.js → cli-snypfjgj.js} +1 -1
- package/dist/{cli-n8f0fs3c.js → cli-t25rq8mg.js} +11 -11
- package/dist/{cli-72yms3ey.js → cli-t90k0phh.js} +201 -21
- package/dist/{cli-xf4z5bdn.js → cli-tzzas8rb.js} +4 -4
- package/dist/{cli-rtmqzat7.js → cli-vdfngx2g.js} +2 -2
- package/dist/{cli-9w8712tq.js → cli-vr4eyq6p.js} +43 -14
- package/dist/{cli-z4f346g5.js → cli-vx9acp12.js} +1 -1
- package/dist/{cli-2amwhyv2.js → cli-w24f3j49.js} +13 -11
- package/dist/cli-w41bvvms.js +148 -0
- package/dist/{cli-04zc3f7b.js → cli-w6c6dj91.js} +1 -1
- package/dist/{cli-fy4gb74g.js → cli-x5yb8zc8.js} +2 -2
- package/dist/{cli-2tw284hj.js → cli-xhkek467.js} +3 -3
- package/dist/{cli-5r95eqbh.js → cli-y260hgep.js} +1 -1
- package/dist/{cli-hbvgzjq4.js → cli-y6qqbpwc.js} +3 -3
- package/dist/{cli-7wy8gbwb.js → cli-ya1cj689.js} +1 -1
- package/dist/{cli-1htmtqc2.js → cli-yeh3g1q6.js} +620 -95
- package/dist/{cli-0vcqcwfn.js → cli-yfvhvw8m.js} +2 -0
- package/dist/{cli-k5jx8jya.js → cli-z6m6xzxt.js} +2 -2
- package/dist/{cli-pe3yxedk.js → cli-zaate0rd.js} +3 -3
- package/dist/{cli-n85m2wkq.js → cli-zkbz8m2q.js} +3 -2
- package/dist/{cli-e3ahxq5y.js → cli-zvpkrgsc.js} +6 -6
- package/dist/cli.js +30 -28
- package/dist/{codex-adapter-wc6e4wct.js → codex-adapter-ysfg6ty3.js} +8 -8
- package/dist/{codex-hook-aqtj17yr.js → codex-hook-c0nvm30r.js} +73 -2
- package/dist/{codex-login-1ven7yje.js → codex-login-ven5cz5j.js} +1 -1
- package/dist/{codex-session-runner-ppfgjd97.js → codex-session-runner-823scr6g.js} +9 -9
- package/dist/{commands-tsv2vx5b.js → commands-5rbm07fz.js} +3 -3
- package/dist/{controller-ye4sdwsy.js → controller-wn3vd217.js} +4 -4
- package/dist/{controllers-connect-zn4dg69h.js → controllers-connect-34jzhfft.js} +29 -28
- package/dist/core-kdehq26g.js +42 -0
- package/dist/{cursor-adapter-q2g9vwts.js → cursor-adapter-w1681kp1.js} +2 -2
- package/dist/{db-g111qn9j.js → db-6bkgbfwk.js} +3 -3
- package/dist/{db-3r1fyr2n.js → db-hcj16x7z.js} +4 -2
- package/dist/{devin-adapter-t8d86q9x.js → devin-adapter-fs90ab4v.js} +1 -1
- package/dist/{dispatcher-4q8s0mx8.js → dispatcher-jgjqrfzv.js} +28 -25
- package/dist/{docker-1b41eysj.js → docker-1h33jvh9.js} +2 -2
- package/dist/{dsh-adapter-mmcw1z5s.js → dsh-adapter-g9yqv09y.js} +2 -2
- package/dist/{e2b-xm60c8ad.js → e2b-jnk0yeva.js} +2 -2
- package/dist/{e2b-ew8c5j5v.js → e2b-y7e5kmzf.js} +2 -2
- package/dist/{easter-egg-3d-04ke6hcp.js → easter-egg-3d-w17nsny6.js} +1 -1
- package/dist/{embedding-space-kcdn52vz.js → embedding-space-v06fwy7b.js} +6 -6
- package/dist/{embeddings-jnzcd91a.js → embeddings-g50dxea4.js} +1 -1
- package/dist/{event-bus-v4ywhc2p.js → event-bus-08t2b4y2.js} +1 -1
- package/dist/{execute-74amghty.js → execute-1n36haw1.js} +1 -1
- package/dist/{external-channel-v9zgxnxz.js → external-channel-43tv8pg6.js} +2 -2
- package/dist/fx-adapter-bvh05t4a.js +20 -0
- package/dist/grok-adapter-my5j8mdf.js +20 -0
- package/dist/handlers-wyymeeqh.js +41 -0
- package/dist/heartbeat-sf3nk937.js +50 -0
- package/dist/{hook-p5reemds.js → hook-dqph1e05.js} +77 -18
- package/dist/{hook-k1h73zd7.js → hook-m1m9dm6w.js} +6 -5
- package/dist/{http-ms1z5xxy.js → http-w0th1cz9.js} +888 -226
- package/dist/index-22khdtby.js +44 -0
- package/dist/{index-76zzxtzf.js → index-c0e8en64.js} +1 -1
- package/dist/{index-620y7jzq.js → index-e8pz8qdg.js} +3 -3
- package/dist/{index-8p0j4h4j.js → index-ez823q84.js} +94 -89
- package/dist/{index-fbkqhvvj.js → index-ffba0z8q.js} +217 -165
- package/dist/{index-gjn6qfgn.js → index-gkpfgpg7.js} +1 -1
- package/dist/{index-4k7m5dgj.js → index-k8ajc0g0.js} +143 -103
- package/dist/index-np0582ac.js +40 -0
- package/dist/{index-kn63q1gr.js → index-pb03vans.js} +33 -32
- package/dist/index-vgkrj1jt.js +39 -0
- package/dist/{index-pe3d8jfy.js → index-whysn1wf.js} +1 -1
- package/dist/{index-0h6qd4p1.js → index-y4vd4mhn.js} +3 -4
- package/dist/{k8s-fy8hbhkg.js → k8s-8326q0rq.js} +2 -2
- package/dist/{keepalive-031js8jz.js → keepalive-2v06q2e8.js} +5 -4
- package/dist/lead-55z813ng.js +79 -0
- package/dist/{maintenance-sq9v3qx9.js → maintenance-vx7vjhhy.js} +1 -1
- package/dist/{oauth-refresh-sweep-zqmnyvs8.js → oauth-refresh-sweep-g06k4bza.js} +4 -3
- package/dist/{object-webhooks-r24wwb5y.js → object-webhooks-3dzdq4fm.js} +7 -7
- package/dist/{onboard-p25yhh7t.js → onboard-232pazny.js} +4 -4
- package/dist/{opencode-adapter-wcjc4zdk.js → opencode-adapter-t0paqbh8.js} +8 -7
- package/dist/{otel-impl-ff1gf20m.js → otel-impl-kmpkyp4y.js} +2 -2
- package/dist/{pending-hxj5yatb.js → pending-x0z3vx1x.js} +27 -26
- package/dist/{pi-mono-adapter-vkp4zz7p.js → pi-mono-adapter-7pmypn6d.js} +93 -22
- package/dist/{pricing-refresh-9w7gx41w.js → pricing-refresh-ytjmtyd7.js} +2 -2
- package/dist/{rbac-roles-84aw10nz.js → rbac-roles-fgm5mxr2.js} +3 -3
- package/dist/{rbac-roles-hz74vckp.js → rbac-roles-xyaxekh3.js} +7 -4
- package/dist/{registry-eeyx1201.js → registry-zv0zvxsx.js} +1 -1
- package/dist/{render-v2-nrdkg9gf.js → render-v2-ws972g4r.js} +12 -8
- package/dist/{resume-s6ey36rh.js → resume-m6mjzhkp.js} +13 -12
- package/dist/{runtime-x0b4pyam.js → runtime-zzpc0c8a.js} +1 -1
- package/dist/{session-access-xv49tk14.js → session-access-vp35xs91.js} +5 -4
- package/dist/{session-source-backfill-r5j988ah.js → session-source-backfill-p73e8zbe.js} +3 -3
- package/dist/{setup-mj0krk1p.js → setup-r4kd7rxg.js} +1 -1
- package/dist/thread-buffer-cm2nzq6t.js +42 -0
- package/dist/{tree-visibility-cbrsfaar.js → tree-visibility-07h2tbs2.js} +2 -2
- package/dist/{user-merge-jobs-f9d8nwnw.js → user-merge-jobs-96vg9rpe.js} +3 -3
- package/dist/{virtual-modules-ns0ryw05.js → virtual-modules-vgn3f2x4.js} +3 -3
- package/dist/{work-objects-pydhzast.js → work-objects-74hbcx3e.js} +31 -29
- package/dist/worker-5pn2vzx6.js +79 -0
- package/dist/{worker-follow-up-9z2xec5e.js → worker-follow-up-ezavwn5d.js} +26 -25
- package/dist/{x-3dtaf2r9.js → x-asbrnafg.js} +2 -2
- package/dist/xlsx-9acfmxr1.js +31534 -0
- package/openapi.json +2816 -1464
- package/package.json +13 -11
- package/src/agentmail/handlers.ts +26 -19
- package/src/apps/catalog.generated.json +757 -0
- package/src/apps/definition.ts +24 -7
- package/src/apps/page-validator.ts +225 -3
- package/src/apps/row-store.ts +37 -14
- package/src/azure-devops/handlers.ts +2 -0
- package/src/be/audit-user.ts +46 -6
- package/src/be/db/kv-windows.ts +22 -0
- package/src/be/db/session-moves.ts +3 -3
- package/src/be/db/session-tree.ts +52 -5
- package/src/be/db/skill-audit.ts +17 -0
- package/src/be/db/tasks/write.ts +18 -3
- package/src/be/db.ts +152 -33
- package/src/be/extensions/assets.ts +11 -7
- package/src/be/mcp-proxy.ts +5 -4
- package/src/be/memory/demotion-evidence.ts +2 -2
- package/src/be/memory/providers/sqlite-store.ts +151 -18
- package/src/be/memory/search-read-worker.ts +60 -0
- package/src/be/memory/search-reader.ts +223 -0
- package/src/be/migrations/337_favorites_session_hidden_key.sql +39 -0
- package/src/be/migrations/338_audit_agent_columns.sql +30 -0
- package/src/be/migrations/339_deferred_event_waits.sql +26 -0
- package/src/be/migrations/340_api_key_spend_cap.sql +5 -0
- package/src/be/model-tier-resolution.ts +18 -1
- package/src/be/multi-runtime.ts +17 -0
- package/src/be/primitives/object-embed.ts +250 -0
- package/src/be/primitives/objects.ts +29 -9
- package/src/be/primitives/sheets/service.ts +138 -6
- package/src/be/primitives/sheets/xlsx.ts +367 -0
- package/src/be/rbac-roles.ts +3 -0
- package/src/be/repo-checked-update.ts +4 -4
- package/src/be/repo-merge-policy.ts +26 -9
- package/src/be/schedules/validate.ts +26 -0
- package/src/be/scripts/boot-reembed.ts +6 -0
- package/src/be/scripts/db.ts +17 -5
- package/src/be/scripts/embeddings.ts +6 -0
- package/src/be/scripts/typecheck.ts +43 -2
- package/src/be/seed/schedules-seeder.ts +9 -1
- package/src/be/seed/workflows-seeder.ts +9 -1
- package/src/be/seed-scripts/index.ts +2 -0
- package/src/be/seed-skills/index.ts +12 -0
- package/src/be/swarm-config-guard.ts +5 -0
- package/src/be/unmapped-identities.ts +95 -1
- package/src/bitbucket/handlers.ts +2 -0
- package/src/commands/credential-outcome-report.ts +5 -2
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/provider-credentials.ts +19 -0
- package/src/commands/provider-error-class.ts +4 -1
- package/src/commands/rate-limit-outcome.ts +48 -3
- package/src/commands/runner.ts +113 -55
- package/src/commands/worktree-reaper.ts +600 -0
- package/src/event-waits/github.ts +43 -0
- package/src/event-waits/index.ts +29 -0
- package/src/event-waits/types.ts +51 -0
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/dispatcher.ts +9 -0
- package/src/fs/agent-fs-provider.ts +4 -1
- package/src/github/handlers.ts +3 -1
- package/src/github/pull-request-state.ts +34 -0
- package/src/gitlab/handlers.ts +12 -7
- package/src/hooks/codex-hook.ts +99 -1
- package/src/hooks/hook.ts +85 -11
- package/src/hooks/native-tool-hooks.ts +245 -0
- package/src/http/agents.ts +4 -0
- package/src/http/all-routes.ts +1 -0
- package/src/http/api-keys.ts +27 -3
- package/src/http/assets.ts +4 -3
- package/src/http/comb.ts +2 -2
- package/src/http/favorite-owner.ts +2 -2
- package/src/http/favorites.ts +3 -2
- package/src/http/fs.ts +13 -4
- package/src/http/index.ts +2 -0
- package/src/http/mcp-bridge.ts +4 -0
- package/src/http/objects.ts +265 -0
- package/src/http/pages-public.ts +40 -4
- package/src/http/pages.ts +3 -3
- package/src/http/poll.ts +43 -12
- package/src/http/pool-keys.ts +21 -2
- package/src/http/repos.ts +7 -6
- package/src/http/schedules.ts +38 -9
- package/src/http/script-connections.ts +14 -6
- package/src/http/script-runs.ts +12 -3
- package/src/http/scripts.ts +9 -0
- package/src/http/sessions.ts +30 -12
- package/src/http/skills.ts +17 -0
- package/src/http/task-requester.ts +2 -2
- package/src/http/tasks.ts +18 -12
- package/src/http/tool-hooks.ts +24 -2
- package/src/http/trackers/authorize-gate.ts +2 -2
- package/src/http/users.ts +136 -1
- package/src/http/workflow-events.ts +13 -0
- package/src/http/workflows.ts +21 -11
- package/src/linear/sync.ts +3 -1
- package/src/mcp-client/http-client.ts +3 -1
- package/src/oauth/identity-capture.ts +6 -1
- package/src/oauth/mcp-wrapper.ts +10 -3
- package/src/oauth/wrapper.ts +15 -3
- package/src/prompts/base-prompt.ts +35 -13
- package/src/prompts/session-templates.ts +26 -0
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/dsh-adapter.ts +1 -1
- package/src/providers/opencode-adapter.ts +1 -0
- package/src/providers/opencode-swarm-plugin.ts +50 -1
- package/src/providers/pi-mono-adapter.ts +143 -11
- package/src/providers/pi-mono-extension.ts +69 -0
- package/src/providers/runtime-dependencies.ts +1 -1
- package/src/rbac/legacy-policy.ts +5 -0
- package/src/rbac/permissions.ts +16 -1
- package/src/scheduler/deferred-task-waits.ts +170 -13
- package/src/scripts-runtime/executors/types.ts +5 -0
- package/src/scripts-runtime/loader.ts +8 -0
- package/src/scripts-runtime/mcp-client.ts +4 -0
- package/src/scripts-runtime/sdk-allowlist.ts +14 -1
- package/src/scripts-runtime/swarm-config.ts +8 -0
- package/src/scripts-runtime/swarm-sdk.ts +4 -0
- package/src/scripts-runtime/types/stdlib.d.ts +47 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +8 -7
- package/src/scripts-runtime/types/swarm-sdk.d.ts +47 -4
- package/src/server.ts +4 -0
- package/src/slack/enrich.ts +94 -31
- package/src/slack/handlers.test.ts +55 -2
- package/src/slack/handlers.ts +38 -3
- package/src/slack/render-v2.ts +19 -0
- package/src/slack/session-mirror.ts +208 -0
- package/src/slack/thread-participants.ts +0 -5
- package/src/slack/watcher.ts +3 -0
- package/src/slack/work-objects.test.ts +2 -1
- package/src/slack/work-objects.ts +7 -2
- package/src/tests/agentmail-filters.test.ts +4 -3
- package/src/tests/agents-list-model-display.test.ts +23 -0
- package/src/tests/apps-spike2.test.ts +35 -0
- package/src/tests/audit-agent-person.test.ts +825 -0
- package/src/tests/audit-updated-by.test.ts +19 -12
- package/src/tests/base-prompt.test.ts +1 -0
- package/src/tests/claude-hook-output.test.ts +107 -2
- package/src/tests/claude-managed-setup.test.ts +1 -1
- package/src/tests/codex-adapter.test.ts +6 -6
- package/src/tests/codex-gpt6-release.test.ts +4 -4
- package/src/tests/db-task-read-contract.test.ts +1 -0
- package/src/tests/db-task-write-contract.test.ts +1 -0
- package/src/tests/deploy-guard.test.ts +24 -0
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/ensure-token.test.ts +2 -2
- package/src/tests/entrypoint-repo-autoclone-args.test.ts +202 -0
- package/src/tests/extensions-catalog.test.ts +33 -25
- package/src/tests/fake-dns.ts +47 -0
- package/src/tests/fixtures/base-prompt-baseline.json +12 -12
- package/src/tests/fixtures/sheets/eocd-count-mismatch.xlsx +0 -0
- package/src/tests/fixtures/sheets/rich-budget.xlsx +0 -0
- package/src/tests/fixtures/sheets/tracker-export.xlsx +0 -0
- package/src/tests/kv-storage.test.ts +3 -0
- package/src/tests/latest-model-report.test.ts +138 -0
- package/src/tests/mcp-oauth-dcr-reuse.test.ts +5 -2
- package/src/tests/mcp-oauth-ensure-token.test.ts +3 -2
- package/src/tests/mcp-oauth-manual-client.test.ts +6 -1
- package/src/tests/mcp-oauth-wrapper.test.ts +20 -4
- package/src/tests/mcp-outbound-fetch-guard.test.ts +169 -0
- package/src/tests/mcp-server-ssrf.test.ts +2 -0
- package/src/tests/memory-search-reader.test.ts +258 -0
- package/src/tests/memory-search-stall.test.ts +202 -20
- package/src/tests/model-control.test.ts +4 -4
- package/src/tests/model-tier-resolution.test.ts +2 -2
- package/src/tests/multi-runtime-registration.test.ts +8 -2
- package/src/tests/native-tool-hooks.test.ts +188 -0
- package/src/tests/oauth-connection-fetch-guard.test.ts +162 -0
- package/src/tests/oauth-token-endpoint-fetch-guard.test.ts +121 -0
- package/src/tests/oauth-wrapper.test.ts +1 -2
- package/src/tests/opencode-swarm-plugin.test.ts +6 -1
- package/src/tests/pages-head-v2.test.ts +2 -1
- package/src/tests/pi-provider-runtime-keys.test.ts +163 -0
- package/src/tests/poll-probe-readonly.test.ts +108 -0
- package/src/tests/primitives-sheets-xlsx.test.ts +549 -0
- package/src/tests/prompt-template-session.test.ts +3 -2
- package/src/tests/rbac-roles.test.ts +3 -0
- package/src/tests/script-connections-http.test.ts +8 -3
- package/src/tests/script-connections.test.ts +6 -0
- package/src/tests/seed-model-profiles.test.ts +1 -1
- package/src/tests/sessions-tree.test.ts +10 -2
- package/src/tests/slack-thread-participants.test.ts +77 -4
- package/src/tests/spend-cap-credentials.test.ts +34 -0
- package/src/tests/spend-cap-outcome.test.ts +67 -0
- package/src/tests/subscription-first.test.ts +119 -0
- package/src/tests/tool-registrar-no-input.test.ts +1 -0
- package/src/tests/worktree-reaper.test.ts +424 -0
- package/src/tools/defer-task.ts +154 -12
- package/src/tools/get-task-details.ts +247 -5
- package/src/tools/objects.ts +10 -5
- package/src/tools/repos/update-repo.ts +6 -6
- package/src/tools/schedules/create-schedule.ts +1 -0
- package/src/tools/schedules/list-schedules.ts +3 -0
- package/src/tools/schedules/patch-schedule.ts +38 -4
- package/src/tools/schedules/update-schedule.ts +40 -5
- package/src/tools/sheets.ts +66 -0
- package/src/tools/skills/skill-create.ts +6 -0
- package/src/tools/skills/skill-install-remote.ts +6 -0
- package/src/tools/skills/skill-sync-remote.ts +9 -0
- package/src/tools/skills/skill-update.ts +9 -1
- package/src/tools/tool-config.ts +3 -1
- package/src/tools/utils.ts +15 -0
- package/src/tools/workflows/create-workflow.ts +9 -4
- package/src/tools/workflows/patch-workflow-node.ts +1 -1
- package/src/tools/workflows/patch-workflow.ts +5 -2
- package/src/tools/workflows/update-workflow.ts +13 -7
- package/src/types.ts +96 -12
- package/src/utils/credentials.ts +36 -1
- package/src/utils/egress-guard.ts +40 -10
- package/src/utils/error-tracker.ts +17 -0
- package/src/workflows/input.ts +12 -5
- package/src/workflows/patch-definition.ts +13 -5
- package/src/workflows/triggers.ts +11 -6
- package/src/workflows/version.ts +7 -1
- package/templates/skills/apps/SKILL.md +191 -2
- package/templates/skills/apps/content.md +191 -2
- package/templates/skills/boards-and-sheets/config.json +14 -0
- package/templates/skills/boards-and-sheets/content.md +174 -0
- package/templates/skills/pages/content.md +11 -0
- package/templates/skills/swarm-docs/content.md +11 -0
- package/templates/skills/swarm-scripts/SKILL.md +1 -0
- package/templates/skills/swarm-scripts/content.md +1 -0
- package/templates/workflows/ralph-loop/content.md +6 -6
- package/dist/acp-adapter-11m13kx4.js +0 -16
- package/dist/cli-pr0eze3x.js +0 -149
- package/dist/core-dxcy02sc.js +0 -41
- package/dist/fx-adapter-0ar6pqm3.js +0 -19
- package/dist/grok-adapter-t6m74fb1.js +0 -19
- package/dist/handlers-9kwcrc4k.js +0 -38
- package/dist/heartbeat-p8pk1msj.js +0 -49
- package/dist/index-23cdfzr6.js +0 -39
- package/dist/index-g7kkjs5b.js +0 -38
- package/dist/index-stk36pa5.js +0 -43
- package/dist/lead-mfggjtfk.js +0 -77
- package/dist/thread-buffer-temgaqsy.js +0 -41
- package/dist/worker-efcemc22.js +0 -77
- /package/dist/{cli-cah298e5.js → cli-m4ejz4nj.js} +0 -0
package/src/http/users.ts
CHANGED
|
@@ -14,6 +14,8 @@
|
|
|
14
14
|
* POST /api/users
|
|
15
15
|
* GET /api/users/unmapped (must precede /:id)
|
|
16
16
|
* POST /api/users/unmapped/:kind/:externalId/resolve
|
|
17
|
+
* POST /api/users/unmapped/dismiss
|
|
18
|
+
* POST /api/users/unmapped/restore
|
|
17
19
|
* GET /api/users/:id
|
|
18
20
|
* PATCH /api/users/:id
|
|
19
21
|
* POST /api/users/:id/mcp-tokens
|
|
@@ -61,6 +63,12 @@ import {
|
|
|
61
63
|
OperatorGrantedTargetError,
|
|
62
64
|
setUserRoles,
|
|
63
65
|
} from "../be/rbac-roles";
|
|
66
|
+
import {
|
|
67
|
+
type DismissedUnmapped,
|
|
68
|
+
dismissedNamespace,
|
|
69
|
+
dismissUnmappedIdentity,
|
|
70
|
+
restoreUnmappedIdentity,
|
|
71
|
+
} from "../be/unmapped-identities";
|
|
64
72
|
import {
|
|
65
73
|
createUserMergeJob,
|
|
66
74
|
findActiveUserMergeJob,
|
|
@@ -183,6 +191,16 @@ const UnmappedIdentitySchema = z.object({
|
|
|
183
191
|
count: z.number(),
|
|
184
192
|
sampleEventType: z.string().nullable(),
|
|
185
193
|
sampleContext: z.unknown().nullable(),
|
|
194
|
+
/** Set only on rows from `?dismissed=true`. */
|
|
195
|
+
dismissedAt: z.string().optional(),
|
|
196
|
+
dismissedBy: z.string().optional(),
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
const UnmappedIdentityRefsSchema = z.object({
|
|
200
|
+
identities: z
|
|
201
|
+
.array(z.object({ kind: z.string().min(1), externalId: z.string().min(1) }))
|
|
202
|
+
.min(1)
|
|
203
|
+
.max(500),
|
|
186
204
|
});
|
|
187
205
|
|
|
188
206
|
// ─── Route Definitions ───────────────────────────────────────────────────────
|
|
@@ -292,6 +310,10 @@ const listUnmapped = route({
|
|
|
292
310
|
query: z.object({
|
|
293
311
|
kind: z.string().optional(),
|
|
294
312
|
limit: z.coerce.number().int().min(1).max(1000).optional(),
|
|
313
|
+
/** `true` lists the dismissed identities instead of the triage queue. */
|
|
314
|
+
dismissed: z.enum(["true", "false"]).optional(),
|
|
315
|
+
/** Logins ending in `[bot]` are hidden unless this is `true`. */
|
|
316
|
+
includeBots: z.enum(["true", "false"]).optional(),
|
|
295
317
|
}),
|
|
296
318
|
responses: {
|
|
297
319
|
200: {
|
|
@@ -334,6 +356,50 @@ const resolveUnmapped = route({
|
|
|
334
356
|
auth: { apiKey: true },
|
|
335
357
|
});
|
|
336
358
|
|
|
359
|
+
const DISMISS_RBAC = {
|
|
360
|
+
ungated:
|
|
361
|
+
"same posture as POST /api/users/unmapped/{kind}/{externalId}/resolve: bearer auth, guests rejected; it links and trusts nothing",
|
|
362
|
+
};
|
|
363
|
+
|
|
364
|
+
const dismissUnmapped = route({
|
|
365
|
+
method: "post",
|
|
366
|
+
path: "/api/users/unmapped/dismiss",
|
|
367
|
+
pattern: ["api", "users", "unmapped", "dismiss"],
|
|
368
|
+
summary:
|
|
369
|
+
"Dismiss unmapped identities: hide them from triage and stop recording them. Links nothing.",
|
|
370
|
+
tags: ["Users"],
|
|
371
|
+
body: UnmappedIdentityRefsSchema,
|
|
372
|
+
responses: {
|
|
373
|
+
200: {
|
|
374
|
+
description: "Identities moved to the ignore list",
|
|
375
|
+
schema: z.object({ dismissed: z.number() }),
|
|
376
|
+
},
|
|
377
|
+
400: { description: "Validation error" },
|
|
378
|
+
401: { description: "Unauthorized" },
|
|
379
|
+
},
|
|
380
|
+
auth: { apiKey: true },
|
|
381
|
+
rbac: DISMISS_RBAC,
|
|
382
|
+
});
|
|
383
|
+
|
|
384
|
+
const restoreUnmapped = route({
|
|
385
|
+
method: "post",
|
|
386
|
+
path: "/api/users/unmapped/restore",
|
|
387
|
+
pattern: ["api", "users", "unmapped", "restore"],
|
|
388
|
+
summary: "Undo a dismissal: return identities to the triage queue",
|
|
389
|
+
tags: ["Users"],
|
|
390
|
+
body: UnmappedIdentityRefsSchema,
|
|
391
|
+
responses: {
|
|
392
|
+
200: {
|
|
393
|
+
description: "Count of identities taken off the ignore list",
|
|
394
|
+
schema: z.object({ restored: z.number() }),
|
|
395
|
+
},
|
|
396
|
+
400: { description: "Validation error" },
|
|
397
|
+
401: { description: "Unauthorized" },
|
|
398
|
+
},
|
|
399
|
+
auth: { apiKey: true },
|
|
400
|
+
rbac: DISMISS_RBAC,
|
|
401
|
+
});
|
|
402
|
+
|
|
337
403
|
const getUserRoute = route({
|
|
338
404
|
method: "get",
|
|
339
405
|
path: "/api/users/{id}",
|
|
@@ -863,6 +929,34 @@ async function collectUnmappedForKind(kind: string, limit: number) {
|
|
|
863
929
|
return Array.from(byId.values());
|
|
864
930
|
}
|
|
865
931
|
|
|
932
|
+
/** The ignore list for one kind, in the triage-row shape plus who dismissed it and when. */
|
|
933
|
+
async function collectDismissedForKind(kind: string, limit: number) {
|
|
934
|
+
const rows = await listKv(dismissedNamespace(kind), { limit, offset: 0 });
|
|
935
|
+
return rows.map((row) => {
|
|
936
|
+
const saved = (row.value ?? {}) as Partial<DismissedUnmapped>;
|
|
937
|
+
const meta = (saved.meta ?? {}) as Record<string, unknown>;
|
|
938
|
+
return {
|
|
939
|
+
kind,
|
|
940
|
+
externalId: row.key,
|
|
941
|
+
lastSeenAt: typeof meta.lastSeenAt === "string" ? meta.lastSeenAt : null,
|
|
942
|
+
count: Number(saved.count ?? 0),
|
|
943
|
+
sampleEventType: typeof meta.sampleEventType === "string" ? meta.sampleEventType : null,
|
|
944
|
+
sampleContext: meta.sampleContext ?? null,
|
|
945
|
+
dismissedAt: saved.dismissedAt,
|
|
946
|
+
dismissedBy: saved.dismissedBy,
|
|
947
|
+
};
|
|
948
|
+
});
|
|
949
|
+
}
|
|
950
|
+
|
|
951
|
+
/** A bulk body can name one identity twice; act on it once. */
|
|
952
|
+
function uniqueIdentities<T extends { kind: string; externalId: string }>(identities: T[]): T[] {
|
|
953
|
+
const seen = new Map<string, T>();
|
|
954
|
+
for (const identity of identities) {
|
|
955
|
+
seen.set(`${identity.kind}\u0000${identity.externalId}`, identity);
|
|
956
|
+
}
|
|
957
|
+
return [...seen.values()];
|
|
958
|
+
}
|
|
959
|
+
|
|
866
960
|
const DEFAULT_CONNECTOR_CONNECT_URL = "https://mcp.agent-swarm.dev/connections";
|
|
867
961
|
|
|
868
962
|
/**
|
|
@@ -1034,7 +1128,22 @@ export async function handleUsers(
|
|
|
1034
1128
|
if (!parsed) return true;
|
|
1035
1129
|
const limit = parsed.query.limit ?? 100;
|
|
1036
1130
|
const kinds = parsed.query.kind ? [parsed.query.kind] : UNMAPPED_KINDS;
|
|
1037
|
-
const
|
|
1131
|
+
const collect =
|
|
1132
|
+
parsed.query.dismissed === "true" ? collectDismissedForKind : collectUnmappedForKind;
|
|
1133
|
+
const includeBots = parsed.query.includeBots === "true";
|
|
1134
|
+
// A sighting that raced a dismiss can re-create a tracker row; the ignore list still wins.
|
|
1135
|
+
const dismissedKeys =
|
|
1136
|
+
parsed.query.dismissed === "true"
|
|
1137
|
+
? new Set<string>()
|
|
1138
|
+
: new Set(
|
|
1139
|
+
(await Promise.all(kinds.map((k) => collectDismissedForKind(k, 1000))))
|
|
1140
|
+
.flat()
|
|
1141
|
+
.map((row) => `${row.kind}\u0000${row.externalId}`),
|
|
1142
|
+
);
|
|
1143
|
+
const rows = (await Promise.all(kinds.map((k) => collect(k, limit))))
|
|
1144
|
+
.flat()
|
|
1145
|
+
.filter((row) => includeBots || !row.externalId.endsWith("[bot]"))
|
|
1146
|
+
.filter((row) => !dismissedKeys.has(`${row.kind}\u0000${row.externalId}`));
|
|
1038
1147
|
rows.sort((a, b) => {
|
|
1039
1148
|
if (b.count !== a.count) return b.count - a.count;
|
|
1040
1149
|
const al = a.lastSeenAt ?? "";
|
|
@@ -1045,6 +1154,32 @@ export async function handleUsers(
|
|
|
1045
1154
|
return true;
|
|
1046
1155
|
}
|
|
1047
1156
|
|
|
1157
|
+
// ─── POST /api/users/unmapped/dismiss | restore ─────────────────────────────
|
|
1158
|
+
if (dismissUnmapped.match(req.method, pathSegments)) {
|
|
1159
|
+
const parsed = await dismissUnmapped.parse(req, res, pathSegments, queryParams);
|
|
1160
|
+
if (!parsed) return true;
|
|
1161
|
+
const actor = getOperatorActor(req, res);
|
|
1162
|
+
if (!actor) return true;
|
|
1163
|
+
const identities = uniqueIdentities(parsed.body.identities);
|
|
1164
|
+
for (const { kind, externalId } of identities) {
|
|
1165
|
+
await dismissUnmappedIdentity(kind, externalId, `${actor.kind}:${actor.id}`);
|
|
1166
|
+
}
|
|
1167
|
+
dismissUnmapped.respond(res, 200, { dismissed: identities.length });
|
|
1168
|
+
return true;
|
|
1169
|
+
}
|
|
1170
|
+
|
|
1171
|
+
if (restoreUnmapped.match(req.method, pathSegments)) {
|
|
1172
|
+
const parsed = await restoreUnmapped.parse(req, res, pathSegments, queryParams);
|
|
1173
|
+
if (!parsed) return true;
|
|
1174
|
+
if (!getOperatorActor(req, res)) return true;
|
|
1175
|
+
let restored = 0;
|
|
1176
|
+
for (const { kind, externalId } of uniqueIdentities(parsed.body.identities)) {
|
|
1177
|
+
if (await restoreUnmappedIdentity(kind, externalId)) restored++;
|
|
1178
|
+
}
|
|
1179
|
+
restoreUnmapped.respond(res, 200, { restored });
|
|
1180
|
+
return true;
|
|
1181
|
+
}
|
|
1182
|
+
|
|
1048
1183
|
// ─── POST /api/users/unmapped/:kind/:externalId/resolve ───────────────────
|
|
1049
1184
|
if (resolveUnmapped.match(req.method, pathSegments)) {
|
|
1050
1185
|
const parsed = await resolveUnmapped.parse(req, res, pathSegments, queryParams);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { getWorkflowRun } from "../be/db";
|
|
4
|
+
import { isReservedProviderEvent } from "../event-waits";
|
|
4
5
|
import { workflowEventBus } from "../workflows/event-bus";
|
|
5
6
|
import { route } from "./route-def";
|
|
6
7
|
import { jsonError } from "./utils";
|
|
@@ -39,6 +40,7 @@ const runScopedSignalRoute = route({
|
|
|
39
40
|
}),
|
|
40
41
|
},
|
|
41
42
|
404: { description: "Workflow run not found" },
|
|
43
|
+
403: { description: "Event name is reserved for provider webhooks" },
|
|
42
44
|
400: { description: "Validation error" },
|
|
43
45
|
},
|
|
44
46
|
auth: { apiKey: true },
|
|
@@ -70,11 +72,14 @@ const globalSignalRoute = route({
|
|
|
70
72
|
name: z.string(),
|
|
71
73
|
}),
|
|
72
74
|
},
|
|
75
|
+
403: { description: "Event name is reserved for provider webhooks" },
|
|
73
76
|
400: { description: "Validation error" },
|
|
74
77
|
},
|
|
75
78
|
auth: { apiKey: true },
|
|
76
79
|
});
|
|
77
80
|
|
|
81
|
+
const RESERVED_EVENT_MESSAGE = "Event name is reserved for provider webhooks";
|
|
82
|
+
|
|
78
83
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
79
84
|
|
|
80
85
|
export async function handleWorkflowEvents(
|
|
@@ -88,6 +93,10 @@ export async function handleWorkflowEvents(
|
|
|
88
93
|
const parsed = await runScopedSignalRoute.parse(req, res, pathSegments, queryParams);
|
|
89
94
|
if (!parsed) return true;
|
|
90
95
|
|
|
96
|
+
if (isReservedProviderEvent(parsed.body.name)) {
|
|
97
|
+
jsonError(res, RESERVED_EVENT_MESSAGE, 403);
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
91
100
|
const run = await getWorkflowRun(parsed.params.runId);
|
|
92
101
|
if (!run) {
|
|
93
102
|
jsonError(res, "Workflow run not found", 404);
|
|
@@ -110,6 +119,10 @@ export async function handleWorkflowEvents(
|
|
|
110
119
|
const parsed = await globalSignalRoute.parse(req, res, pathSegments, queryParams);
|
|
111
120
|
if (!parsed) return true;
|
|
112
121
|
|
|
122
|
+
if (isReservedProviderEvent(parsed.body.name)) {
|
|
123
|
+
jsonError(res, RESERVED_EVENT_MESSAGE, 403);
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
113
126
|
workflowEventBus.emit(parsed.body.name, parsed.body.payload ?? {});
|
|
114
127
|
|
|
115
128
|
globalSignalRoute.respond(res, 200, { ok: true, name: parsed.body.name });
|
package/src/http/workflows.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
4
|
-
import { resolveHttpAuditUserId } from "../be/audit-user";
|
|
4
|
+
import { resolveHttpAuditUserId, resolveHttpRequesterUserId } from "../be/audit-user";
|
|
5
5
|
import {
|
|
6
6
|
createWorkflow,
|
|
7
7
|
deleteWorkflow,
|
|
@@ -727,13 +727,13 @@ export async function handleWorkflows(
|
|
|
727
727
|
return true;
|
|
728
728
|
}
|
|
729
729
|
|
|
730
|
-
const refKeys = serverRefInputKeys(parsed.body.input);
|
|
730
|
+
const refKeys = serverRefInputKeys(parsed.body.input, parsed.body.params);
|
|
731
731
|
if (refKeys.length > 0 && (await requestSecretReadScope(req)) !== "all") {
|
|
732
732
|
jsonError(res, serverRefInputDeniedMessage(refKeys), 403);
|
|
733
733
|
return true;
|
|
734
734
|
}
|
|
735
735
|
|
|
736
|
-
const trustedUserId = await
|
|
736
|
+
const trustedUserId = await resolveHttpRequesterUserId(req, myAgentId);
|
|
737
737
|
let key: string | undefined;
|
|
738
738
|
try {
|
|
739
739
|
key = parsed.body.key
|
|
@@ -867,7 +867,10 @@ export async function handleWorkflows(
|
|
|
867
867
|
const updateArgs: Omit<Parameters<typeof updateWorkflow>[1], "definition"> = {};
|
|
868
868
|
if (parsed.body.key !== undefined) {
|
|
869
869
|
try {
|
|
870
|
-
updateArgs.key = await authorizeAssetKeyWrite(
|
|
870
|
+
updateArgs.key = await authorizeAssetKeyWrite(
|
|
871
|
+
parsed.body.key,
|
|
872
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
873
|
+
);
|
|
871
874
|
} catch (error) {
|
|
872
875
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
873
876
|
jsonError(res, error.message, error.statusCode);
|
|
@@ -959,11 +962,15 @@ export async function handleWorkflows(
|
|
|
959
962
|
}
|
|
960
963
|
}
|
|
961
964
|
|
|
962
|
-
// New ref input, or a new definition over stored ref input,
|
|
963
|
-
// server-resolved values go:
|
|
964
|
-
const refKeys =
|
|
965
|
-
body.input !== undefined
|
|
966
|
-
|
|
965
|
+
// New ref input or params, or a new definition over stored ref input,
|
|
966
|
+
// decides where server-resolved values go: all need config.read.secrets.
|
|
967
|
+
const refKeys =
|
|
968
|
+
body.input !== undefined || body.params !== undefined || body.definition
|
|
969
|
+
? serverRefInputKeys(
|
|
970
|
+
body.input !== undefined ? body.input : existing.input,
|
|
971
|
+
body.params !== undefined ? body.params : existing.params,
|
|
972
|
+
)
|
|
973
|
+
: [];
|
|
967
974
|
if (refKeys.length > 0 && (await requestSecretReadScope(req)) !== "all") {
|
|
968
975
|
jsonError(res, serverRefInputDeniedMessage(refKeys), 403);
|
|
969
976
|
return true;
|
|
@@ -973,7 +980,10 @@ export async function handleWorkflows(
|
|
|
973
980
|
let key: string | undefined;
|
|
974
981
|
if (body.key !== undefined) {
|
|
975
982
|
try {
|
|
976
|
-
key = await authorizeAssetKeyWrite(
|
|
983
|
+
key = await authorizeAssetKeyWrite(
|
|
984
|
+
body.key,
|
|
985
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
986
|
+
);
|
|
977
987
|
} catch (error) {
|
|
978
988
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
979
989
|
jsonError(res, error.message, error.statusCode);
|
|
@@ -1097,7 +1107,7 @@ export async function handleWorkflows(
|
|
|
1097
1107
|
runId = await startWorkflowExecution(workflow, body, getExecutorRegistry(), {
|
|
1098
1108
|
triggerType: "api",
|
|
1099
1109
|
triggeredByAgentId: myAgentId,
|
|
1100
|
-
requestedByUserId: (await
|
|
1110
|
+
requestedByUserId: (await resolveHttpRequesterUserId(req, myAgentId)) ?? undefined,
|
|
1101
1111
|
detach: parsed.query.wait === "false",
|
|
1102
1112
|
// Recorded in the run's own transaction, before the walk starts.
|
|
1103
1113
|
accept: claim
|
package/src/linear/sync.ts
CHANGED
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
getTrackerSyncByExternalId,
|
|
15
15
|
updateTrackerSync,
|
|
16
16
|
} from "../be/db-queries/tracker";
|
|
17
|
+
import { isUnmappedIdentityDismissed } from "../be/unmapped-identities";
|
|
17
18
|
import { findOrCreateUserByEmail, findUserByExternalId, linkIdentity } from "../be/users";
|
|
18
19
|
import { ensureToken } from "../oauth/ensure-token";
|
|
19
20
|
import { resolveTemplate } from "../prompts/resolver";
|
|
@@ -431,7 +432,8 @@ async function resolveLinearActor(
|
|
|
431
432
|
return linked.id;
|
|
432
433
|
}
|
|
433
434
|
|
|
434
|
-
// No mapping + no inline email → unmapped tracker (Q14/Q17.D).
|
|
435
|
+
// No mapping + no inline email → unmapped tracker (Q14/Q17.D), unless an operator dismissed it.
|
|
436
|
+
if (await isUnmappedIdentityDismissed("linear", linearUserId)) return undefined;
|
|
435
437
|
await upsertKv({
|
|
436
438
|
namespace: UNMAPPED_NAMESPACE,
|
|
437
439
|
key: `${linearUserId}:meta`,
|
|
@@ -44,6 +44,8 @@ type McpHttpClientOptions = {
|
|
|
44
44
|
omitEmptyAuthHeaders?: boolean;
|
|
45
45
|
/** Revalidate the resolved request URL immediately before every fetch. */
|
|
46
46
|
validateUrl?: (url: string) => void;
|
|
47
|
+
/** Fetch used for every request. Defaults to the global fetch. */
|
|
48
|
+
fetch?: typeof fetch;
|
|
47
49
|
};
|
|
48
50
|
|
|
49
51
|
export class McpHttpClient {
|
|
@@ -91,7 +93,7 @@ export class McpHttpClient {
|
|
|
91
93
|
const url = this.useRawUrl ? this.baseUrl : `${this.baseUrl}/mcp`;
|
|
92
94
|
try {
|
|
93
95
|
this.options.validateUrl?.(url);
|
|
94
|
-
const res = await fetch(url, {
|
|
96
|
+
const res = await (this.options.fetch ?? fetch)(url, {
|
|
95
97
|
method: "POST",
|
|
96
98
|
headers,
|
|
97
99
|
body: JSON.stringify(body),
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { createSsrfGuardedFetch } from "@/utils/egress-guard";
|
|
1
2
|
import { scrubSecrets } from "@/utils/secret-scrubber";
|
|
2
3
|
import { assertOAuthEgressUrlSafe } from "./app-validation";
|
|
4
|
+
import { publicEndpointSsrfOptions } from "./mcp-wrapper";
|
|
3
5
|
|
|
4
6
|
/**
|
|
5
7
|
* Best-effort account identity captured after a successful token exchange.
|
|
@@ -66,7 +68,10 @@ export async function captureIdentity(input: {
|
|
|
66
68
|
const controller = new AbortController();
|
|
67
69
|
const timer = setTimeout(() => controller.abort(), IDENTITY_FETCH_TIMEOUT_MS);
|
|
68
70
|
try {
|
|
69
|
-
|
|
71
|
+
// The guarded fetch also checks the resolved address, so a public name
|
|
72
|
+
// that resolves to a private one never receives the bearer.
|
|
73
|
+
const guardedFetch = createSsrfGuardedFetch(publicEndpointSsrfOptions());
|
|
74
|
+
const response = await guardedFetch(input.userinfoUrl, {
|
|
70
75
|
headers: {
|
|
71
76
|
authorization: `Bearer ${input.accessToken}`,
|
|
72
77
|
accept: "application/json",
|
package/src/oauth/mcp-wrapper.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import * as oauth from "oauth4webapi";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
assertUrlSafe,
|
|
4
|
+
createSsrfGuardedFetch,
|
|
5
|
+
type SsrfGuardOptions,
|
|
6
|
+
} from "../utils/egress-guard";
|
|
3
7
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
4
8
|
import { isDevOrTestNodeEnv } from "../utils/node-env";
|
|
5
9
|
import { registerVolatileSecret, scrubSecrets } from "../utils/secret-scrubber";
|
|
@@ -74,8 +78,11 @@ async function safeFetch(
|
|
|
74
78
|
init?: RequestInit,
|
|
75
79
|
timeoutMs: number = DEFAULT_FETCH_TIMEOUT_MS,
|
|
76
80
|
): Promise<Response> {
|
|
77
|
-
|
|
78
|
-
return
|
|
81
|
+
// Checks every redirect hop and the resolved address, not just the URL string.
|
|
82
|
+
return createSsrfGuardedFetch(mcpOAuthSsrfOptions())(url, {
|
|
83
|
+
...init,
|
|
84
|
+
signal: init?.signal ?? AbortSignal.timeout(timeoutMs),
|
|
85
|
+
});
|
|
79
86
|
}
|
|
80
87
|
|
|
81
88
|
// ─── Protected Resource Metadata (RFC 9728) ──────────────────────────────────
|
package/src/oauth/wrapper.ts
CHANGED
|
@@ -7,6 +7,8 @@ import {
|
|
|
7
7
|
storeOAuthTokens,
|
|
8
8
|
updateOAuthTokensAfterRefresh,
|
|
9
9
|
} from "../be/db-queries/oauth";
|
|
10
|
+
import { createSsrfGuardedFetch } from "../utils/egress-guard";
|
|
11
|
+
import { publicEndpointSsrfOptions } from "./mcp-wrapper";
|
|
10
12
|
|
|
11
13
|
// ─── Types ───────────────────────────────────────────────────────────────────
|
|
12
14
|
|
|
@@ -145,6 +147,16 @@ function tokenRequestInit(
|
|
|
145
147
|
return { headers, body: new URLSearchParams(bodyParams).toString() };
|
|
146
148
|
}
|
|
147
149
|
|
|
150
|
+
/**
|
|
151
|
+
* The token endpoint receives the client secret plus the code or refresh
|
|
152
|
+
* token, so it goes through the guarded fetch: a public name that resolves to
|
|
153
|
+
* a private address is refused, and each redirect hop is re-checked. Built per
|
|
154
|
+
* call because the SSRF options read the environment.
|
|
155
|
+
*/
|
|
156
|
+
function tokenEndpointFetch(): typeof fetch {
|
|
157
|
+
return createSsrfGuardedFetch(publicEndpointSsrfOptions());
|
|
158
|
+
}
|
|
159
|
+
|
|
148
160
|
export interface OAuthTokenResponse {
|
|
149
161
|
accessToken: string;
|
|
150
162
|
refreshToken?: string;
|
|
@@ -165,7 +177,7 @@ export async function exchangeAuthorizationCode(
|
|
|
165
177
|
config: OAuthProviderConfig,
|
|
166
178
|
params: { code: string; codeVerifier: string; redirectUri: string },
|
|
167
179
|
): Promise<OAuthTokenResponse> {
|
|
168
|
-
const response = await
|
|
180
|
+
const response = await tokenEndpointFetch()(config.tokenUrl, {
|
|
169
181
|
method: "POST",
|
|
170
182
|
...tokenRequestInit(config, {
|
|
171
183
|
grant_type: "authorization_code",
|
|
@@ -242,7 +254,7 @@ export async function refreshTokenGrant(
|
|
|
242
254
|
config: OAuthProviderConfig,
|
|
243
255
|
refreshToken: string,
|
|
244
256
|
): Promise<OAuthTokenResponse> {
|
|
245
|
-
const response = await
|
|
257
|
+
const response = await tokenEndpointFetch()(config.tokenUrl, {
|
|
246
258
|
method: "POST",
|
|
247
259
|
...tokenRequestInit(config, {
|
|
248
260
|
grant_type: "refresh_token",
|
|
@@ -297,7 +309,7 @@ export async function performTokenRefreshRequest(
|
|
|
297
309
|
scope?: string;
|
|
298
310
|
expiresAt: string | null;
|
|
299
311
|
}> {
|
|
300
|
-
const response = await
|
|
312
|
+
const response = await tokenEndpointFetch()(config.tokenUrl, {
|
|
301
313
|
method: "POST",
|
|
302
314
|
...tokenRequestInit(config, {
|
|
303
315
|
grant_type: "refresh_token",
|
|
@@ -21,7 +21,12 @@
|
|
|
21
21
|
|
|
22
22
|
import type { ProviderTraits } from "../providers/types";
|
|
23
23
|
import { getSlackConfiguration } from "../slack/config";
|
|
24
|
-
import
|
|
24
|
+
import {
|
|
25
|
+
agentsMayMerge,
|
|
26
|
+
type ProviderName,
|
|
27
|
+
type RepoMergePolicy,
|
|
28
|
+
type RequestCompositionPartInput,
|
|
29
|
+
} from "../types";
|
|
25
30
|
import { agentFsFileLinkQuery, getAppUrl, resolveAgentFsLinkBase } from "../utils/constants";
|
|
26
31
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
27
32
|
import { isSteeringEnabled } from "../utils/steering-enabled";
|
|
@@ -155,6 +160,7 @@ export type RepoContext = {
|
|
|
155
160
|
mergeChecks: string[];
|
|
156
161
|
allowMerge?: boolean;
|
|
157
162
|
review: string[];
|
|
163
|
+
mergePolicy?: RepoMergePolicy;
|
|
158
164
|
} | null;
|
|
159
165
|
};
|
|
160
166
|
|
|
@@ -506,7 +512,7 @@ export const getTaskContextPrompt = async (args: TaskContextPromptArgs): Promise
|
|
|
506
512
|
if (args.repoContext) {
|
|
507
513
|
const repoResult = await resolveTemplateAsync(
|
|
508
514
|
"system.agent.repository",
|
|
509
|
-
renderRepositoryVars(args.repoContext, { hasMcp, hasLocalEnv, provider }),
|
|
515
|
+
await renderRepositoryVars(args.repoContext, { hasMcp, hasLocalEnv, provider }),
|
|
510
516
|
);
|
|
511
517
|
prompt += repoResult.text;
|
|
512
518
|
}
|
|
@@ -577,14 +583,25 @@ function renderToolsAndSkillsVars(input: {
|
|
|
577
583
|
};
|
|
578
584
|
}
|
|
579
585
|
|
|
586
|
+
/** The mergePolicy record's swarm auto-merge line, or "" when the repo has no record. */
|
|
587
|
+
function renderSwarmAutoMerge(policy: RepoMergePolicy | undefined): string {
|
|
588
|
+
const auto = policy?.autoMerge;
|
|
589
|
+
if (!auto) return "";
|
|
590
|
+
if (!auto.enabled) return "\n- Swarm auto-merge: off";
|
|
591
|
+
const parts = [`Swarm auto-merge: on (minimum score ${auto.threshold})`];
|
|
592
|
+
if (auto.classes.length > 0) parts.push(`classes: ${auto.classes.join(", ")}`);
|
|
593
|
+
if (auto.riskyPaths.length > 0) parts.push(`never for paths: ${auto.riskyPaths.join(", ")}`);
|
|
594
|
+
return `\n- ${parts.join("; ")}`;
|
|
595
|
+
}
|
|
596
|
+
|
|
580
597
|
/**
|
|
581
598
|
* Dynamic parts of `system.agent.repository`. Same split as the tools section:
|
|
582
599
|
* the heading lives in the template, the per-task pieces are built here.
|
|
583
600
|
*/
|
|
584
|
-
function renderRepositoryVars(
|
|
601
|
+
async function renderRepositoryVars(
|
|
585
602
|
repo: RepoContext,
|
|
586
603
|
ctx: { hasMcp: boolean; hasLocalEnv: boolean; provider: string },
|
|
587
|
-
): Record<string, string
|
|
604
|
+
): Promise<Record<string, string>> {
|
|
588
605
|
const vars: Record<string, string> = {
|
|
589
606
|
clone_note: "",
|
|
590
607
|
warning: "",
|
|
@@ -629,7 +646,11 @@ function renderRepositoryVars(
|
|
|
629
646
|
section += `\n### Repository Guidelines\n\nNo repository guidelines are defined. Ask the lead before you push.\n`;
|
|
630
647
|
} else {
|
|
631
648
|
const hasAnyContent =
|
|
632
|
-
g.prChecks.length > 0 ||
|
|
649
|
+
g.prChecks.length > 0 ||
|
|
650
|
+
g.mergeChecks.length > 0 ||
|
|
651
|
+
g.review.length > 0 ||
|
|
652
|
+
agentsMayMerge(g) ||
|
|
653
|
+
g.mergePolicy !== undefined;
|
|
633
654
|
if (hasAnyContent) {
|
|
634
655
|
section += `\n### Repository Guidelines (MANDATORY)\n\n`;
|
|
635
656
|
if (g.prChecks.length > 0) {
|
|
@@ -639,14 +660,15 @@ function renderRepositoryVars(
|
|
|
639
660
|
});
|
|
640
661
|
section += `If ANY check fails, fix the issue before pushing. Do NOT push code with failing checks.\nDo NOT use \`--no-verify\` or any flag that bypasses git hooks.\n\n`;
|
|
641
662
|
}
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
}
|
|
663
|
+
const mergePolicy = await resolveTemplateAsync("system.agent.repository.merge_policy", {
|
|
664
|
+
agents_may_merge: agentsMayMerge(g) ? "Allowed" : "Not allowed (default)",
|
|
665
|
+
swarm_auto_merge: renderSwarmAutoMerge(g.mergePolicy),
|
|
666
|
+
merge_checks:
|
|
667
|
+
g.mergeChecks.length > 0
|
|
668
|
+
? `\n- Before merging, verify:\n${g.mergeChecks.map((check) => ` - ${check}`).join("\n")}`
|
|
669
|
+
: "",
|
|
670
|
+
});
|
|
671
|
+
section += `${mergePolicy.text}\n`;
|
|
650
672
|
section += `\n`;
|
|
651
673
|
if (g.review.length > 0) {
|
|
652
674
|
section += `**Review Guidance:**\n`;
|
|
@@ -181,6 +181,7 @@ registerTemplate({
|
|
|
181
181
|
## Workspace
|
|
182
182
|
|
|
183
183
|
\`/workspace/personal/\` is yours. \`get-repos\` returns where a repository is cloned.
|
|
184
|
+
Worktrees without unsaved work are removed after your task. To keep one: \`git worktree lock <path>\`.
|
|
184
185
|
Your profile lives in the database. Edit it with \`update-profile\`: \`soulMd\`, \`identityMd\`, \`heartbeatMd\`, \`setupScript\`, \`toolsMd\`. The files in \`/workspace/\` are mirrors.
|
|
185
186
|
Your setup script runs at every container start.
|
|
186
187
|
\`/workspace/TOOLS.md\` holds your environment notes: repos, hosts, services, tool quirks. Read it when a task touches a repo, host, or service you have not used this session. Update it with \`update-profile\` \`toolsMd\`.
|
|
@@ -614,6 +615,31 @@ registerTemplate({
|
|
|
614
615
|
category: "system",
|
|
615
616
|
});
|
|
616
617
|
|
|
618
|
+
registerTemplate({
|
|
619
|
+
eventType: "system.agent.repository.merge_policy",
|
|
620
|
+
header: "",
|
|
621
|
+
defaultBody: `**Merge Policy:**
|
|
622
|
+
- Auto-merge: {{agents_may_merge}}{{swarm_auto_merge}}{{merge_checks}}`,
|
|
623
|
+
variables: [
|
|
624
|
+
{
|
|
625
|
+
name: "agents_may_merge",
|
|
626
|
+
description:
|
|
627
|
+
"'Allowed' or 'Not allowed (default)': the repo's mergePolicy.agentsMayMerge, else its allowMerge guideline.",
|
|
628
|
+
},
|
|
629
|
+
{
|
|
630
|
+
name: "swarm_auto_merge",
|
|
631
|
+
description:
|
|
632
|
+
"Lines for the repo's mergePolicy record (swarm auto-merge state, classes, threshold, risky paths). Empty when the repo has no record.",
|
|
633
|
+
},
|
|
634
|
+
{
|
|
635
|
+
name: "merge_checks",
|
|
636
|
+
description:
|
|
637
|
+
"The 'Before merging, verify' list from the repo's mergeChecks guideline. Empty when there are none.",
|
|
638
|
+
},
|
|
639
|
+
],
|
|
640
|
+
category: "system",
|
|
641
|
+
});
|
|
642
|
+
|
|
617
643
|
// ============================================================================
|
|
618
644
|
// Scripts-only mode (code-mode). Rewrite deferred; see design section 8.
|
|
619
645
|
// ============================================================================
|
|
@@ -427,7 +427,7 @@ const copilotTargetProfile: AcpTargetProfile = {
|
|
|
427
427
|
},
|
|
428
428
|
};
|
|
429
429
|
|
|
430
|
-
/** Qwen Code's `--auth-type` choices (0.27.
|
|
430
|
+
/** Qwen Code's `--auth-type` choices (0.27.3). `qwen-oauth` and `qwen-subscription` need an interactive sign-in, so they are left out. */
|
|
431
431
|
const QWEN_AUTH_TYPES = ["openai", "openai-responses", "anthropic", "gemini", "vertex-ai"] as const;
|
|
432
432
|
|
|
433
433
|
// Qwen Code is a Gemini CLI fork: QWEN_SYSTEM_MD replaces its built-in prompt
|
|
@@ -480,7 +480,7 @@ const qwenTargetProfile: AcpTargetProfile = {
|
|
|
480
480
|
* Kiro CLI reads its prompt from a Kiro agent config, not from a flag or an
|
|
481
481
|
* env var, so the swarm system prompt is not injected (as with OpenCode).
|
|
482
482
|
* Kiro advertises no ACP config options (checked on 2.29.1), so the model
|
|
483
|
-
* rides on argv as `--model`, which `kiro-cli acp` still accepts in 3.
|
|
483
|
+
* rides on argv as `--model`, which `kiro-cli acp` still accepts in 3.3.0.
|
|
484
484
|
*/
|
|
485
485
|
const kiroTargetProfile: AcpTargetProfile = {
|
|
486
486
|
target: "kiro",
|
|
@@ -45,7 +45,7 @@ import type {
|
|
|
45
45
|
* default; the image installs exactly this version and the per-task settings
|
|
46
46
|
* set `amp.updates.mode: "disabled"`. Bump it deliberately, with a live run.
|
|
47
47
|
*/
|
|
48
|
-
export const AMP_PACKAGE = "@ampcode/cli@0.0.
|
|
48
|
+
export const AMP_PACKAGE = "@ampcode/cli@0.0.1794571247-g07b20f";
|
|
49
49
|
|
|
50
50
|
/** MCP server name. Amp exposes its tools as `agent_swarm` / `store_progress` (dashes become underscores). */
|
|
51
51
|
const AMP_MCP_SERVER_NAME = "agent-swarm";
|
|
@@ -37,7 +37,7 @@ import type {
|
|
|
37
37
|
} from "./types";
|
|
38
38
|
|
|
39
39
|
// npm's `latest` is older and lacks the JSON/stdin contract used here.
|
|
40
|
-
export const DSH_PACKAGE = "@deepseek-ai/dsh@0.2.2-rc.
|
|
40
|
+
export const DSH_PACKAGE = "@deepseek-ai/dsh@0.2.2-rc.3";
|
|
41
41
|
|
|
42
42
|
export function checkDshCredentials(env: Record<string, string | undefined>): CredStatus {
|
|
43
43
|
return env.DEEPSEEK_API_KEY?.trim() || env.OPENROUTER_API_KEY?.trim()
|
|
@@ -1085,6 +1085,7 @@ export class OpencodeAdapter implements ProviderAdapter {
|
|
|
1085
1085
|
},
|
|
1086
1086
|
...(billing ? { onOpenRouterResponse: (response) => billing.observe(response) } : {}),
|
|
1087
1087
|
onContext: (event) => onContext?.(event),
|
|
1088
|
+
mcpServers: Object.keys(mcp),
|
|
1088
1089
|
}),
|
|
1089
1090
|
],
|
|
1090
1091
|
log: {
|