@desplega.ai/agent-swarm 2.7.7 → 2.7.9
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-dn4gdsgr.js +16 -0
- package/dist/{actions-3tt153af.js → actions-g563mbn2.js} +19 -19
- package/dist/{amp-adapter-njpts0yr.js → amp-adapter-q61w05eb.js} +3 -3
- package/dist/{anthropic-messages-xey2skwx.js → anthropic-messages-jkva0zps.js} +68 -78
- package/dist/{app-nky4378f.js → app-a66ssc4k.js} +3 -3
- package/dist/{assistant-jnb669pa.js → assistant-p477rjwj.js} +22 -22
- package/dist/{azure-openai-responses-26t7j9ra.js → azure-openai-responses-wgtqkbr3.js} +5 -10
- package/dist/boot-args-schema-h4qj462e.js +89 -0
- package/dist/{boot-reembed-9mgvaztt.js → boot-reembed-n1ehfbsw.js} +1 -1
- package/dist/{boot-reembed-qs2djdej.js → boot-reembed-qw4mc0pt.js} +1 -1
- package/dist/{boot-scrub-sweep-yjpdj7s1.js → boot-scrub-sweep-9w9jp4sm.js} +4 -4
- package/dist/{boot-seeds-5cm6ambd.js → boot-seeds-qdaf3sdy.js} +5 -4
- package/dist/{boxd-nv507va8.js → boxd-qbkxy6ap.js} +1 -1
- package/dist/{claude-adapter-fn287zmm.js → claude-adapter-348p5hx9.js} +8 -8
- package/dist/{claude-managed-adapter-dvs2xw5n.js → claude-managed-adapter-h74d06yz.js} +4 -4
- package/dist/{claude-managed-setup-wtdz2mj2.js → claude-managed-setup-7787fxtp.js} +5 -5
- package/dist/{claude-sdk-session-x91kqyhm.js → claude-sdk-session-hbszbt8a.js} +7901 -7718
- package/dist/{cli-cb2a8pna.js → cli-09kmfkmq.js} +4 -6
- package/dist/{cli-m0da8j35.js → cli-0whpms1z.js} +15 -10
- package/dist/{cli-5zx699j9.js → cli-12xyjhws.js} +29 -12
- package/dist/{cli-snpj5zbj.js → cli-1z4qggfe.js} +9 -36
- package/dist/{cli-e0kmphd6.js → cli-21159vea.js} +35 -12
- package/dist/{cli-s0qnd4wv.js → cli-28fq781p.js} +1 -1
- package/dist/{cli-qh4d4tvk.js → cli-2a8py3sx.js} +6 -6
- package/dist/{cli-adeegh7d.js → cli-2ccpqyyf.js} +412 -116
- package/dist/{cli-1p89xny0.js → cli-2r0jcc3k.js} +1 -1
- package/dist/{cli-rvtm68yy.js → cli-2xv18ywz.js} +2 -2
- package/dist/{cli-5xaqj21p.js → cli-3kd08rej.js} +1 -1
- package/dist/{cli-1c6tzt8g.js → cli-3tqcamp6.js} +13 -13
- package/dist/{cli-ae7mrdf9.js → cli-3vjhs18n.js} +4 -6
- package/dist/{cli-vfym7wmz.js → cli-3xcwp3z8.js} +10 -12
- package/dist/{cli-az48n0nr.js → cli-4caa1x7d.js} +67 -64
- package/dist/{cli-5jnhv72d.js → cli-4t0fmf3z.js} +30 -7
- package/dist/{cli-5b456bpf.js → cli-530hkwdy.js} +7 -9
- package/dist/{cli-pz4rk021.js → cli-54vrpgm0.js} +1 -1
- package/dist/{cli-ddaanqkd.js → cli-587857ys.js} +7 -7
- package/dist/{cli-r9jqcehk.js → cli-5mpy301f.js} +38 -2
- package/dist/{cli-cppkf404.js → cli-605nn699.js} +80 -43
- package/dist/{cli-6pfd54vx.js → cli-650zv9q9.js} +10 -10
- package/dist/cli-6pzk82fd.js +778 -0
- package/dist/{cli-gz6q4eve.js → cli-715t1gx6.js} +9 -9
- package/dist/{cli-08bmz9z9.js → cli-9aezs55w.js} +10 -12
- package/dist/{cli-tgrv9cjx.js → cli-9r5gtwjr.js} +3 -3
- package/dist/{cli-pc6n7fre.js → cli-a0657jmf.js} +2 -2
- package/dist/{cli-pjctyea3.js → cli-agyaeef4.js} +3 -3
- package/dist/cli-b932gexn.js +5266 -0
- package/dist/{cli-e46hg0xw.js → cli-bc779n4v.js} +3 -3
- package/dist/{cli-jtjtabxe.js → cli-btc9cb4c.js} +78 -5
- package/dist/{cli-caj33vcq.js → cli-btf6fw39.js} +5 -5
- package/dist/{cli-q3tkegby.js → cli-cseh6f8w.js} +5 -5
- package/dist/{cli-n6bv12jn.js → cli-cvs2r2vq.js} +23 -14
- package/dist/{cli-tfyyvzx6.js → cli-cyn9v8zr.js} +17 -2
- package/dist/{cli-a22h291q.js → cli-d6521kb5.js} +1 -1
- package/dist/{cli-1b7btd38.js → cli-d84byzn8.js} +869 -5
- package/dist/{cli-wx3rhnm0.js → cli-eddnyg3t.js} +1 -1
- package/dist/{cli-nmzhp1b5.js → cli-ejkvvqbe.js} +55 -46
- package/dist/{cli-ftyxyspd.js → cli-eqtfgfr6.js} +1 -1
- package/dist/{cli-mthwvjre.js → cli-f2zenhja.js} +1 -1
- package/dist/{cli-ws19768n.js → cli-fayav105.js} +624 -227
- package/dist/{cli-ferkkrg9.js → cli-fjggej24.js} +2 -2
- package/dist/{cli-g7s47cc5.js → cli-fsgttth8.js} +123 -102
- package/dist/{cli-8305gbq0.js → cli-gce09r66.js} +5 -5
- package/dist/{cli-mkk9rnzz.js → cli-gxy8y1dt.js} +51 -4
- package/dist/{cli-fyt2g4wd.js → cli-hae9j8sv.js} +288 -76
- package/dist/{cli-agfm16v9.js → cli-hg42n3hx.js} +12 -12
- package/dist/{cli-qghe0h66.js → cli-hwprv9e4.js} +8 -10
- package/dist/{cli-yndmfxb3.js → cli-hxpyc9sn.js} +3 -3
- package/dist/{cli-72v799xn.js → cli-jfx48xrj.js} +10 -12
- package/dist/{cli-dhar9qay.js → cli-jrp1dt73.js} +2 -2
- package/dist/{cli-98rw5dt5.js → cli-jrzkw01m.js} +2 -2
- package/dist/{cli-ayayvfg4.js → cli-k70e3x9e.js} +24 -20
- package/dist/{cli-583frbyr.js → cli-kchjb7qy.js} +1 -1
- package/dist/{cli-cm5yqn35.js → cli-kf3pxxdg.js} +1 -0
- package/dist/{cli-fmjd0t1y.js → cli-m0cy2vyf.js} +2 -2
- package/dist/{cli-4zsenjhy.js → cli-m5akxq8q.js} +16 -3
- package/dist/{cli-73jzwksr.js → cli-m88rpzkh.js} +6 -3
- package/dist/{cli-95jzxcp3.js → cli-mnrkgg60.js} +4 -4
- package/dist/{cli-p82cnnjq.js → cli-ms5m5r1y.js} +1 -1
- package/dist/{cli-fy6x31ps.js → cli-n5yexkdg.js} +1 -0
- package/dist/{cli-wk5yrfwd.js → cli-neyag5p6.js} +191 -85
- package/dist/cli-p0m0p34z.js +9321 -0
- package/dist/{cli-yyj3j5m4.js → cli-p17970qv.js} +8 -10
- package/dist/{cli-6vcp76qk.js → cli-p74md7t8.js} +42 -23
- package/dist/{cli-rjcbm574.js → cli-pr0eze3x.js} +2 -2
- package/dist/{cli-35rsp8ye.js → cli-qkdmz8c8.js} +1 -1
- package/dist/{cli-rtt8g4v9.js → cli-qmd3mse0.js} +2 -2
- package/dist/{cli-je518txm.js → cli-qzt90yze.js} +20 -20
- package/dist/cli-rkc97c6a.js +39 -0
- package/dist/{cli-75gkpjvw.js → cli-rvhdmjvt.js} +8 -12
- package/dist/{cli-6g0hb4cp.js → cli-rwymrnaz.js} +18608 -9089
- package/dist/{cli-3fg0bdcv.js → cli-serm8zrx.js} +6 -6
- package/dist/{cli-g08zdaec.js → cli-sgs5k6yd.js} +1 -1
- package/dist/{cli-afkqkrtw.js → cli-sya22y84.js} +21 -9
- package/dist/{cli-318r69gq.js → cli-t73cas91.js} +440 -9
- package/dist/{cli-e5bzrn01.js → cli-tqq0hspb.js} +2 -2
- package/dist/{cli-pq73h5mz.js → cli-v3cf1ts9.js} +3 -3
- package/dist/{cli-bfv7vdg6.js → cli-varqt4d1.js} +28 -16
- package/dist/{cli-k899ehvh.js → cli-vxh6acp7.js} +6 -6
- package/dist/{cli-g83s9ewh.js → cli-xfjrc279.js} +1 -1
- package/dist/{cli-k1nje3v3.js → cli-xk879m3k.js} +129 -115
- package/dist/{cli-7cx2m6t2.js → cli-y5rbvxhc.js} +2 -2
- package/dist/{cli-8sckt74b.js → cli-y8nbefpb.js} +41 -19
- package/dist/{cli-81p9jd57.js → cli-yab6sh8p.js} +9 -3
- package/dist/{cli-srye3vdt.js → cli-ybjdc978.js} +1 -1
- package/dist/{cli-k5671be5.js → cli-zcfpsfzf.js} +5 -5
- package/dist/{cli-vf078p3e.js → cli-zfqg6fzn.js} +1 -1
- package/dist/{cli-k8196sh2.js → cli-zgv8gxgs.js} +9 -8
- package/dist/cli.js +34 -52
- package/dist/{cloudflare-workers-ai-system-one-ef2a980q.js → cloudflare-workers-ai-system-one-9y1zx3pt.js} +2 -2
- package/dist/{codex-adapter-cf2yxe9m.js → codex-adapter-ysq6bzha.js} +7 -7
- package/dist/{codex-hook-a0c6g6t6.js → codex-hook-fac6175r.js} +1 -1
- package/dist/{codex-login-y0pmff1c.js → codex-login-bcda78ge.js} +2 -2
- package/dist/{codex-session-runner-6vfzdgbd.js → codex-session-runner-qakzfx93.js} +8 -8
- package/dist/{commands-t3mfy7vn.js → commands-rs7hkv9r.js} +3 -3
- package/dist/{controller-q7xrbaz0.js → controller-r5x9bg6e.js} +4 -4
- package/dist/{controllers-connect-c6nm70kg.js → controllers-connect-498hrxvk.js} +24 -24
- package/dist/{cursor-adapter-ftd81ga8.js → cursor-adapter-d46qszer.js} +2 -2
- package/dist/{db-vemtpmcc.js → db-pm96nhdb.js} +6 -2
- package/dist/{db-dk572x25.js → db-s13dqhr6.js} +3 -3
- package/dist/{devin-adapter-r9phbnc9.js → devin-adapter-z46ep5ph.js} +1 -1
- package/dist/{dispatcher-kh7ecxh9.js → dispatcher-j3h81t7m.js} +18 -18
- package/dist/{docker-c1a3gqmf.js → docker-866qpzt9.js} +2 -2
- package/dist/{dsh-adapter-v8628r89.js → dsh-adapter-rw0d5rc4.js} +2 -2
- package/dist/{e2b-fr12yccx.js → e2b-jkwfhbcv.js} +2 -2
- package/dist/{e2b-x6ywzak3.js → e2b-s16txnpx.js} +2 -3
- package/dist/{easter-egg-3d-nenw4x63.js → easter-egg-3d-qtgfxgze.js} +1 -1
- package/dist/{embedding-space-0jepb239.js → embedding-space-xh8p4q4x.js} +6 -6
- package/dist/{embeddings-xxt49yxg.js → embeddings-wp745m91.js} +1 -1
- package/dist/{event-bus-g0ka3pbw.js → event-bus-e66gh7cc.js} +1 -1
- package/dist/{execute-1mhw6e4x.js → execute-2fzb9z74.js} +1 -1
- package/dist/{external-channel-55v12e60.js → external-channel-ys21h3sy.js} +2 -2
- package/dist/fx-adapter-vz0b9z3g.js +19 -0
- package/dist/{google-generative-ai-v94hr7h0.js → google-generative-ai-ytpgncx9.js} +7 -12
- package/dist/{google-vertex-g7vr6cf8.js → google-vertex-tqhze5j7.js} +7 -12
- package/dist/grok-adapter-spea7zkj.js +19 -0
- package/dist/handlers-crckt5dq.js +32 -0
- package/dist/{heartbeat-k42svnr0.js → heartbeat-8phn1kdq.js} +21 -21
- package/dist/{hook-6nphweh0.js → hook-amcj4s10.js} +16 -11
- package/dist/{hook-114m7hap.js → hook-bc6n49qn.js} +5 -5
- package/dist/{http-r8cc4wz7.js → http-7374brv5.js} +854 -332
- package/dist/index-4x08sjtk.js +30 -0
- package/dist/{index-6cxzwfen.js → index-5a9jtqde.js} +26 -26
- package/dist/index-8ybffts4.js +37 -0
- package/dist/{index-nh3wyqdt.js → index-c9y31ytf.js} +16 -16
- package/dist/{index-h39zbx67.js → index-hsad2t3r.js} +31 -31
- package/dist/index-nfy4kkg5.js +33 -0
- package/dist/{index-e3s8wmxy.js → index-p4hjwbvw.js} +1 -1
- package/dist/{index-k7fj52d3.js → index-q5cmtbz5.js} +6 -6
- package/dist/{index-fpk4bcd9.js → index-w4m9z29z.js} +1 -1
- package/dist/{keepalive-x060nt9p.js → keepalive-wy29kbrg.js} +4 -4
- package/dist/lead-zdqxsvjn.js +71 -0
- package/dist/{llama-cpp-classify-s5c47rwh.js → llama-cpp-classify-nfgswa1m.js} +2 -2
- package/dist/{maintenance-2xxfexhf.js → maintenance-h2ds9w6c.js} +1 -1
- package/dist/{mistral-conversations-3gjpdb4b.js → mistral-conversations-a45tx39a.js} +29 -51
- package/dist/{oauth-refresh-sweep-fckc4ar5.js → oauth-refresh-sweep-q7mtbyp3.js} +3 -3
- package/dist/{onboard-zc48j237.js → onboard-vw8r2fdw.js} +68 -16
- package/dist/{openai-codex-responses-8pbxq9h5.js → openai-codex-responses-k9gapdze.js} +7 -11
- package/dist/{openai-completions-rm00s912.js → openai-completions-xd579js7.js} +50 -58
- package/dist/{openai-decisions-8v957r2r.js → openai-decisions-q3hh60wr.js} +2 -2
- package/dist/{openai-responses-agxpf96k.js → openai-responses-4d5dx3c7.js} +5 -10
- package/dist/{opencode-adapter-r690h1cr.js → opencode-adapter-mtb0953j.js} +6 -6
- package/dist/{openrouter-images-3ecegv0d.js → openrouter-images-xr9gme9x.js} +4 -3
- package/dist/{otel-impl-r5xbh81q.js → otel-impl-j42czw3r.js} +2 -2
- package/dist/{pi-messages-pchtw4he.js → pi-messages-hjbv8v10.js} +28 -12
- package/dist/{pi-mono-adapter-c7v8sdec.js → pi-mono-adapter-zk8pg9jr.js} +30 -27
- package/dist/{pricing-refresh-3pmre11v.js → pricing-refresh-x7nhv23d.js} +3 -3
- package/dist/{rbac-roles-3vbshwsb.js → rbac-roles-9044425x.js} +16 -2
- package/dist/rbac-roles-bzvee6cf.js +37 -0
- package/dist/{render-v2-pxykkbab.js → render-v2-t7bn4skz.js} +3 -3
- package/dist/{resume-adda0bwy.js → resume-x94gemep.js} +7 -7
- package/dist/{runtime-fnbm7stk.js → runtime-breq6fmv.js} +1 -1
- package/dist/{session-access-2fvamrdc.js → session-access-q7dmqjvt.js} +7 -5
- package/dist/{session-source-backfill-08xvv0sm.js → session-source-backfill-440ysamr.js} +3 -3
- package/dist/{setup-1aqmvmh1.js → setup-07n4727s.js} +1 -1
- package/dist/{typesafe-system-one-0bmqcxfg.js → typesafe-system-one-f2en2knd.js} +2 -2
- package/dist/virtual-modules-z5h6mcyf.js +362 -0
- package/dist/{work-objects-9s0yrm5j.js → work-objects-pnq5y534.js} +21 -21
- package/dist/{worker-follow-up-3q78fqmr.js → worker-follow-up-7z1gfkr8.js} +18 -18
- package/dist/worker-y62rvvq3.js +71 -0
- package/dist/{x-vmmye1kb.js → x-2fyrt5pp.js} +2 -2
- package/openapi.json +1268 -276
- package/package.json +10 -10
- package/src/apps/catalog.generated.json +299 -82
- package/src/apps/page-validator.ts +115 -2
- package/src/be/connector-codes.ts +21 -6
- package/src/be/db/model-profiles.ts +1 -1
- package/src/be/db/session-tree.ts +9 -5
- package/src/be/db/session-visibility.ts +25 -9
- package/src/be/db/tasks/read.ts +33 -6
- package/src/be/db/tasks/write.ts +77 -7
- package/src/be/db-queries/tracker.ts +4 -2
- package/src/be/db.ts +53 -19
- package/src/be/improvements.ts +416 -0
- package/src/be/migrations/271_subscription_usage_model.sql +30 -0
- package/src/be/migrations/274_improvements.sql +27 -0
- package/src/be/migrations/275_task_dispatched_by.sql +8 -0
- package/src/be/model-validation.ts +19 -1
- package/src/be/rbac-roles.ts +144 -1
- package/src/be/runtime-pools/routing.ts +1 -1
- package/src/be/scripts/boot-args-schema.ts +95 -0
- package/src/be/scripts/extract-schema.ts +15 -10
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -1
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -1
- package/src/be/seed-scripts/catalog/get-child-outputs.ts +1 -1
- package/src/be/seed-scripts/catalog/wait-for-task.ts +1 -1
- package/src/be/swarm-config-guard.ts +8 -0
- package/src/be/users.ts +64 -5
- package/src/cli.tsx +5 -25
- package/src/commands/claude-managed-setup.ts +1 -1
- package/src/commands/codex-login.ts +1 -1
- package/src/commands/e2b.ts +0 -1
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +0 -1
- package/src/commands/onboard/dashboard-url.ts +31 -0
- package/src/commands/onboard/steps/generate.tsx +17 -1
- package/src/commands/onboard/steps/post-dashboard.tsx +9 -3
- package/src/commands/onboard.tsx +19 -6
- package/src/commands/runner.ts +143 -105
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/hooks/hook.ts +13 -5
- package/src/http/agents.ts +7 -1
- package/src/http/all-routes.ts +1 -0
- package/src/http/approval-requests.ts +32 -50
- package/src/http/auth.ts +5 -4
- package/src/http/codex-oauth-accounts.ts +31 -23
- package/src/http/codex-oauth-device.ts +3 -3
- package/src/http/codex-oauth-keep-warm.ts +1 -1
- package/src/http/improvements.ts +317 -0
- package/src/http/index.ts +10 -0
- package/src/http/mcp-oauth.ts +6 -0
- package/src/http/mcp-servers.ts +8 -0
- package/src/http/models-catalog.ts +1 -1
- package/src/http/operator-actor.ts +2 -1
- package/src/http/pages-public.ts +38 -1
- package/src/http/person-responder.ts +66 -0
- package/src/http/poll.ts +3 -4
- package/src/http/prompt-templates.ts +1 -1
- package/src/http/schedules.ts +4 -0
- package/src/http/script-runs.ts +6 -1
- package/src/http/session-access.ts +61 -6
- package/src/http/sessions.ts +67 -9
- package/src/http/tasks.ts +53 -9
- package/src/http/user-roles.ts +11 -2
- package/src/http/users.ts +224 -105
- package/src/http/utils.ts +2 -1
- package/src/http/workflows.ts +11 -7
- package/src/prompts/session-templates.ts +1 -0
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/codex-adapter.ts +17 -3
- package/src/providers/codex-models.ts +4 -3
- package/src/providers/codex-oauth/auth-json.ts +14 -18
- package/src/providers/codex-oauth/device.ts +49 -15
- package/src/providers/codex-oauth/flow.ts +2 -1
- package/src/providers/codex-oauth/storage.ts +2 -2
- package/src/providers/pi-mono-adapter.ts +8 -0
- package/src/providers/pricing-sources.md +16 -1
- package/src/providers/swarm-events-shared.ts +15 -2
- package/src/rbac/legacy-policy.ts +3 -0
- package/src/rbac/permissions.ts +15 -0
- package/src/scheduler/deferred-task-waits.ts +9 -4
- package/src/scripts-runtime/extract-args-schema.ts +3 -1
- package/src/scripts-runtime/swarm-sdk.ts +1 -1
- package/src/scripts-runtime/types/swarm-extension.d.ts +31 -28
- package/src/server-user.ts +1 -1
- package/src/server.ts +2 -0
- package/src/slack/ack.ts +68 -26
- package/src/slack/blocks.ts +1 -0
- package/src/slack/reaction-shortcode.ts +8 -2
- package/src/slack/render-v2.ts +72 -20
- package/src/slack/task-output.ts +4 -1
- package/src/slack/thread-buffer.ts +2 -2
- package/src/tasks/task-skip.ts +28 -0
- package/src/tasks/terminal-result-guard.ts +3 -2
- package/src/telemetry.ts +28 -1
- package/src/tests/agentmail-inbox-mapping.test.ts +73 -0
- package/src/tests/api-drain-worker-e2e.test.ts +69 -2
- package/src/tests/approval-requests.test.ts +58 -0
- package/src/tests/apps-catalog-drift.test.ts +35 -0
- package/src/tests/apps-catalog-table.test.ts +203 -0
- package/src/tests/apps-element-assembly.test.ts +28 -0
- package/src/tests/apps-smart-links.test.ts +151 -0
- package/src/tests/apps-table-filters-migration.test.ts +96 -0
- package/src/tests/apps-table-selection-migration.test.ts +95 -0
- package/src/tests/chatgpt-subscription-session-bench.test.ts +2 -2
- package/src/tests/claude-managed-setup.test.ts +36 -0
- package/src/tests/claude-worker-parity.test.ts +2 -2
- package/src/tests/codex-adapter.test.ts +32 -2
- package/src/tests/codex-login.test.ts +2 -2
- package/src/tests/codex-oauth-accounts.test.ts +48 -12
- package/src/tests/codex-oauth-credential-info.test.ts +77 -1
- package/src/tests/codex-oauth-device.test.ts +61 -1
- package/src/tests/codex-oauth-keep-warm.test.ts +2 -2
- package/src/tests/codex-oauth.test.ts +25 -4
- package/src/tests/codex-pool.test.ts +2 -2
- package/src/tests/codex-swarm-events.test.ts +43 -1
- package/src/tests/context-window.test.ts +14 -0
- package/src/tests/db-queries-tracker.test.ts +2 -1
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +3 -0
- package/src/tests/deferred-task-wake.test.ts +7 -2
- package/src/tests/deploy-one-box.test.ts +39 -1
- package/src/tests/docs-index-footprint.test.js +3 -3
- package/src/tests/e2e-coverage-contract.test.ts +235 -0
- package/src/tests/empty-output-schema.test.ts +160 -0
- package/src/tests/env-flag.test.ts +1 -0
- package/src/tests/explicit-model-validation.test.ts +14 -0
- package/src/tests/fixtures/onboard/content.compose.yml.txt +0 -4
- package/src/tests/fixtures/onboard/dev.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/full-all.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/full.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/research.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/solo.compose.yml.txt +0 -1
- package/src/tests/fixtures/prs-app-definition.json.txt +784 -0
- package/src/tests/fixtures/prs-filters-migration.patch.json.txt +318 -0
- package/src/tests/fixtures/prs-selection-migration.patch.json.txt +373 -0
- package/src/tests/fixtures/runner-identity-refresh.ts +3 -0
- package/src/tests/fixtures/runner-legacy-resume-prompt.ts +3 -0
- package/src/tests/fixtures/runner-task-start-reads.ts +140 -0
- package/src/tests/hook-ping-me-order.test.ts +85 -0
- package/src/tests/http-api-integration.test.ts +2 -2
- package/src/tests/http-users.test.ts +63 -0
- package/src/tests/improvements-payload.test.ts +200 -0
- package/src/tests/improvements-route.test.ts +419 -0
- package/src/tests/install-sh-setup-url.test.ts +190 -0
- package/src/tests/mcp-input-caps.test.ts +4 -3
- package/src/tests/merge-gate-detect-changes.test.ts +22 -0
- package/src/tests/onboard-dashboard-output.test.ts +109 -0
- package/src/tests/onboard-dashboard-url.test.ts +83 -0
- package/src/tests/operator-granted-credentials.test.ts +561 -0
- package/src/tests/operator-granted-role-wire.test.ts +222 -0
- package/src/tests/pages-authed-mode.test.ts +13 -2
- package/src/tests/pi-mono-adapter.test.ts +39 -4
- package/src/tests/rbac-engine.test.ts +3 -0
- package/src/tests/runner-context-usage.test.ts +118 -0
- package/src/tests/runner-legacy-options.test.ts +55 -0
- package/src/tests/runner-slot-reconcile.test.ts +38 -0
- package/src/tests/runner-task-start-reads.test.ts +58 -0
- package/src/tests/script-connections.test.ts +2 -0
- package/src/tests/script-executor-quickjs.test.ts +2 -0
- package/src/tests/script-runs-http.test.ts +57 -0
- package/src/tests/scripts-boot-args-schema.test.ts +181 -0
- package/src/tests/scripts-runtime.test.ts +24 -0
- package/src/tests/sdk-store-progress-skipped.test.ts +155 -0
- package/src/tests/send-task-dispatched-by.test.ts +129 -0
- package/src/tests/session-costs-model-key-normalize.test.ts +59 -0
- package/src/tests/session-dispatched-tasks.test.ts +115 -0
- package/src/tests/session-sharing.test.ts +402 -3
- package/src/tests/slack-file-tools-attachments.test.ts +95 -3
- package/src/tests/slack-reaction-config.test.ts +40 -0
- package/src/tests/slack-render-v2.test.ts +120 -0
- package/src/tests/slack-skip-reaction.test.ts +203 -0
- package/src/tests/store-progress-skipped.test.ts +159 -0
- package/src/tests/submit-improvement-tool.test.ts +82 -0
- package/src/tests/subscription-usage-migration.test.ts +57 -0
- package/src/tests/swarm-config-reserved-keys.test.ts +3 -0
- package/src/tests/telemetry-endpoint-override.test.ts +27 -0
- package/src/tests/tool-annotations.test.ts +1 -1
- package/src/tests/trigger-claiming.test.ts +2 -0
- package/src/tests/workflow-system-one-extraction.test.ts +29 -0
- package/src/tools/create-channel.ts +1 -1
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/manage-user.ts +88 -58
- package/src/tools/register-agentmail-inbox.ts +5 -0
- package/src/tools/repos/update-repo.ts +1 -1
- package/src/tools/request-human-input.ts +1 -1
- package/src/tools/send-task.ts +4 -1
- package/src/tools/slack-read.ts +61 -33
- package/src/tools/store-progress.ts +39 -8
- package/src/tools/submit-improvement.ts +68 -0
- package/src/tools/tool-config.ts +3 -0
- package/src/tools/tracker/tracker-unlink.ts +2 -1
- package/src/tools/workflows/retry-workflow-run.ts +3 -0
- package/src/types.ts +16 -2
- package/src/utils/context-window.ts +6 -1
- package/src/utils/output-schema.ts +23 -0
- package/src/utils/request-auth-context.ts +6 -1
- package/src/workflows/executors/system-one-providers.ts +25 -6
- package/src/workflows/recovery.ts +8 -4
- package/src/workflows/resume.ts +19 -0
- package/templates/skills/apps/SKILL.md +22 -11
- package/templates/skills/apps/content.md +22 -11
- package/templates/skills/swarm-scripts/SKILL.md +1 -1
- package/templates/skills/swarm-scripts/content.md +1 -1
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/dist/acp-adapter-7b4vk3h5.js +0 -16
- package/dist/cli-5c4hjzne.js +0 -873
- package/dist/cli-excnnjg2.js +0 -20222
- package/dist/cli-pc5znp64.js +0 -364
- package/dist/cli-vz22fyqv.js +0 -428
- package/dist/fx-adapter-bs8wqrk5.js +0 -19
- package/dist/grok-adapter-gpjqmkcq.js +0 -19
- package/dist/handlers-zxmp1ta4.js +0 -32
- package/dist/index-a8phxqnk.js +0 -37
- package/dist/index-k6h00t4c.js +0 -30
- package/dist/index-xrz7te8h.js +0 -33
- package/dist/lead-956sd2yc.js +0 -71
- package/dist/rbac-roles-910mmkgz.js +0 -26
- package/dist/virtual-modules-d2pjk9j1.js +0 -59
- package/dist/worker-y15hy08h.js +0 -71
package/src/http/mcp-servers.ts
CHANGED
|
@@ -106,6 +106,10 @@ const createMcpServerRoute = route({
|
|
|
106
106
|
responses: {
|
|
107
107
|
201: { description: "MCP server created", schema: z.object({ server: McpServerSchema }) },
|
|
108
108
|
400: { description: "Validation error" },
|
|
109
|
+
409: {
|
|
110
|
+
description:
|
|
111
|
+
"A server with this name already exists in the same scope and owner (mcp_server_name_taken)",
|
|
112
|
+
},
|
|
109
113
|
},
|
|
110
114
|
rbac: { permission: "mcp-server.create.swarm" },
|
|
111
115
|
});
|
|
@@ -518,6 +522,10 @@ export async function handleMcpServers(
|
|
|
518
522
|
await emitMcpServerConnectedTelemetry();
|
|
519
523
|
createMcpServerRoute.respond(res, 201, { server });
|
|
520
524
|
} catch (err) {
|
|
525
|
+
if (err instanceof Error && err.message.includes("UNIQUE constraint")) {
|
|
526
|
+
jsonError(res, "mcp_server_name_taken", 409);
|
|
527
|
+
return true;
|
|
528
|
+
}
|
|
521
529
|
jsonError(res, err instanceof Error ? err.message : "Create failed", 400);
|
|
522
530
|
}
|
|
523
531
|
return true;
|
|
@@ -117,7 +117,7 @@ const getCatalog = route({
|
|
|
117
117
|
pattern: ["api", "models-catalog"],
|
|
118
118
|
summary: "Get the live model catalog for the picker-reachable providers",
|
|
119
119
|
description:
|
|
120
|
-
"Slim projection of the models.dev payload (
|
|
120
|
+
"Slim projection of the models.dev payload (the vendored models.dev snapshot, or the live fetch once one succeeds) plus the OpenAI-compatible registry providers; see the `providers` field for the live list. Refreshed server-side at boot and every 12h by the pricing-refresh loop. `source` is 'snapshot' with `updatedAt: null` until the first successful fetch (or when models.dev is unreachable), in which case the vendored snapshot is served instead.",
|
|
121
121
|
tags: ["Pricing"],
|
|
122
122
|
responses: {
|
|
123
123
|
200: {
|
|
@@ -46,7 +46,8 @@ export function getOperatorActor(req: IncomingMessage, res: ServerResponse): Ide
|
|
|
46
46
|
const auth = getRequestAuth(req);
|
|
47
47
|
const userId = authUserId(auth);
|
|
48
48
|
if (userId) {
|
|
49
|
-
|
|
49
|
+
const tokenId = auth?.kind === "user" ? auth.tokenId : undefined;
|
|
50
|
+
return tokenId ? { kind: "user", id: userId, tokenId } : { kind: "user", id: userId };
|
|
50
51
|
}
|
|
51
52
|
if (isOperatorAuth(auth)) {
|
|
52
53
|
return { kind: "operator", id: auth.fingerprint };
|
package/src/http/pages-public.ts
CHANGED
|
@@ -43,7 +43,9 @@ import { getAppUrl, getConfiguredAppUrls, getLocalDevAppOrigins } from "../utils
|
|
|
43
43
|
import {
|
|
44
44
|
extractAndVerifyCookie,
|
|
45
45
|
isLocalDevPageRequest,
|
|
46
|
+
LEGACY_PAGE_SESSION_COOKIE,
|
|
46
47
|
pageSessionSetCookies,
|
|
48
|
+
verifyPageSession,
|
|
47
49
|
} from "../utils/page-session";
|
|
48
50
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
49
51
|
import { route } from "./route-def";
|
|
@@ -377,7 +379,9 @@ function buildCsp(page: Page): string {
|
|
|
377
379
|
* payload names this page (the cookie is the proof once the user has
|
|
378
380
|
* successfully unlocked once). For password pages, when the cookie is
|
|
379
381
|
* absent/invalid the caller falls through to the `?key=` + Basic-auth
|
|
380
|
-
* resolution path; for authed pages the caller surfaces 401
|
|
382
|
+
* resolution path; for authed pages the caller surfaces 401 (403 when the
|
|
383
|
+
* request carries a valid session for a different page, see
|
|
384
|
+
* `hasSessionForOtherPage`).
|
|
381
385
|
*
|
|
382
386
|
* The caller passes the cookie payload (already verified by
|
|
383
387
|
* `extractAndVerifyCookie`, which ignores sessions for other pages) — `null`
|
|
@@ -417,6 +421,29 @@ function isAccessible(
|
|
|
417
421
|
};
|
|
418
422
|
}
|
|
419
423
|
|
|
424
|
+
/**
|
|
425
|
+
* True when the request carries a verified page-session cookie (per-page or
|
|
426
|
+
* legacy name) whose signed payload names a page other than `pageId`. Lets an
|
|
427
|
+
* authed page tell "your session is for another page" (403) from "no usable
|
|
428
|
+
* session" (401). Missing, tampered, or expired cookies never count.
|
|
429
|
+
*/
|
|
430
|
+
async function hasSessionForOtherPage(req: IncomingMessage, pageId: string): Promise<boolean> {
|
|
431
|
+
const header = req.headers.cookie;
|
|
432
|
+
if (!header) return false;
|
|
433
|
+
const pairs = (Array.isArray(header) ? header.join("; ") : header).split(";");
|
|
434
|
+
for (const pair of pairs) {
|
|
435
|
+
const eq = pair.indexOf("=");
|
|
436
|
+
if (eq === -1) continue;
|
|
437
|
+
const name = pair.slice(0, eq).trim();
|
|
438
|
+
if (name !== LEGACY_PAGE_SESSION_COOKIE && !name.startsWith(`${LEGACY_PAGE_SESSION_COOKIE}_`)) {
|
|
439
|
+
continue;
|
|
440
|
+
}
|
|
441
|
+
const payload = await verifyPageSession(pair.slice(eq + 1).trim());
|
|
442
|
+
if (payload && payload.pageId !== pageId) return true;
|
|
443
|
+
}
|
|
444
|
+
return false;
|
|
445
|
+
}
|
|
446
|
+
|
|
420
447
|
/**
|
|
421
448
|
* Extract a password candidate from the request. Order of precedence:
|
|
422
449
|
* 1. `?key=` query param (if present, returns it verbatim — empty string is
|
|
@@ -545,6 +572,16 @@ export async function handlePagesPublic(
|
|
|
545
572
|
return true;
|
|
546
573
|
}
|
|
547
574
|
} else {
|
|
575
|
+
// A valid session for ANOTHER page is a mismatch (403), not a missing session (401).
|
|
576
|
+
if (await hasSessionForOtherPage(req, page.id)) {
|
|
577
|
+
res.writeHead(403, { "Content-Type": "application/json" });
|
|
578
|
+
res.end(
|
|
579
|
+
JSON.stringify({
|
|
580
|
+
error: "page-session cookie does not match this page id; POST /api/pages/:id/launch",
|
|
581
|
+
}),
|
|
582
|
+
);
|
|
583
|
+
return true;
|
|
584
|
+
}
|
|
548
585
|
res.writeHead(access.status, { "Content-Type": "application/json" });
|
|
549
586
|
res.end(JSON.stringify({ error: scrubSecrets(access.reason) }));
|
|
550
587
|
return true;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import type { IncomingMessage } from "node:http";
|
|
2
|
+
import { getUserGrant } from "../be/rbac-roles";
|
|
3
|
+
import { can, isRbacEnabled, type PermissionVerb } from "../rbac";
|
|
4
|
+
import type { User } from "../types";
|
|
5
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
6
|
+
import { agentFirstPrincipal, authUser } from "./request-principal";
|
|
7
|
+
|
|
8
|
+
export type ApprovalResponder = { kind: "user"; user: User } | { kind: "operator" };
|
|
9
|
+
|
|
10
|
+
const AGENT_RESPONSE_REFUSED =
|
|
11
|
+
"Agents cannot answer approval requests. A person must respond with a user token or the dashboard.";
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* The person answering an approval request, taken from the credential and
|
|
15
|
+
* never from the request body. Every agent identity is refused: an `aseph_`
|
|
16
|
+
* session token, the shared key with an `X-Agent-ID`, and a page session with
|
|
17
|
+
* no signed-in user (page code is agent-authored, so it cannot vouch for a
|
|
18
|
+
* person). The shared key alone is the operator.
|
|
19
|
+
*
|
|
20
|
+
* `verb` and `refusedMessage` let other person-gated actions reuse the check
|
|
21
|
+
* with their own permission and wording. With RBAC on, a user must also hold
|
|
22
|
+
* `verb` through a role: route admission checks only the route's own verb, and
|
|
23
|
+
* a route admitted on another verb can still reach this check.
|
|
24
|
+
*/
|
|
25
|
+
export async function approvalResponder(
|
|
26
|
+
req: IncomingMessage,
|
|
27
|
+
options?: { verb?: PermissionVerb; refusedMessage?: string; pageMessage?: string },
|
|
28
|
+
): Promise<{ ok: true; responder: ApprovalResponder } | { ok: false; message: string }> {
|
|
29
|
+
const auth = getRequestAuth(req);
|
|
30
|
+
const rawAgentId = req.headers["x-agent-id"];
|
|
31
|
+
const headerAgentId = Array.isArray(rawAgentId) ? rawAgentId[0] : rawAgentId;
|
|
32
|
+
const principal = await agentFirstPrincipal(req, headerAgentId);
|
|
33
|
+
|
|
34
|
+
if (principal.kind !== "user" && principal.kind !== "agent" && auth?.page) {
|
|
35
|
+
return {
|
|
36
|
+
ok: false,
|
|
37
|
+
message:
|
|
38
|
+
options?.pageMessage ??
|
|
39
|
+
"A page session without a signed-in user cannot answer approval requests.",
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
const user = authUser(auth);
|
|
43
|
+
const responder: ApprovalResponder | null =
|
|
44
|
+
principal.kind === "user" && user
|
|
45
|
+
? { kind: "user", user }
|
|
46
|
+
: principal.kind === "operator"
|
|
47
|
+
? { kind: "operator" }
|
|
48
|
+
: null;
|
|
49
|
+
|
|
50
|
+
const verb = options?.verb ?? "approval.respond";
|
|
51
|
+
const refused = {
|
|
52
|
+
ok: false as const,
|
|
53
|
+
message: options?.refusedMessage ?? AGENT_RESPONSE_REFUSED,
|
|
54
|
+
};
|
|
55
|
+
const decision = can({ principal, verb, source: "http" });
|
|
56
|
+
if (!decision.allow || !responder) return refused;
|
|
57
|
+
if (responder.kind === "user" && isRbacEnabled()) {
|
|
58
|
+
const grant = await getUserGrant(responder.user.id);
|
|
59
|
+
if (!grant.grantsAll && !grant.verbs.has(verb)) return refused;
|
|
60
|
+
}
|
|
61
|
+
return { ok: true, responder };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export function responderKey(responder: ApprovalResponder): string {
|
|
65
|
+
return responder.kind === "user" ? responder.user.id : "operator";
|
|
66
|
+
}
|
package/src/http/poll.ts
CHANGED
|
@@ -13,7 +13,6 @@ import {
|
|
|
13
13
|
getAgentById,
|
|
14
14
|
getAllChannelActivityCursors,
|
|
15
15
|
getDbClient,
|
|
16
|
-
getInboxSummary,
|
|
17
16
|
getOfferedTasksForAgent,
|
|
18
17
|
getPendingTaskForAgent,
|
|
19
18
|
getTaskAttachments,
|
|
@@ -524,12 +523,12 @@ export async function handlePoll(
|
|
|
524
523
|
// would instruct a missing tool and strand the claimed mentions.
|
|
525
524
|
const claimedChannels = hasCapability("messaging") ? await claimMentions(myAgentId) : [];
|
|
526
525
|
if (claimedChannels.length > 0) {
|
|
527
|
-
//
|
|
528
|
-
|
|
526
|
+
// Count what this claim took: the inbox summary no longer sees mentions already
|
|
527
|
+
// moved to "processing".
|
|
529
528
|
return {
|
|
530
529
|
trigger: {
|
|
531
530
|
type: "unread_mentions",
|
|
532
|
-
mentionsCount:
|
|
531
|
+
mentionsCount: claimedChannels.reduce((sum, c) => sum + c.mentionsCount, 0),
|
|
533
532
|
claimedChannels: claimedChannels.map((c) => c.channelId), // Include for tracking
|
|
534
533
|
},
|
|
535
534
|
};
|
|
@@ -366,7 +366,7 @@ export async function handlePromptTemplates(
|
|
|
366
366
|
checkoutRoute.respond(res, 200, { template: toPromptTemplateResponse(template) });
|
|
367
367
|
} catch (error) {
|
|
368
368
|
const message = error instanceof Error ? error.message : "Unknown error";
|
|
369
|
-
if (message.includes("not found")) {
|
|
369
|
+
if (message.includes("not found") || message.startsWith("No history entry")) {
|
|
370
370
|
jsonError(res, message, 404);
|
|
371
371
|
} else {
|
|
372
372
|
jsonError(res, message, 400);
|
package/src/http/schedules.ts
CHANGED
|
@@ -343,6 +343,10 @@ export async function handleSchedules(
|
|
|
343
343
|
);
|
|
344
344
|
return true;
|
|
345
345
|
}
|
|
346
|
+
if (!body.cronExpression && !body.intervalMs) {
|
|
347
|
+
jsonError(res, "Either cronExpression or intervalMs must be provided.", 400);
|
|
348
|
+
return true;
|
|
349
|
+
}
|
|
346
350
|
}
|
|
347
351
|
|
|
348
352
|
if (body.cronExpression) {
|
package/src/http/script-runs.ts
CHANGED
|
@@ -238,6 +238,8 @@ const postInternalStepRoute = route({
|
|
|
238
238
|
pattern: ["api", "internal", "script-runs", null, "steps"],
|
|
239
239
|
operationId: "script_runs_internal_step_create",
|
|
240
240
|
summary: "Write a script run journal step",
|
|
241
|
+
description:
|
|
242
|
+
"Write-once per stepKey; a replay keeps the first journal entry and still answers 201.",
|
|
241
243
|
tags: ["Script Runs"],
|
|
242
244
|
params: runIdParamsSchema,
|
|
243
245
|
body: journalStepBodySchema,
|
|
@@ -856,10 +858,13 @@ export async function handleScriptRuns(
|
|
|
856
858
|
agentTaskRoute.respond(res, 200, { taskId: latest.id, taskOutput: latest.output ?? null });
|
|
857
859
|
return true;
|
|
858
860
|
}
|
|
861
|
+
// A skipped step did not do its work, so it settles as a failure, the
|
|
862
|
+
// same way the workflow engine routes it.
|
|
859
863
|
if (
|
|
860
864
|
latest.status === "failed" ||
|
|
861
865
|
latest.status === "cancelled" ||
|
|
862
|
-
latest.status === "superseded"
|
|
866
|
+
latest.status === "superseded" ||
|
|
867
|
+
latest.status === "skipped"
|
|
863
868
|
) {
|
|
864
869
|
json(res, { error: `Agent task ${latest.status}`, taskId: latest.id }, 409);
|
|
865
870
|
return true;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { getSteeringMessageById } from "../be/db";
|
|
3
3
|
import { getActiveSessionById } from "../be/db/active-sessions";
|
|
4
|
-
import { getUserGrant } from "../be/rbac-roles";
|
|
4
|
+
import { getUserGrant, userHoldsExplicitVerb } from "../be/rbac-roles";
|
|
5
5
|
import {
|
|
6
6
|
getSessionRoot,
|
|
7
7
|
hasSessionAccess,
|
|
@@ -28,14 +28,59 @@ import { jsonError } from "./utils";
|
|
|
28
28
|
* active user in `X-Swarm-User-Id`. On the shared key that identity is
|
|
29
29
|
* honor-system, the same trust the dashboard already gives favorites.
|
|
30
30
|
* `userId: null` is a guest page session, which has no user at all.
|
|
31
|
+
* `readAll` is the all-users read scope: the request opted in and the user
|
|
32
|
+
* may read every session (see `canReadAllSessions`). It lifts reads only;
|
|
33
|
+
* write and steer checks still need the user's own access.
|
|
31
34
|
*/
|
|
32
|
-
export type SessionActor =
|
|
35
|
+
export type SessionActor =
|
|
36
|
+
| { kind: "bypass" }
|
|
37
|
+
| { kind: "user"; userId: string | null; readAll?: boolean };
|
|
33
38
|
|
|
34
39
|
const BYPASS: SessionActor = { kind: "bypass" };
|
|
35
40
|
|
|
41
|
+
/**
|
|
42
|
+
* Request header that opts a dashboard tab into the all-users read scope, so
|
|
43
|
+
* every list and detail read of that tab carries it. `GET /api/tasks` and
|
|
44
|
+
* `GET /api/sessions` also take it as `scope=all`.
|
|
45
|
+
*/
|
|
46
|
+
export const SESSION_SCOPE_HEADER = "x-swarm-session-scope";
|
|
47
|
+
|
|
48
|
+
function requestsAllUsersScope(req: IncomingMessage): boolean {
|
|
49
|
+
const raw = req.headers[SESSION_SCOPE_HEADER];
|
|
50
|
+
return (Array.isArray(raw) ? raw[0] : raw)?.trim().toLowerCase() === "all";
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Whether `userId` may opt in to read every user's sessions: one of its roles
|
|
55
|
+
* lists `session.read.all` explicitly. The grant-all `admin` role is not
|
|
56
|
+
* enough, because every new user gets it (`trg_users_default_role`). The
|
|
57
|
+
* stored grant decides with RBAC on or off: RBAC off opens the admission
|
|
58
|
+
* gate, not other users' private sessions.
|
|
59
|
+
*/
|
|
60
|
+
export async function canReadAllSessions(userId: string): Promise<boolean> {
|
|
61
|
+
return userHoldsExplicitVerb(userId, "session.read.all");
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* The session actor of a request. The all-users scope (`allUsers`, or the
|
|
66
|
+
* `X-Swarm-Session-Scope: all` header) sets `readAll` only for a user who may
|
|
67
|
+
* read every session; for anyone else it is ignored and the usual filter
|
|
68
|
+
* applies. A bypass actor already reads everything.
|
|
69
|
+
*/
|
|
36
70
|
export async function resolveSessionActor(
|
|
37
71
|
req: IncomingMessage,
|
|
38
72
|
myAgentId: string | undefined,
|
|
73
|
+
opts: { allUsers?: boolean } = {},
|
|
74
|
+
): Promise<SessionActor> {
|
|
75
|
+
const actor = await resolveBaseSessionActor(req, myAgentId);
|
|
76
|
+
if (actor.kind !== "user" || !actor.userId) return actor;
|
|
77
|
+
if (!opts.allUsers && !requestsAllUsersScope(req)) return actor;
|
|
78
|
+
return (await canReadAllSessions(actor.userId)) ? { ...actor, readAll: true } : actor;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
async function resolveBaseSessionActor(
|
|
82
|
+
req: IncomingMessage,
|
|
83
|
+
myAgentId: string | undefined,
|
|
39
84
|
): Promise<SessionActor> {
|
|
40
85
|
const auth = getRequestAuth(req);
|
|
41
86
|
const userId = authUserId(auth);
|
|
@@ -50,12 +95,18 @@ export async function resolveSessionActor(
|
|
|
50
95
|
return BYPASS;
|
|
51
96
|
}
|
|
52
97
|
|
|
98
|
+
/** `access`, raised to at least `read` for an actor with the all-users read scope. */
|
|
99
|
+
export function withReadAll(actor: SessionActor, access: SessionAccess): SessionAccess {
|
|
100
|
+
return actor.kind === "user" && actor.readAll && access === "none" ? "read" : access;
|
|
101
|
+
}
|
|
102
|
+
|
|
53
103
|
/** The actor's access to the session holding `taskId`; `owner` for a bypass actor. */
|
|
54
104
|
export async function sessionAccessFor(
|
|
55
105
|
actor: SessionActor,
|
|
56
106
|
taskId: string,
|
|
57
107
|
): Promise<SessionAccess> {
|
|
58
|
-
|
|
108
|
+
if (actor.kind === "bypass") return "owner";
|
|
109
|
+
return withReadAll(actor, await sessionAccess(actor.userId, taskId));
|
|
59
110
|
}
|
|
60
111
|
|
|
61
112
|
export const SESSION_READ_DENIED =
|
|
@@ -71,9 +122,12 @@ export async function canReadSession(
|
|
|
71
122
|
return hasSessionAccess(access, "read");
|
|
72
123
|
}
|
|
73
124
|
|
|
74
|
-
/**
|
|
125
|
+
/**
|
|
126
|
+
* The SQL list filter (`readableSessionCondition`) for an actor; none for a
|
|
127
|
+
* bypass actor or the all-users read scope.
|
|
128
|
+
*/
|
|
75
129
|
export function readableByFor(actor: SessionActor): { userId: string | null } | undefined {
|
|
76
|
-
return actor.kind === "user" ? { userId: actor.userId } : undefined;
|
|
130
|
+
return actor.kind === "user" && !actor.readAll ? { userId: actor.userId } : undefined;
|
|
77
131
|
}
|
|
78
132
|
|
|
79
133
|
export const SESSION_WRITE_DENIED =
|
|
@@ -162,7 +216,8 @@ async function denialFor(
|
|
|
162
216
|
if (actor.kind === "bypass") return null;
|
|
163
217
|
const root = await getSessionRoot(taskId);
|
|
164
218
|
if (!root) return null;
|
|
165
|
-
|
|
219
|
+
const access = withReadAll(actor, await sessionAccessForRoot(actor.userId, root));
|
|
220
|
+
if (hasSessionAccess(access, needed)) return null;
|
|
166
221
|
return needed === "read" ? SESSION_READ_DENIED : SESSION_WRITE_DENIED;
|
|
167
222
|
}
|
|
168
223
|
|
package/src/http/sessions.ts
CHANGED
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
getPendingApprovalsForTasks,
|
|
20
20
|
getRootTaskChain,
|
|
21
21
|
getTaskById,
|
|
22
|
+
getTasksDispatchedFrom,
|
|
22
23
|
listRecentSessions,
|
|
23
24
|
} from "../be/db";
|
|
24
25
|
import { getSessionLabels } from "../be/db/session-labels";
|
|
@@ -37,9 +38,11 @@ import {
|
|
|
37
38
|
import { getUserGrant } from "../be/rbac-roles";
|
|
38
39
|
import {
|
|
39
40
|
getSessionRoot,
|
|
41
|
+
getSessionRoots,
|
|
40
42
|
hasSessionAccess,
|
|
41
43
|
listActiveSessionShares,
|
|
42
44
|
type SessionAccess,
|
|
45
|
+
type SessionRoot,
|
|
43
46
|
sessionAccessForRoot,
|
|
44
47
|
setSessionShares,
|
|
45
48
|
toSessionSharesState,
|
|
@@ -84,6 +87,7 @@ import {
|
|
|
84
87
|
resolveSessionActor,
|
|
85
88
|
type SessionActor,
|
|
86
89
|
sessionAccessFor,
|
|
90
|
+
withReadAll,
|
|
87
91
|
} from "./session-access";
|
|
88
92
|
import { jsonError } from "./utils";
|
|
89
93
|
|
|
@@ -593,12 +597,17 @@ const listSessions = route({
|
|
|
593
597
|
* an empty list for mine or shared.
|
|
594
598
|
* tree: Sessions that GET /api/session-tree counts: mine plus shared with me,
|
|
595
599
|
* no ownerless roots. A bypass actor sees every root.
|
|
600
|
+
* all: every user's sessions, read-only. Honored for a user whose role
|
|
601
|
+
* lists `session.read.all` (the built-in `auditor` role; grant-all admin
|
|
602
|
+
* alone does not count); anyone else gets the default list. The
|
|
603
|
+
* `X-Swarm-Session-Scope: all` header opts in the same way and also lifts
|
|
604
|
+
* the tree scope.
|
|
596
605
|
*/
|
|
597
606
|
scope: z
|
|
598
|
-
.enum(["mine", "shared", "tree"])
|
|
607
|
+
.enum(["mine", "shared", "tree", "all"])
|
|
599
608
|
.optional()
|
|
600
609
|
.describe(
|
|
601
|
-
"mine: owned sessions. shared: sessions shared with me. tree: Sessions that GET /api/session-tree counts: mine plus shared with me, no ownerless roots. A bypass actor sees every root with tree scope.",
|
|
610
|
+
"mine: owned sessions. shared: sessions shared with me. tree: Sessions that GET /api/session-tree counts: mine plus shared with me, no ownerless roots. A bypass actor sees every root with tree scope. all: every user's sessions, read-only, for a user whose role lists session.read.all (the built-in auditor role; the grant-all admin role alone does not count); ignored for anyone else. The X-Swarm-Session-Scope: all header opts in the same way, also for tree.",
|
|
602
611
|
),
|
|
603
612
|
/** With `scope=tree`: `mine` (default) or `all`. Must match the tree's `show`. */
|
|
604
613
|
show: SessionShowSchema,
|
|
@@ -782,6 +791,40 @@ async function checkSessionMove(
|
|
|
782
791
|
return { taskIds: tasks.map((task) => task.id) };
|
|
783
792
|
}
|
|
784
793
|
|
|
794
|
+
/**
|
|
795
|
+
* The chain plus the tasks it dispatched that hang elsewhere: a
|
|
796
|
+
* continuation's parentTaskId points at an earlier task, so the walk from a
|
|
797
|
+
* non-root task misses it, and that task can sit in another session. A task
|
|
798
|
+
* in another session joins only when the viewer can read that session, so
|
|
799
|
+
* the route grants no access beyond what the viewer already has.
|
|
800
|
+
*/
|
|
801
|
+
async function withDispatchedTasks(
|
|
802
|
+
chain: AgentTask[],
|
|
803
|
+
sessionRootId: string,
|
|
804
|
+
actor: SessionActor,
|
|
805
|
+
): Promise<AgentTask[]> {
|
|
806
|
+
const dispatched = await getTasksDispatchedFrom(chain.map((task) => task.id));
|
|
807
|
+
if (dispatched.length === 0) return chain;
|
|
808
|
+
const roots = await getSessionRoots(dispatched.map((task) => task.id));
|
|
809
|
+
const foreignRoots = new Map<string, SessionRoot>();
|
|
810
|
+
for (const root of roots.values()) {
|
|
811
|
+
if (root.id !== sessionRootId) foreignRoots.set(root.id, root);
|
|
812
|
+
}
|
|
813
|
+
const readable = new Set<string>([sessionRootId]);
|
|
814
|
+
await Promise.all(
|
|
815
|
+
[...foreignRoots.values()].map(async (root) => {
|
|
816
|
+
if ((await accessForRoot(actor, root)) !== "none") readable.add(root.id);
|
|
817
|
+
}),
|
|
818
|
+
);
|
|
819
|
+
const visible = dispatched.filter((task) => {
|
|
820
|
+
const root = roots.get(task.id);
|
|
821
|
+
return root !== undefined && readable.has(root.id);
|
|
822
|
+
});
|
|
823
|
+
if (visible.length === 0) return chain;
|
|
824
|
+
// A stable sort keeps the chain's insertion order on equal timestamps.
|
|
825
|
+
return [...chain, ...visible].sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
826
|
+
}
|
|
827
|
+
|
|
785
828
|
const getSession = route({
|
|
786
829
|
method: "get",
|
|
787
830
|
path: "/api/sessions/{rootTaskId}",
|
|
@@ -793,7 +836,7 @@ const getSession = route({
|
|
|
793
836
|
responses: {
|
|
794
837
|
200: {
|
|
795
838
|
description:
|
|
796
|
-
"Root task + chain (ordered by createdAt), plus the caller's `access` and the session `owner`",
|
|
839
|
+
"Root task + chain (ordered by createdAt), plus the caller's `access` and the session `owner`. The chain also holds tasks a chain task dispatched (`dispatchedByTaskId`) that sit elsewhere: in the same session, or in another session the caller can read.",
|
|
797
840
|
schema: z.object({
|
|
798
841
|
root: TaskWithSteeringSchema,
|
|
799
842
|
chain: z.array(TaskWithSteeringSchema),
|
|
@@ -862,7 +905,9 @@ async function accessForRoot(
|
|
|
862
905
|
actor: SessionActor,
|
|
863
906
|
root: { id: string; requestedByUserId: string | null },
|
|
864
907
|
): Promise<SessionAccess> {
|
|
865
|
-
return actor.kind === "bypass"
|
|
908
|
+
return actor.kind === "bypass"
|
|
909
|
+
? "owner"
|
|
910
|
+
: withReadAll(actor, await sessionAccessForRoot(actor.userId, root));
|
|
866
911
|
}
|
|
867
912
|
|
|
868
913
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
@@ -972,9 +1017,13 @@ export async function handleSessions(
|
|
|
972
1017
|
.map((s) => s.trim())
|
|
973
1018
|
.filter(Boolean)
|
|
974
1019
|
: undefined;
|
|
975
|
-
const
|
|
1020
|
+
const allUsers = parsed.query.scope === "all";
|
|
1021
|
+
const actor = await resolveSessionActor(req, myAgentId, { allUsers });
|
|
976
1022
|
const limit = Math.min(200, Math.max(0, parsed.query.limit ?? 25));
|
|
977
|
-
if (
|
|
1023
|
+
if (
|
|
1024
|
+
actor.kind === "bypass" &&
|
|
1025
|
+
(parsed.query.scope === "mine" || parsed.query.scope === "shared")
|
|
1026
|
+
) {
|
|
978
1027
|
// No user to own or receive a share.
|
|
979
1028
|
listSessions.respond(res, 200, {
|
|
980
1029
|
sessions: [],
|
|
@@ -1004,7 +1053,11 @@ export async function handleSessions(
|
|
|
1004
1053
|
? {
|
|
1005
1054
|
viewer: {
|
|
1006
1055
|
userId: actor.userId,
|
|
1007
|
-
scope:
|
|
1056
|
+
scope:
|
|
1057
|
+
parsed.query.scope === "mine" || parsed.query.scope === "shared"
|
|
1058
|
+
? parsed.query.scope
|
|
1059
|
+
: "all",
|
|
1060
|
+
readAll: actor.readAll,
|
|
1008
1061
|
} as const,
|
|
1009
1062
|
}
|
|
1010
1063
|
: {}),
|
|
@@ -1067,6 +1120,7 @@ export async function handleSessions(
|
|
|
1067
1120
|
actor.userId,
|
|
1068
1121
|
{ ...list, mine: show !== "all" },
|
|
1069
1122
|
action,
|
|
1123
|
+
actor.readAll,
|
|
1070
1124
|
);
|
|
1071
1125
|
triageSessionListRoute.respond(res, 200, { updated });
|
|
1072
1126
|
return true;
|
|
@@ -1209,7 +1263,11 @@ export async function handleSessions(
|
|
|
1209
1263
|
name: ownerUser?.name ?? sessionRoot.requestedByUserId,
|
|
1210
1264
|
}
|
|
1211
1265
|
: null;
|
|
1212
|
-
const chain = await
|
|
1266
|
+
const chain = await withDispatchedTasks(
|
|
1267
|
+
await getRootTaskChain(parsed.params.rootTaskId),
|
|
1268
|
+
sessionRoot.id,
|
|
1269
|
+
actor,
|
|
1270
|
+
);
|
|
1213
1271
|
// Load steering, citations and pending approvals for the already loaded chain.
|
|
1214
1272
|
const tasks = [root, ...chain];
|
|
1215
1273
|
const [steering, citations, approvals, read, groupKey] = await Promise.all([
|
|
@@ -1219,7 +1277,7 @@ export async function handleSessions(
|
|
|
1219
1277
|
// The viewer's read state, so a client marks a session read on open
|
|
1220
1278
|
// without the list row (the same rule as `GET /api/sessions`).
|
|
1221
1279
|
actor.kind === "user" && actor.userId
|
|
1222
|
-
? getSessionReadState(sessionRoot.id, actor.userId)
|
|
1280
|
+
? getSessionReadState(sessionRoot.id, actor.userId, undefined, actor.readAll)
|
|
1223
1281
|
: Promise.resolve(null),
|
|
1224
1282
|
getSessionGroupKey(root),
|
|
1225
1283
|
]);
|