@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
|
@@ -0,0 +1,265 @@
|
|
|
1
|
+
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import {
|
|
4
|
+
applySheetOp,
|
|
5
|
+
type EmbedActor,
|
|
6
|
+
ObjectEmbedError,
|
|
7
|
+
readObject,
|
|
8
|
+
saveBoardContent,
|
|
9
|
+
} from "../be/primitives/object-embed";
|
|
10
|
+
import type { PrimitiveObject } from "../be/primitives/objects";
|
|
11
|
+
import { MAX_OBJECT_BYTES } from "../be/primitives/write-object";
|
|
12
|
+
import { findUserById } from "../be/users";
|
|
13
|
+
import { can } from "../rbac";
|
|
14
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
15
|
+
import { dashboardUserIdHeader } from "./favorite-owner";
|
|
16
|
+
import { authUser, isOperatorAuth, resolveRequestPrincipal } from "./request-principal";
|
|
17
|
+
import { route } from "./route-def";
|
|
18
|
+
import { json, jsonError } from "./utils";
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Boards and sheets for people (an app's ObjectEmbed, a page's
|
|
22
|
+
* `<swarm-object>`). Agents use the board-* and sheet-* tools instead.
|
|
23
|
+
* The service (src/be/primitives/object-embed.ts) acts as the object's owner
|
|
24
|
+
* agent on agent-fs; swarm RBAC (`objects.read`, `objects.write`) is the gate.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
const ObjectSchema = z.object({
|
|
28
|
+
id: z.string(),
|
|
29
|
+
kind: z.string(),
|
|
30
|
+
orgId: z.string(),
|
|
31
|
+
driveId: z.string(),
|
|
32
|
+
path: z.string(),
|
|
33
|
+
title: z.string().nullable(),
|
|
34
|
+
fileVersion: z.number().nullable(),
|
|
35
|
+
ownerAgentId: z.string().nullable(),
|
|
36
|
+
createdAt: z.string(),
|
|
37
|
+
updatedAt: z.string(),
|
|
38
|
+
link: z.string().nullable(),
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
const params = z.object({ id: z.string().uuid().describe("Object id (`swarm.id` in the file)") });
|
|
42
|
+
|
|
43
|
+
const CellSchema = z.union([z.number(), z.string(), z.boolean(), z.null()]);
|
|
44
|
+
const CellRowsSchema = z.array(z.array(CellSchema));
|
|
45
|
+
|
|
46
|
+
const objectErrors = {
|
|
47
|
+
400: { description: "Invalid input, or the object is not the kind this route edits" },
|
|
48
|
+
403: {
|
|
49
|
+
description:
|
|
50
|
+
"Permission denied, a page guest, a read-only page session, or an object off the shared drive",
|
|
51
|
+
},
|
|
52
|
+
404: { description: "No such object, or its file is gone" },
|
|
53
|
+
503: { description: "The owner agent has no agent-fs key on the object's drive" },
|
|
54
|
+
} as const;
|
|
55
|
+
|
|
56
|
+
const getObjectRoute = route({
|
|
57
|
+
method: "get",
|
|
58
|
+
path: "/api/objects/{id}",
|
|
59
|
+
pattern: ["api", "objects", null],
|
|
60
|
+
summary: "Read a board or sheet on the shared drive, or confirm it is unchanged",
|
|
61
|
+
tags: ["Objects"],
|
|
62
|
+
params,
|
|
63
|
+
query: z.object({
|
|
64
|
+
knownVersion: z.coerce
|
|
65
|
+
.number()
|
|
66
|
+
.int()
|
|
67
|
+
.min(0)
|
|
68
|
+
.optional()
|
|
69
|
+
.describe("The version the caller holds. A match answers `unchanged: true` with no content"),
|
|
70
|
+
}),
|
|
71
|
+
rbac: { permission: "objects.read" },
|
|
72
|
+
responses: {
|
|
73
|
+
200: {
|
|
74
|
+
description: "The object with its content, or `unchanged: true` with no content",
|
|
75
|
+
schema: z.object({
|
|
76
|
+
object: ObjectSchema,
|
|
77
|
+
version: z.number().nullable(),
|
|
78
|
+
unchanged: z.boolean(),
|
|
79
|
+
content: z.unknown().optional(),
|
|
80
|
+
}),
|
|
81
|
+
},
|
|
82
|
+
...objectErrors,
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
const putContentRoute = route({
|
|
87
|
+
method: "put",
|
|
88
|
+
path: "/api/objects/{id}/content",
|
|
89
|
+
pattern: ["api", "objects", null, "content"],
|
|
90
|
+
summary: "Save a board's full Excalidraw scene, guarded by its agent-fs version",
|
|
91
|
+
tags: ["Objects"],
|
|
92
|
+
params,
|
|
93
|
+
body: z.object({
|
|
94
|
+
content: z.record(z.string(), z.unknown()).describe("The Excalidraw scene"),
|
|
95
|
+
ifMatch: z.number().int().min(0).describe("The version the scene was edited from"),
|
|
96
|
+
}),
|
|
97
|
+
// The scene is capped at 5 MiB as stored; the request may carry some slack.
|
|
98
|
+
maxBodyBytes: MAX_OBJECT_BYTES + 256 * 1024,
|
|
99
|
+
rbac: { permission: "objects.write" },
|
|
100
|
+
responses: {
|
|
101
|
+
200: {
|
|
102
|
+
description: "Saved",
|
|
103
|
+
schema: z.object({ object: ObjectSchema, version: z.number().nullable() }),
|
|
104
|
+
},
|
|
105
|
+
...objectErrors,
|
|
106
|
+
409: { description: "The board changed since `ifMatch`; the body carries its `version`" },
|
|
107
|
+
413: { description: "The scene exceeds 5 MiB" },
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
const sheetOpsRoute = route({
|
|
112
|
+
method: "post",
|
|
113
|
+
path: "/api/objects/{id}/sheet-ops",
|
|
114
|
+
pattern: ["api", "objects", null, "sheet-ops"],
|
|
115
|
+
summary: "Patch sheet cells; the server recalculates and merges concurrent edits",
|
|
116
|
+
tags: ["Objects"],
|
|
117
|
+
params,
|
|
118
|
+
body: z.discriminatedUnion("op", [
|
|
119
|
+
z.object({ op: z.literal("setRange"), range: z.string().min(1), values: CellRowsSchema }),
|
|
120
|
+
z.object({ op: z.literal("clearRange"), range: z.string().min(1) }),
|
|
121
|
+
z.object({ op: z.literal("appendRows"), tab: z.string().min(1), rows: CellRowsSchema }),
|
|
122
|
+
]),
|
|
123
|
+
maxBodyBytes: 2 * 1024 * 1024,
|
|
124
|
+
rbac: { permission: "objects.write" },
|
|
125
|
+
responses: {
|
|
126
|
+
200: {
|
|
127
|
+
description: "Applied: the range written and the new version",
|
|
128
|
+
schema: z.object({
|
|
129
|
+
op: z.enum(["setRange", "clearRange", "appendRows"]),
|
|
130
|
+
range: z.string(),
|
|
131
|
+
version: z.number(),
|
|
132
|
+
changed: z.number().optional(),
|
|
133
|
+
recalculated: z.number().optional(),
|
|
134
|
+
cleared: z.number().optional(),
|
|
135
|
+
}),
|
|
136
|
+
},
|
|
137
|
+
...objectErrors,
|
|
138
|
+
409: { description: "Other writers changed the sheet on every retry; try again" },
|
|
139
|
+
},
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
const publicObject = (o: PrimitiveObject): z.infer<typeof ObjectSchema> => ({
|
|
143
|
+
id: o.id,
|
|
144
|
+
kind: o.kind,
|
|
145
|
+
orgId: o.orgId,
|
|
146
|
+
driveId: o.driveId,
|
|
147
|
+
path: o.path,
|
|
148
|
+
title: o.title,
|
|
149
|
+
fileVersion: o.fileVersion,
|
|
150
|
+
ownerAgentId: o.ownerAgentId,
|
|
151
|
+
createdAt: o.createdAt,
|
|
152
|
+
updatedAt: o.updatedAt,
|
|
153
|
+
link: o.link,
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Check the verb and resolve who is acting. A password-page guest is refused
|
|
158
|
+
* (the page proxy already refuses it; this covers a direct call), and a page
|
|
159
|
+
* launched with the operator key may read but not write. Returns null after
|
|
160
|
+
* the refusal is written.
|
|
161
|
+
*/
|
|
162
|
+
async function authorize(
|
|
163
|
+
req: IncomingMessage,
|
|
164
|
+
res: ServerResponse,
|
|
165
|
+
myAgentId: string | undefined,
|
|
166
|
+
verb: "objects.read" | "objects.write",
|
|
167
|
+
): Promise<EmbedActor | null> {
|
|
168
|
+
const auth = getRequestAuth(req);
|
|
169
|
+
if (auth?.kind === "guest" || auth?.kind === "controller") {
|
|
170
|
+
jsonError(res, "sign in to the swarm to view this object", 403);
|
|
171
|
+
return null;
|
|
172
|
+
}
|
|
173
|
+
const principal = await resolveRequestPrincipal(req, myAgentId, {
|
|
174
|
+
unauthenticatedFallback: "operator",
|
|
175
|
+
});
|
|
176
|
+
const decision = principal
|
|
177
|
+
? can({ principal, verb, resource: { kind: "none" }, source: "http" })
|
|
178
|
+
: { allow: false as const, reason: "no authenticated principal" };
|
|
179
|
+
if (!decision.allow) {
|
|
180
|
+
jsonError(res, decision.reason, 403);
|
|
181
|
+
return null;
|
|
182
|
+
}
|
|
183
|
+
const via = auth?.page ? "page" : "app";
|
|
184
|
+
if (verb === "objects.write" && auth?.page && principal?.kind !== "user") {
|
|
185
|
+
jsonError(res, "this page session is read-only; sign in to the swarm to edit", 403);
|
|
186
|
+
return null;
|
|
187
|
+
}
|
|
188
|
+
let user = principal?.kind === "user" ? authUser(auth) : undefined;
|
|
189
|
+
// The dashboard sends the operator key plus the user it picked (as fs.ts does).
|
|
190
|
+
if (!user && isOperatorAuth(auth) && !auth.page && !myAgentId) {
|
|
191
|
+
const pickedId = dashboardUserIdHeader(req);
|
|
192
|
+
const picked = pickedId ? await findUserById(pickedId) : null;
|
|
193
|
+
if (picked?.status === "active" && !picked.mergedIntoUserId) user = picked;
|
|
194
|
+
}
|
|
195
|
+
return { via, userId: user?.id ?? null, name: user?.name ?? null };
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
function respondError(res: ServerResponse, error: unknown): boolean {
|
|
199
|
+
if (!(error instanceof ObjectEmbedError)) return false;
|
|
200
|
+
if (error.status === 409 && error.version !== undefined) {
|
|
201
|
+
json(res, { error: error.message, version: error.version }, 409);
|
|
202
|
+
} else {
|
|
203
|
+
jsonError(res, error.message, error.status);
|
|
204
|
+
}
|
|
205
|
+
return true;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
export async function handleObjects(
|
|
209
|
+
req: IncomingMessage,
|
|
210
|
+
res: ServerResponse,
|
|
211
|
+
pathSegments: string[],
|
|
212
|
+
queryParams: URLSearchParams,
|
|
213
|
+
myAgentId: string | undefined,
|
|
214
|
+
): Promise<boolean> {
|
|
215
|
+
if (getObjectRoute.match(req.method, pathSegments)) {
|
|
216
|
+
const parsed = await getObjectRoute.parse(req, res, pathSegments, queryParams);
|
|
217
|
+
if (!parsed) return true;
|
|
218
|
+
if (!(await authorize(req, res, myAgentId, "objects.read"))) return true;
|
|
219
|
+
try {
|
|
220
|
+
const read = await readObject(parsed.params.id, parsed.query.knownVersion);
|
|
221
|
+
getObjectRoute.respond(res, 200, { ...read, object: publicObject(read.object) });
|
|
222
|
+
} catch (error) {
|
|
223
|
+
if (!respondError(res, error)) throw error;
|
|
224
|
+
}
|
|
225
|
+
return true;
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
if (putContentRoute.match(req.method, pathSegments)) {
|
|
229
|
+
const parsed = await putContentRoute.parse(req, res, pathSegments, queryParams);
|
|
230
|
+
if (!parsed) return true;
|
|
231
|
+
const actor = await authorize(req, res, myAgentId, "objects.write");
|
|
232
|
+
if (!actor) return true;
|
|
233
|
+
try {
|
|
234
|
+
const saved = await saveBoardContent({
|
|
235
|
+
id: parsed.params.id,
|
|
236
|
+
content: parsed.body.content,
|
|
237
|
+
ifMatch: parsed.body.ifMatch,
|
|
238
|
+
actor,
|
|
239
|
+
});
|
|
240
|
+
putContentRoute.respond(res, 200, { ...saved, object: publicObject(saved.object) });
|
|
241
|
+
} catch (error) {
|
|
242
|
+
if (!respondError(res, error)) throw error;
|
|
243
|
+
}
|
|
244
|
+
return true;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
if (sheetOpsRoute.match(req.method, pathSegments)) {
|
|
248
|
+
const parsed = await sheetOpsRoute.parse(req, res, pathSegments, queryParams);
|
|
249
|
+
if (!parsed) return true;
|
|
250
|
+
const actor = await authorize(req, res, myAgentId, "objects.write");
|
|
251
|
+
if (!actor) return true;
|
|
252
|
+
try {
|
|
253
|
+
sheetOpsRoute.respond(
|
|
254
|
+
res,
|
|
255
|
+
200,
|
|
256
|
+
await applySheetOp({ id: parsed.params.id, op: parsed.body, actor }),
|
|
257
|
+
);
|
|
258
|
+
} catch (error) {
|
|
259
|
+
if (!respondError(res, error)) throw error;
|
|
260
|
+
}
|
|
261
|
+
return true;
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
return false;
|
|
265
|
+
}
|
package/src/http/pages-public.ts
CHANGED
|
@@ -44,6 +44,7 @@ import {
|
|
|
44
44
|
extractAndVerifyCookie,
|
|
45
45
|
isLocalDevPageRequest,
|
|
46
46
|
LEGACY_PAGE_SESSION_COOKIE,
|
|
47
|
+
type PageSessionPayload,
|
|
47
48
|
pageSessionSetCookies,
|
|
48
49
|
verifyPageSession,
|
|
49
50
|
} from "../utils/page-session";
|
|
@@ -331,6 +332,36 @@ export function getPageFrameAncestors(): string[] {
|
|
|
331
332
|
return origins;
|
|
332
333
|
}
|
|
333
334
|
|
|
335
|
+
/**
|
|
336
|
+
* The configured app URLs as CSP origins, each with a leading space. An entry
|
|
337
|
+
* that does not parse as an http(s) URL is dropped, so a stray value cannot add
|
|
338
|
+
* a source or a directive to the policy.
|
|
339
|
+
*/
|
|
340
|
+
function embedOrigins(appUrls: string[]): string {
|
|
341
|
+
const origins = new Set<string>();
|
|
342
|
+
for (const value of appUrls) {
|
|
343
|
+
try {
|
|
344
|
+
const url = new URL(value);
|
|
345
|
+
if (url.protocol === "https:" || url.protocol === "http:") origins.add(url.origin);
|
|
346
|
+
} catch {
|
|
347
|
+
// not a URL: skip it
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
return Array.from(origins, (origin) => ` ${origin}`).join("");
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
/**
|
|
354
|
+
* Who is viewing, for `<meta name="swarm-viewer">`: `user` for a signed-in
|
|
355
|
+
* viewer, `operator` for a launch with the shared swarm key, else `guest`. The
|
|
356
|
+
* `<swarm-object>` embed reads it so a guest gets a sign-in placeholder and
|
|
357
|
+
* sends no object request. It is a UI hint only: `/@swarm/api` still decides.
|
|
358
|
+
*/
|
|
359
|
+
function pageViewer(payload: PageSessionPayload | null): "user" | "operator" | "guest" {
|
|
360
|
+
if (payload?.uid) return "user";
|
|
361
|
+
if (payload?.op) return "operator";
|
|
362
|
+
return "guest";
|
|
363
|
+
}
|
|
364
|
+
|
|
334
365
|
/**
|
|
335
366
|
* Build the `Content-Security-Policy` for the served HTML. Allows inline
|
|
336
367
|
* scripts (required for `BROWSER_SDK_JS`) but locks down everything else to
|
|
@@ -351,6 +382,10 @@ function buildCsp(page: Page): string {
|
|
|
351
382
|
const devFallbacks = getLocalDevAppOrigins();
|
|
352
383
|
const embedders = page.authMode === "public" ? getPageFrameAncestors() : [];
|
|
353
384
|
const ancestors = Array.from(new Set([...configured, ...devFallbacks, ...embedders]));
|
|
385
|
+
// The dashboard origins also serve the `<swarm-object>` embed bundle
|
|
386
|
+
// (`/embed/v1/*`: module scripts, its shadow-root stylesheet and fonts).
|
|
387
|
+
// connect-src stays 'self': the embed talks to `/@swarm/api` only.
|
|
388
|
+
const appOrigins = embedOrigins(configured);
|
|
354
389
|
// Allow Tailwind Play CDN (`cdn.tailwindcss.com`, design version 1; the
|
|
355
390
|
// pinned v4 build of design version 2 comes from jsdelivr) for scripts, Google
|
|
356
391
|
// Fonts (`fonts.googleapis.com` stylesheets + `fonts.gstatic.com` font
|
|
@@ -362,9 +397,9 @@ function buildCsp(page: Page): string {
|
|
|
362
397
|
// a multi-hundred-KB bundle.
|
|
363
398
|
return [
|
|
364
399
|
"default-src 'self'",
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
400
|
+
`script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.tailwindcss.com https://cdn.jsdelivr.net https://unpkg.com${appOrigins}`,
|
|
401
|
+
`style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://cdn.tailwindcss.com https://cdn.jsdelivr.net https://unpkg.com${appOrigins}`,
|
|
402
|
+
`font-src 'self' https://fonts.gstatic.com data:${appOrigins}`,
|
|
368
403
|
"img-src 'self' data: https:",
|
|
369
404
|
"media-src 'self' data: https: blob:",
|
|
370
405
|
"connect-src 'self'",
|
|
@@ -667,7 +702,8 @@ export async function handlePagesPublic(
|
|
|
667
702
|
const feedback = isPageFeedbackRequested(queryParams);
|
|
668
703
|
const html =
|
|
669
704
|
injectBrowserSdk(page.body, {
|
|
670
|
-
head
|
|
705
|
+
// The viewer meta goes after the head defaults, which start with <base target>.
|
|
706
|
+
head: `${pageHead(page, queryParams, wantsPrint)}<meta name="swarm-viewer" content="${pageViewer(cookiePayload)}">`,
|
|
671
707
|
headFirst: feedback ? feedbackKeyGuardScript() : "",
|
|
672
708
|
standardsMode: page.designVersion !== 1,
|
|
673
709
|
}) +
|
package/src/http/pages.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
|
|
|
2
2
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
3
3
|
import { z } from "zod";
|
|
4
4
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
5
|
-
import {
|
|
5
|
+
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
6
6
|
import {
|
|
7
7
|
countAllPages,
|
|
8
8
|
countPagesByAgent,
|
|
@@ -631,7 +631,7 @@ export async function handlePages(
|
|
|
631
631
|
const key = parsed.body.key
|
|
632
632
|
? await authorizeAssetKeyWrite(
|
|
633
633
|
parsed.body.key,
|
|
634
|
-
await
|
|
634
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
635
635
|
)
|
|
636
636
|
: undefined;
|
|
637
637
|
const page = await createPage({
|
|
@@ -878,7 +878,7 @@ export async function handlePages(
|
|
|
878
878
|
try {
|
|
879
879
|
key = await authorizeAssetKeyWrite(
|
|
880
880
|
parsed.body.key,
|
|
881
|
-
await
|
|
881
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
882
882
|
);
|
|
883
883
|
} catch (error) {
|
|
884
884
|
if (error instanceof AssetKeyAuthorizationError) {
|
package/src/http/poll.ts
CHANGED
|
@@ -28,12 +28,17 @@ import {
|
|
|
28
28
|
} from "../be/db";
|
|
29
29
|
import { checkProfileForAgent } from "../be/model-profile-check";
|
|
30
30
|
import {
|
|
31
|
+
modelTierOverridesDiffer,
|
|
31
32
|
parseModelTierOverridesHeader,
|
|
32
33
|
recordClaimModelResolution,
|
|
33
34
|
setAgentModelTierOverrides,
|
|
34
35
|
} from "../be/model-tier-resolution";
|
|
35
36
|
import { poolTaskRunsOnHarness } from "../be/model-validation";
|
|
36
|
-
import {
|
|
37
|
+
import {
|
|
38
|
+
getRuntimeInstanceById,
|
|
39
|
+
isRuntimeInstanceFresh,
|
|
40
|
+
touchRuntimeInstance,
|
|
41
|
+
} from "../be/multi-runtime";
|
|
37
42
|
import { hasCapability } from "../server";
|
|
38
43
|
import { fetchChannelActivity } from "../slack/channel-activity";
|
|
39
44
|
import { type TaskModelPinFields, taskModelPin } from "../tasks/model-pin";
|
|
@@ -208,6 +213,9 @@ const pollTriggers = route({
|
|
|
208
213
|
|
|
209
214
|
// ─── Channel Activity Throttle ──────────────────────────────────────────────
|
|
210
215
|
|
|
216
|
+
/** The idle-poll probe hit a write: rerun the poll under the write lock. */
|
|
217
|
+
const NEEDS_WRITE = Symbol("poll-needs-write");
|
|
218
|
+
|
|
211
219
|
const CHANNEL_ACTIVITY_INTERVAL_MS = 60_000; // Check at most once per 60s
|
|
212
220
|
let lastChannelActivityCheckAt = 0;
|
|
213
221
|
|
|
@@ -390,7 +398,12 @@ export async function handlePoll(
|
|
|
390
398
|
let runtimeDraining = false;
|
|
391
399
|
let result: PollTxnResult;
|
|
392
400
|
try {
|
|
393
|
-
|
|
401
|
+
// Runs twice at most. The probe pass (`probe: true`) runs in a read-only
|
|
402
|
+
// transaction, so an idle poll never takes the SQLite write lock; at its
|
|
403
|
+
// first would-be write it returns NEEDS_WRITE instead. Only then does the
|
|
404
|
+
// same body run again under BEGIN IMMEDIATE, where every claim and its
|
|
405
|
+
// capacity/budget check stay atomic exactly as before.
|
|
406
|
+
const pollBody = async (probe: boolean): Promise<PollTxnResult | typeof NEEDS_WRITE> => {
|
|
394
407
|
const agent = await getAgentById(myAgentId);
|
|
395
408
|
if (!agent) {
|
|
396
409
|
return { error: "Agent not found", status: 404 };
|
|
@@ -399,7 +412,8 @@ export async function handlePoll(
|
|
|
399
412
|
// The worker's parsed MODEL_TIER_* env overrides ride on every poll so
|
|
400
413
|
// claim-time resolution can honor them (no write when unchanged).
|
|
401
414
|
if (modelTierOverrides) {
|
|
402
|
-
await setAgentModelTierOverrides(agent.id, modelTierOverrides);
|
|
415
|
+
if (!probe) await setAgentModelTierOverrides(agent.id, modelTierOverrides);
|
|
416
|
+
else if (await modelTierOverridesDiffer(agent.id, modelTierOverrides)) return NEEDS_WRITE;
|
|
403
417
|
}
|
|
404
418
|
|
|
405
419
|
// Extension identities authenticate to the API but never execute
|
|
@@ -413,12 +427,15 @@ export async function handlePoll(
|
|
|
413
427
|
// live runtime identity rather than on X-Agent-ID alone, which only
|
|
414
428
|
// names the logical agent. Polling is worker activity, so this also
|
|
415
429
|
// refreshes liveness — it cannot revive a retired runtime, since the
|
|
416
|
-
// update only matches one that is still live.
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
!
|
|
420
|
-
|
|
421
|
-
|
|
430
|
+
// update only matches one that is still live. The probe skips the
|
|
431
|
+
// touch while the last one is fresh (well inside the stale window).
|
|
432
|
+
if (isMultiRuntimeEnabled()) {
|
|
433
|
+
if (!runtimeInstanceId) return { trigger: null };
|
|
434
|
+
if (probe) {
|
|
435
|
+
if (!(await isRuntimeInstanceFresh(runtimeInstanceId, agent.id))) return NEEDS_WRITE;
|
|
436
|
+
} else if (!(await touchRuntimeInstance(runtimeInstanceId, agent.id))) {
|
|
437
|
+
return { trigger: null };
|
|
438
|
+
}
|
|
422
439
|
}
|
|
423
440
|
|
|
424
441
|
if (
|
|
@@ -448,6 +465,7 @@ export async function handlePoll(
|
|
|
448
465
|
: [];
|
|
449
466
|
const firstOfferedTask = offeredTasks[0];
|
|
450
467
|
if (firstOfferedTask) {
|
|
468
|
+
if (probe) return NEEDS_WRITE;
|
|
451
469
|
const claimedTask = await claimOfferedTask(firstOfferedTask.id, myAgentId);
|
|
452
470
|
if (claimedTask) {
|
|
453
471
|
await recordRuntimeTask(claimedTask.id);
|
|
@@ -468,7 +486,10 @@ export async function handlePoll(
|
|
|
468
486
|
// Check for pending tasks (assigned directly to this agent)
|
|
469
487
|
// Only return a task if agent has capacity (server-side enforcement)
|
|
470
488
|
if (await hasCapacity(myAgentId)) {
|
|
471
|
-
|
|
489
|
+
// The probe also escalates when only an affinity-skip log row is due.
|
|
490
|
+
const pendingProbe = probe ? { skipLogDue: false } : undefined;
|
|
491
|
+
const pendingTask = await getPendingTaskForAgent(myAgentId, pendingProbe);
|
|
492
|
+
if (pendingProbe && (pendingTask || pendingProbe.skipLogDue)) return NEEDS_WRITE;
|
|
472
493
|
if (pendingTask) {
|
|
473
494
|
// Budget admission gate (Phase 3). Runs in the same transaction as
|
|
474
495
|
// the capacity check so capacity AND budget gates share atomicity.
|
|
@@ -586,8 +607,11 @@ export async function handlePoll(
|
|
|
586
607
|
// Gated on the messaging capability: without it the read-messages /
|
|
587
608
|
// post-message tools aren't registered, so an unread_mentions trigger
|
|
588
609
|
// would instruct a missing tool and strand the claimed mentions.
|
|
589
|
-
const claimedChannels = hasCapability("messaging")
|
|
610
|
+
const claimedChannels = hasCapability("messaging")
|
|
611
|
+
? await claimMentions(myAgentId, { dryRun: probe })
|
|
612
|
+
: [];
|
|
590
613
|
if (claimedChannels.length > 0) {
|
|
614
|
+
if (probe) return NEEDS_WRITE;
|
|
591
615
|
// Count what this claim took: the inbox summary no longer sees mentions already
|
|
592
616
|
// moved to "processing".
|
|
593
617
|
return {
|
|
@@ -662,6 +686,7 @@ export async function handlePoll(
|
|
|
662
686
|
// refusal, and the dedup is per-(task,date) so subsequent same-day
|
|
663
687
|
// refusals on the same lead-candidate are suppressed.
|
|
664
688
|
if (unassignedIds.length > 0) {
|
|
689
|
+
if (probe) return NEEDS_WRITE;
|
|
665
690
|
const candidateId = unassignedIds[0]!;
|
|
666
691
|
const candidateTask = await getTaskById(candidateId);
|
|
667
692
|
const admission = await canClaim(
|
|
@@ -755,7 +780,13 @@ export async function handlePoll(
|
|
|
755
780
|
|
|
756
781
|
// No trigger found
|
|
757
782
|
return { trigger: null };
|
|
758
|
-
}
|
|
783
|
+
};
|
|
784
|
+
const probed = await getDbClient().transaction(() => pollBody(true), { readOnly: true });
|
|
785
|
+
// The write pass never returns NEEDS_WRITE: every guard above is `if (probe)`.
|
|
786
|
+
result =
|
|
787
|
+
probed === NEEDS_WRITE
|
|
788
|
+
? ((await getDbClient().transaction(() => pollBody(false))) as PollTxnResult)
|
|
789
|
+
: probed;
|
|
759
790
|
} catch (error) {
|
|
760
791
|
console.error("[/api/poll] Database error:", error);
|
|
761
792
|
jsonError(
|
package/src/http/pool-keys.ts
CHANGED
|
@@ -15,12 +15,19 @@ import type { SwarmConfig } from "../types";
|
|
|
15
15
|
import { CREDENTIAL_POOL_VARS, splitCredentialPool } from "../utils/credentials";
|
|
16
16
|
import { checkProviderPoolKey } from "../utils/provider-key-probes";
|
|
17
17
|
import { registerEnvSecrets, scrubSecrets } from "../utils/secret-scrubber";
|
|
18
|
+
import { SpendCapSchema } from "./api-keys";
|
|
18
19
|
import { ensureConfigAdmin, requestSecretReadScope, runConfigWriteSideEffects } from "./config";
|
|
19
20
|
import { getDeploymentEnvValue } from "./core";
|
|
20
21
|
import { route } from "./route-def";
|
|
21
22
|
import { jsonError } from "./utils";
|
|
22
23
|
|
|
23
|
-
export const PoolKeyStatusSchema = z.enum([
|
|
24
|
+
export const PoolKeyStatusSchema = z.enum([
|
|
25
|
+
"ok",
|
|
26
|
+
"rejected",
|
|
27
|
+
"rate_limited",
|
|
28
|
+
"spend_capped",
|
|
29
|
+
"unchecked",
|
|
30
|
+
]);
|
|
24
31
|
export type PoolKeyStatus = z.infer<typeof PoolKeyStatusSchema>;
|
|
25
32
|
export const PoolKeySchema = z.object({
|
|
26
33
|
index: z.number().int().min(0),
|
|
@@ -29,6 +36,8 @@ export const PoolKeySchema = z.object({
|
|
|
29
36
|
error: z.string().nullable(),
|
|
30
37
|
checkedAt: z.string().nullable(),
|
|
31
38
|
rateLimitedUntil: z.string().nullable(),
|
|
39
|
+
/** Set with `spend_capped`: the provider spend limit the key hit. */
|
|
40
|
+
spendCap: SpendCapSchema.nullable(),
|
|
32
41
|
});
|
|
33
42
|
export type PoolKey = z.infer<typeof PoolKeySchema>;
|
|
34
43
|
export const PoolKeysResponseSchema = z.object({
|
|
@@ -146,13 +155,23 @@ async function poolResponse(key: string): Promise<PoolKeysResponse> {
|
|
|
146
155
|
row?.status === "rate_limited" &&
|
|
147
156
|
!!row.rateLimitedUntil &&
|
|
148
157
|
Date.parse(row.rateLimitedUntil) > Date.now();
|
|
158
|
+
const spendCap = limited ? (row?.spendCap ?? null) : null;
|
|
149
159
|
return {
|
|
150
160
|
index,
|
|
151
161
|
suffix,
|
|
152
|
-
status: rejected
|
|
162
|
+
status: rejected
|
|
163
|
+
? "rejected"
|
|
164
|
+
: spendCap
|
|
165
|
+
? "spend_capped"
|
|
166
|
+
: limited
|
|
167
|
+
? "rate_limited"
|
|
168
|
+
: row
|
|
169
|
+
? "ok"
|
|
170
|
+
: "unchecked",
|
|
153
171
|
error: rejected ? scrubSecrets(row?.lastValidationError) || null : null,
|
|
154
172
|
checkedAt: rejected ? row!.lastValidationFailedAt : (row?.updatedAt ?? null),
|
|
155
173
|
rateLimitedUntil: row?.rateLimitedUntil ?? null,
|
|
174
|
+
spendCap,
|
|
156
175
|
};
|
|
157
176
|
}),
|
|
158
177
|
};
|
package/src/http/repos.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from "node:http";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { createSwarmRepo, deleteSwarmRepo, getSwarmRepoById, getSwarmRepos } from "../be/db";
|
|
4
4
|
import { updateSwarmRepoChecked } from "../be/repo-checked-update";
|
|
5
|
-
import {
|
|
5
|
+
import { changesMergePolicy } from "../be/repo-merge-policy";
|
|
6
6
|
import { can } from "../rbac";
|
|
7
7
|
import { emitIntegrationConnected } from "../telemetry";
|
|
8
8
|
import { RepoGuidelinesInputSchema, RepoHooksSchema, SwarmRepoSchema } from "../types";
|
|
@@ -62,7 +62,8 @@ const createRepo = route({
|
|
|
62
62
|
201: { description: "Repo created", schema: SwarmRepoSchema },
|
|
63
63
|
400: { description: "Validation error", schema: z.object({ error: z.string() }) },
|
|
64
64
|
403: {
|
|
65
|
-
description:
|
|
65
|
+
description:
|
|
66
|
+
"Only the lead, the operator or a user can turn allowMerge on or set a mergePolicy",
|
|
66
67
|
schema: z.object({ error: z.string() }),
|
|
67
68
|
},
|
|
68
69
|
409: { description: "Duplicate repo", schema: z.object({ error: z.string() }) },
|
|
@@ -89,7 +90,7 @@ const updateRepo = route({
|
|
|
89
90
|
responses: {
|
|
90
91
|
200: { description: "Repo updated", schema: SwarmRepoSchema },
|
|
91
92
|
403: {
|
|
92
|
-
description: "Only the lead, the operator or a user can change allowMerge",
|
|
93
|
+
description: "Only the lead, the operator or a user can change allowMerge or mergePolicy",
|
|
93
94
|
schema: z.object({ error: z.string() }),
|
|
94
95
|
},
|
|
95
96
|
404: { description: "Repo not found", schema: z.object({ error: z.string() }) },
|
|
@@ -113,7 +114,7 @@ const deleteRepo = route({
|
|
|
113
114
|
|
|
114
115
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
115
116
|
|
|
116
|
-
/** The refusal text when the caller may not change
|
|
117
|
+
/** The refusal text when the caller may not change the merge policy, or null when they may. */
|
|
117
118
|
async function allowMergeRefusal(
|
|
118
119
|
req: IncomingMessage,
|
|
119
120
|
myAgentId: string | undefined,
|
|
@@ -160,7 +161,7 @@ export async function handleRepos(
|
|
|
160
161
|
if (createRepo.match(req.method, pathSegments)) {
|
|
161
162
|
const parsed = await createRepo.parse(req, res, pathSegments, queryParams);
|
|
162
163
|
if (!parsed) return true;
|
|
163
|
-
if (
|
|
164
|
+
if (changesMergePolicy(null, parsed.body.guidelines)) {
|
|
164
165
|
const refusal = await allowMergeRefusal(req, myAgentId);
|
|
165
166
|
if (refusal) {
|
|
166
167
|
jsonError(res, refusal, 403);
|
|
@@ -198,7 +199,7 @@ export async function handleRepos(
|
|
|
198
199
|
const parsed = await updateRepo.parse(req, res, pathSegments, queryParams);
|
|
199
200
|
if (!parsed) return true;
|
|
200
201
|
try {
|
|
201
|
-
// The comparison with the stored
|
|
202
|
+
// The comparison with the stored merge policy, the decision and the write share one
|
|
202
203
|
// transaction, so a stale edit cannot overwrite a merge-policy change committed after it.
|
|
203
204
|
const result = await updateSwarmRepoChecked(
|
|
204
205
|
parsed.params.id,
|